Merge remote-tracking branch 'origin/master'

src/views/modules/cw/workContract/CwWorkContractBorrowForm.vue

@@ -32,6 +32,7 @@
                   {required: true, message:'请填写借用日期', trigger:'blur'}
                ]">
           <el-date-picker
+            style="width: 100%"
             :disabled="this.inputForm.borrowType === '2'"
             v-model="inputForm.borrowData"
             value-format="yyyy-MM-dd"
@@ -45,6 +46,7 @@
                   {required: true, message:'请填写大概归还日期', trigger: 'blur'}
                ]">
           <el-date-picker
+            style="width: 100%"
             :disabled="this.inputForm.borrowType === '2'"
             v-model="inputForm.borrowRetData"
             value-format="yyyy-MM-dd"

src/views/modules/sys/workContract/WorkContractBorrowForm.vue

@@ -32,6 +32,7 @@
                   {required: true, message:'请填写借用日期', trigger:'blur'}
                ]">
           <el-date-picker
+            style="width: 100%"
             :disabled="this.inputForm.borrowType === '2'"
             v-model="inputForm.borrowData"
             value-format="yyyy-MM-dd"
@@ -45,6 +46,7 @@
                   {required: true, message:'请填写大概归还日期', trigger:'blur'}
                ]">
           <el-date-picker
+            style="width: 100%"
             :disabled="this.inputForm.borrowType === '2'"
             v-model="inputForm.borrowRetData"
             value-format="yyyy-MM-dd"

src/views/modules/sys/workContract/WorkContractForm.vue

@@ -418,7 +418,7 @@
           if (valid) {
             this.loading = true
             this.inputForm.workAttachmentList = this.$refs.uploadComponent.getDataList()
-            this.inputForm.status = '2'
+            this.inputForm.status = '5'
             this.inputForm.fees = this.inputForm.contractFees.join(',')
             await this.workContractService.save(this.inputForm).then(({data}) => {
               callback(data.businessTable, data.businessId, this.inputForm)