Merge remote-tracking branch 'origin/master'

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

@@ -30,7 +30,7 @@
       <el-col :span="12">
         <el-form-item label="借用日期" prop="borrowData">
           <el-date-picker
-            :disabled="this.inputForm.borrowType !== '1'"
+            :disabled="this.inputForm.borrowType === '2'"
             v-model="inputForm.borrowData"
             type="date"
             placeholder="选择日期">
@@ -205,6 +205,7 @@
           this.inputForm.borrowType = '1'
           this.workContractBorrowService.updateStatusById(this.inputForm).then(() => {
             this.inputForm.borrowType = '4'
+            this.inputForm.type = 'reject'
             this.workContractBorrowService.updateMessageStatusById(this.inputForm)
           })
         }

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

@@ -35,7 +35,7 @@
                 </vxe-column>
                 <vxe-column width="200px" title="借用时间" field="borrowData" ></vxe-column>
                 <vxe-column width="200px" title="大概归还时间" field="borrowRetData" ></vxe-column>
-                <vxe-column width="200px" title="大概归还时间" field="retureDate"></vxe-column>
+                <vxe-column width="200px" title="实际归还时间" field="retData"></vxe-column>
 
             </vxe-table>
         </div>

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

@@ -492,7 +492,7 @@
       },
       // 送审
       startForm (callback) {
-        console.log('filedType', this.inputForm.filedType)
+        console.log('filedType', this.inputForm.id)
         let id = this.inputForm.id
         this.loading = true
         this.inputForm.workAttachmentList = this.$refs.uploadComponent.getDataList()

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

@@ -55,10 +55,7 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="合同生效日期" prop="effectiveDate"
-                            :rules="[
-                     {required: true, message:'请输入合同生效日期', trigger:'blur'}
-                   ]">
+              <el-form-item label="合同生效日期" prop="effectiveDate">
                 <el-date-picker
                   v-model="inputForm.effectiveDate"
                   type="date"
@@ -69,10 +66,7 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="合同终止日期" prop="closingDate"
-                  :rules="[
-                    {required: true, message:'请选择合同终止日期', trigger:'blur'}
-                  ]">
+              <el-form-item label="合同终止日期" prop="closingDate">
                 <el-date-picker
                   @change="checkData"
                   v-model="inputForm.closingDate"

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

@@ -121,34 +121,35 @@
                 <vxe-column width="100px" title="合同金额(元)" field="contractAmount"></vxe-column>
                 <vxe-column width="100px" title="创建人" field="createBy"></vxe-column>
                 <vxe-column width="150px" title="签订日期" field="contractDate"></vxe-column>
-                <vxe-column  width="120px" title="流程状态" field="status" >
+                <vxe-column  width="120px" title="登记状态" field="status" >
                   <template slot-scope="scope">
-                    <el-button  type="text" @click="detail(scope.row)" :type="$dictUtils.getDictLabel('approval_type_status', scope.row.status, '-')"   effect="dark" size="mini">{{$dictUtils.getDictLabel("approval_type", scope.row.status, '-')}} </el-button>
+                    <el-button  type="text" @click="detail(scope.row)" :type="$dictUtils.getDictLabel('approval_type_status', scope.row.status, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("approval_type", scope.row.status, '-')}} </el-button>
                   </template>
                 </vxe-column>
                 <vxe-column width="100px"  title="归档状态" field="filedType" >
                   <template slot-scope="scope">
-                    <el-button  type="text" @click="detailFiled(scope.row)" :type="$dictUtils.getDictLabel('filed_type', scope.row.filedType, '-')"   effect="dark" size="mini">{{$dictUtils.getDictLabel("filed_type", scope.row.filedType, '-')}} </el-button>
+                    <el-button  type="text" @click="detailFiled(scope.row)" :type="$dictUtils.getDictLabel('filed_type_status', scope.row.filedType, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("filed_type", scope.row.filedType, '未归档')}} </el-button>
                   </template>
                 </vxe-column>
                 <vxe-column width="100px"  title="借用状态" field="borrowType" >
                   <template slot-scope="scope">
-                    <el-button  type="text" @click="detailBorrow(scope.row)" :type="$dictUtils.getDictLabel('borrow_type', scope.row.borrowType, '-')"   effect="dark" size="mini">{{$dictUtils.getDictLabel("borrow_type", scope.row.borrowType, '-')}} </el-button>
+                    <el-button  type="text" @click="detailBorrow(scope.row)" :type="$dictUtils.getDictLabel('borrow_type_status', scope.row.borrowType, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("borrow_type", scope.row.borrowType, '未借用')}} </el-button>
                   </template>
                 </vxe-column>
 
                 <vxe-column title="操作" width="200px" fixed="right" align="center">
                     <template  slot-scope="scope">
