Merge remote-tracking branch 'origin/master'

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

@@ -152,7 +152,7 @@
                       <!--归档撤回-->
                       <el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '5' && scope.row.filedType === '2'" 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 === '5' && (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:borrow') && scope.row.status === '5' && scope.row.filedType === '5' && (scope.row.borrowType === undefined || scope.row.borrowType === '0' || 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 === '5' && scope.row.borrowType === '2'" type="text" size="small" @click="rebackBorrow(scope.row)">撤回</el-button>
                       <!--借用归还-->
@@ -507,14 +507,13 @@
           this.workContractFileService.updateStatusById(row)
         }
         if (type === 'rebackBorrow') {
-          console.log('借用撤回')
           row.borrowType = '0'
           this.workContractBorrowService.updateStatusByContractInfoId(row).then(() => {
             this.workContractBorrowService.deleteById(row.id)
           })
         }
         if (type === 'retureBorrow') {
-          row.borrowType = '1'
+          row.borrowType = '0'
           this.workContractBorrowService.updateStatusByContractInfoId(row).then(() => {
             row.type = 'reture'
             row.borrowType = '5'