Merge remote-tracking branch 'origin/master'

src/views/hlgcompany/modules/HlgCompanySubcontractor.vue

@@ -363,6 +363,7 @@
         record1.companyId=this.companyId
         record1.subcontractorId=record.subcontractorId
         record1.cpType=record.cpType
+        record1.msg=record.msg
         this.$refs.selectContractModalForm.edit(record1);
         this.$refs.selectContractModalForm.title = "企业合同--开心工作科技有限公司";
         this.$refs.selectContractModalForm.disableSubmit = false;

src/views/hlgcompany/modules/HlgCompanySubcontractorContract.vue

@@ -20,7 +20,7 @@
       </a-form>
     </div>
     <!-- 查询区域-END -->
-    
+        <div style="margin-bottom: 10px">{{msg}}</div>
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="uploadContract()" type="primary" icon="plus" v-has="'companySubcontractor:addContract'">上传合同</a-button>
@@ -44,7 +44,7 @@
 
         <span slot="action" slot-scope="text, record">
           <template v-if="record.contractStatus==2">
-           <a @click="uploadContract1(record)" v-has="'companySubcontractor:editContract'">--</a>
+           --
           </template>
            <template v-else>
           <a @click="uploadContract1(record)" v-has="'companySubcontractor:editContract'">编辑</a>
@@ -96,6 +96,7 @@
     },
     data () {
       return {
+        msg:"",
         companyId:0,
         subcontractorId: 0,
         cpType:1,
@@ -177,6 +178,7 @@
         this.ipagination.total=0
         this.subcontractorId=record.subcontractorId
         this.companyId=record.companyId
+        this.msg=record.msg
         this.cpType=record.cpType
         this.visible = true
         this.loadData(1)

src/views/hlgcompany/modules/HlgCompanyUploadContractModal.vue

@@ -30,6 +30,7 @@
           </a-upload>
         </a-form-item>
 
+        <template v-if="!disableSubmit">
         <a-form-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-date placeholder="请选择开始时间" v-decorator="[ 'startDate', validatorRules.startDate]" @change="handleDateChange1" :trigger-change="true" style="width: 100%"/>
         </a-form-item>
@@ -44,7 +45,7 @@
          <div style="padding-left: 20px;color:#E70000">2、新上传合同与已上传老合同时间不能重叠</div><br/>
          <div style="padding-left: 20px;color:#E70000">3、请在时间上尽量保持新上传合同与上一份合同相互连续</div>
        </div>
-
+        </template>
 
       </a-form>
     </a-spin>

src/views/hlguser/modules/HlgUserSubcontractor.vue

@@ -40,7 +40,7 @@
             </span>
 
             <span slot="action1" slot-scope="text, record">
-               <a @click="uploadContract(record)" >{{record.workContract ? '已上传':'未上传'}}</a>
+               <a @click="uploadContract(record)"  v-has="'userSubcontractor:subcontractorManager'">{{record.workContract ? '已上传':'未上传'}}</a>
 
             </span>
 
@@ -236,7 +236,7 @@
         let recordNew = {};
         recordNew.userId = this.userId;
         recordNew.subcontractorId = record.id;
-        recordNew.isAutoRenew=record.isAutoRenew
+        recordNew.isPayment=record.isPayment
         recordNew.minPaymentTime=record.minPaymentTime
         recordNew.maxPaymentTime=record.maxPaymentTime
         this.$refs.contractModal.edit(recordNew)

src/views/hlguser/modules/HlgUserSubcontractorContract.vue

@@ -44,7 +44,7 @@
 
         <span slot="action" slot-scope="text, record">
           <template v-if="record.contractStatus==2">
-           <a @click="uploadContract1(record)" v-has="'userSubcontractor:editContract'">--</a>
+           --
           </template>
            <template v-else>
           <a @click="uploadContract1(record)" v-has="'userSubcontractor:editContract'">编辑</a>

src/views/hlguser/modules/HlgUserUploadContractModal.vue

@@ -30,6 +30,7 @@
           </a-upload>
         </a-form-item>
 
+        <template v-if="!disableSubmit">
         <a-form-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-date placeholder="请选择开始时间" v-decorator="[ 'startDate', validatorRules.startDate]" @change="handleDateChange1" :trigger-change="true" style="width: 100%"/>
         </a-form-item>
@@ -58,7 +59,7 @@
          <div style="padding-left: 20px;color:#E70000">2、新上传合同与已上传老合同时间不能重叠</div><br/>
          <div style="padding-left: 20px;color:#E70000">3、请在时间上尽量保持新上传合同与上一份合同相互连续</div>
        </div>
-
+        </template>
 
       </a-form>
     </a-spin>