-                      <el-button v-if="hasPermission('sys:workContract:view')" type="text" icon="el-icon-view" size="small" @click="view(scope.row.id)">查看</el-button>
-                      <el-button v-if="hasPermission('sys:workContract:edit') && scope.row.status !== '2' && scope.row.status !== '5' && scope.row.createId === create && !isAdmin" type="text" icon="el-icon-edit" size="small" @click="edit(scope.row)">修改</el-button>
-                      <el-button v-if="hasPermission('sys:workContract:edit') && scope.row.status === '5' && isAdmin" type="text" icon="el-icon-edit" size="small" @click="editForm(scope.row.id)">修改</el-button>
-                      <el-button v-if="hasPermission('sys:workContract:del') && (scope.row.status === '1' || scope.row.status === '3')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
-                      <el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '2'" type="text"  icon="el-icon-back" size="small" @click="reback(scope.row)">撤回</el-button>
-                      <el-button v-if="hasPermission('sys:workContract:filed') && scope.row.status === '5' && scope.row.createId === create && (scope.row.filedType === '1' || scope.row.filedType === '2' || scope.row.filedType === '4' || scope.row.filedType === '5' || scope.row.filedType === undefined)" type="text"  icon="el-icon-s-order" size="small" @click="filed(scope.row.id)">归档</el-button>
-                      <el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '5' && scope.row.filedType === '3'" type="text"  icon="el-icon-back" size="small" @click="rebackFiled(scope.row)">撤回</el-button>
-                      <el-button v-if="hasPermission('sys:workContract:borrow') && scope.row.status === '5' && scope.row.filedType === '6' && (scope.row.borrowType === undefined || scope.row.borrowType === '1')" type="text"  icon="el-icon-s-order" size="small" @click="borrow(scope.row.id)">借用</el-button>
-                      <el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '5' && scope.row.filedType === '6' && scope.row.borrowType === '2'" type="text"  icon="el-icon-back" size="small" @click="rebackBorrow(scope.row)">撤回</el-button>
-                      <el-button v-if="hasPermission('sys:workContract:reture') && scope.row.status === '5' && scope.row.filedType === '6' && scope.row.borrowType === '6'" type="text"  icon="el-icon-back" size="small" @click="retureBorrow(scope.row)">归还合同</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:view')" type="text" size="small" @click="view(scope.row.id)">查看</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:edit') && scope.row.status !== '2' && scope.row.status !== '5' && scope.row.createId === create" type="text" size="small" @click="edit(scope.row)">修改</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:edit') && scope.row.status === '5' && isAdmin" type="text" size="small" @click="editForm(scope.row.id)">修改</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:del') && (scope.row.status === '1' || scope.row.status === '3')  && scope.row.createId === create" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '2'" type="text" size="small" @click="reback(scope.row)">撤回</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:filed') && scope.row.status === '5' && scope.row.createId === create && (scope.row.filedType === '1' || scope.row.filedType === '4' || scope.row.filedType === '5' || scope.row.filedType === undefined)" type="text" size="small" @click="filed(scope.row.id)">归档</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:filed') && scope.row.status === '5' && scope.row.createId === create && scope.row.filedType === '2'" type="text" size="small" @click="filed(scope.row.id)">修改</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '5' && scope.row.filedType === '3'" type="text"  size="small" @click="rebackFiled(scope.row)">撤回</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:borrow') && scope.row.status === '5' && scope.row.filedType === '6' && (scope.row.borrowType === undefined || scope.row.borrowType === '1')" type="text" size="small" @click="borrow(scope.row.id)">借用</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '5' && scope.row.filedType === '6' && scope.row.borrowType === '2'" type="text" size="small" @click="rebackBorrow(scope.row)">撤回</el-button>
+                      <el-button v-if="hasPermission('sys:workContract:reture') && scope.row.status === '5' && scope.row.filedType === '6' && scope.row.borrowType === '6'" type="text" size="small" @click="retureBorrow(scope.row)">归还合同</el-button>
                     </template>
                 </vxe-column>
             </vxe-table>
@@ -552,25 +553,27 @@
       },
       // 归档详情
       detailFiled (row) {
-        this.workContractFileService.findByContractInfoId(row.id).then(({data}) => {
-          if (!this.commonJS.isEmpty(data.id)) {
-            console.log('data', data)
-            this.taskService.getTaskDef({
-              procInsId: data.procInsId,
-              procDefId: data.processDefinitionId
-            }).then(({data}) => {
-              this.$router.push({
-                path: '/flowable/task/TaskFormDetail',
-                query: {
-                  readOnly: true,
-                  title: row.name + '归档流程详情',
-                  formTitle: row.name + '归档流程详情',
-                  businessId: row.id,
-                  ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId')}
+        if (row.filedType !== '4') {
+          this.workContractFileService.findByContractInfoId(row.id).then(({data}) => {
+            if (!this.commonJS.isEmpty(data.id)) {
+              console.log('data', data)
+              this.taskService.getTaskDef({
+                procInsId: data.procInsId,
+                procDefId: data.processDefinitionId
+              }).then(({data}) => {
+                this.$router.push({
+                  path: '/flowable/task/TaskFormDetail',
+                  query: {
+                    readOnly: true,
+                    title: row.name + '归档流程详情',
+                    formTitle: row.name + '归档流程详情',
+                    businessId: row.id,
+                    ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId')}
+                })
               })
-            })
-          }
-        })
+            }
+          })
+        }
       },
       // 借用
       borrow (id) {
@@ -637,6 +640,7 @@
       // 归还合同
       retureBorrow (row) {
         this.updateStatusById(row, 'retureBorrow')
+        this.refreshList()
       }
     }
   }