财务-合同bug修改

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

@@ -135,40 +135,28 @@
                  ]">
             <el-input maxlength="64" :disabled="true" v-model="inputForm.departmentName" placeholder="请输入所属部门"></el-input>
           </el-form-item>
-<!--          <el-form-item  prop="department" label="所属部门">-->
-<!--            <SelectTree-->
-<!--              ref="officeTree"-->
-<!--              :props="{-->
-<!--                  value: 'id',             // ID字段名-->
-<!--                  label: 'name',         // 显示名称-->
-<!--                  children: 'children'    // 子级字段名-->
-<!--                }"-->
-<!--              :disabled="true"-->
-<!--              :url="`/sys/office/treeData?type=1`"-->
-<!--              :value="inputForm.department"-->
-<!--              :accordion="true"-->
-<!--              size="medium"-->
-<!--              @getValue="(value) => {inputForm.department=value}"/>-->
-<!--          </el-form-item>-->
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="案卷号" prop="filedNo"
-                        :rules="[{required: true, message: '请输入案卷号', trigger: 'blur'}
+        <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status !== 'audit'"
+                 label-width="150px">
+          <el-col :span="12">
+            <el-form-item label="案卷号" prop="filedNo"
+                          :rules="[{required: true, message: '请输入案卷号', trigger: 'blur'}
                  ]">
-            <el-input maxlength="15" v-model="inputForm.filedNo" placeholder="请输入案卷号"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+              <el-input maxlength="15" v-model="inputForm.filedNo" placeholder="请输入案卷号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="确认案卷号" prop="confirmFiledNo"
-                        :rules="[{required: true, message: '请输入确认案卷号', trigger: 'blur'}
+          <el-col :span="12">
+            <el-form-item label="确认案卷号" prop="confirmFiledNo"
+                          :rules="[{required: true, message: '请输入确认案卷号', trigger: 'blur'}
                  ]">
-            <el-input maxlength="15" @change="checkFiledNo" v-model="inputForm.confirmFiledNo" placeholder="请输入确认案卷号"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+              <el-input maxlength="15" @change="checkFiledNo" v-model="inputForm.confirmFiledNo" placeholder="请输入确认案卷号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
 
         <el-col :span="12">
           <el-form-item label="创建人" prop="createBy"
@@ -743,28 +731,21 @@
           this.inputForm.status = '5'
           this.inputForm.filedPaperType = '2'
           this.inputForm.contractProperList = []
-          if (this.inputForm.filedNo === '' || this.inputForm.filedNo === undefined) {
-            this.loading = false
-            this.$message.error('请填写案卷号')
-            throw new Error('请填写案卷号')
-          }
-          if (this.inputForm.confirmFiledNo === '' || this.inputForm.confirmFiledNo === undefined) {
-            this.loading = false
-            this.$message.error('请填写确认案卷号')
-            throw new Error('请填写确认案卷号')
-          }
+          console.log('status', status)
           // this.contractInfoService.updateInfo(this.inputForm)
           // console.log('inputForm', this.inputForm)
           this.inputForm.contractInfoId = id
           this.inputForm.contractInfoList = this.$refs.archiveFile.getDataList()
           // console.log('this.inputForm', this.inputForm)
           // this.inputForm.contractProperList = this.$refs.uploadFile.getDataList()
+
           this.contractFilePaperService.save(this.inputForm).then(({data}) => {
             // console.log('data', data)
             callback(data.businessTable, data.businessId, this.inputForm)
             this.$refs.inputForm.resetFields()
             this.loading = false
           })
+
           // this.contractFileService.save(this.inputForm).then(({data}) => {
           //   // console.log('data', data)
           //   callback(data.businessTable, data.businessId, this.inputForm)
@@ -788,7 +769,17 @@
           // console.log('this.inputForm.contractProperList', this.inputForm.contractProperList)
           // this.contractInfoService.updateInfo(this.inputForm)
           this.inputForm.contractInfoId = id
-          // this.inputForm.contractInfoList = this.$refs.uploadFile.getDataList()
+          if (this.inputForm.filedNo === '' || this.inputForm.filedNo === undefined) {
+            this.loading = false
+            this.$message.error('请填写案卷号')
+            throw new Error('请填写案卷号')
+          }
+          if (this.inputForm.confirmFiledNo === '' || this.inputForm.confirmFiledNo === undefined) {
+            this.loading = false
+            this.$message.error('请填写确认案卷号')
+            throw new Error('请填写确认案卷号')
+          }
+          this.inputForm.contractInfoList = this.$refs.uploadFile.getDataList()
           this.contractFilePaperService.save(this.inputForm).then(({data}) => {
             callback(data.businessTable, data.businessId, this.inputForm)
             this.$refs.inputForm.resetFields()

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

@@ -353,6 +353,7 @@
       agreeForm (callback) {
         this.inputForm.borrowType = '5'
         this.cwWorkContractBorrowService.updateMessageStatusById(this.inputForm).then(({data}) => {
+          this.cwWorkContractBorrowService.updateStatusById(this.inputForm)
           callback(data.businessTable, data.businessId, this.inputForm)
           this.$refs.inputForm.resetFields()
           this.loading = false
@@ -390,11 +391,6 @@
             this.inputForm.type = 'reject'
             this.cwWorkContractBorrowService.updateMessageStatusById(this.inputForm)
           })
-          // this.workContractBorrowService.updateStatusById(this.inputForm).then(() => {
-          //   this.inputForm.borrowType = '3'
-          //   this.inputForm.type = 'reject'
-          //   this.workContractBorrowService.updateMessageStatusById(this.inputForm)
-          // })
         }
         if (type === 'reback') {
           this.inputForm.borrowType = '0'

src/views/modules/flowable/task/TaskForm.vue

@@ -58,9 +58,10 @@
     </el-col>
     <el-col :span="16">
       <el-form-item v-if="isCC"  :rules="[
-              {required: true, message: '用户不能为空', trigger: 'blur'}
+              {required: true, message: '用户不能为空', trigger: 'blur'},
+              {required: true, message: '用户不能为空', trigger: 'change'}
             ]"  prop="userIds" label="抄送给">
-            <user-select :value="auditForm.userIds"  @getValue='(value) => {auditForm.userIds=value}'>></user-select>
+            <user-select :readonly="true" :value="auditForm.userIds"  @getValue='(value) => {auditForm.userIds=value}'>></user-select>
       </el-form-item>
     </el-col>
     <el-col :span="16">