重庆领料审批前端修改

sgzb-ui/src/api/claimAndRefund/receive.js

@@ -273,7 +273,15 @@ export function submitNumOut(params){
   })
 }
 
-
+	// 领料确认 
+  export function updateLeaseTaskStatusConfirmByCq(params){
+    return request({
+      url: '/base/tm_task/updateLeaseTaskStatusConfirmByCq',
+      method: 'post',
+      data: params
+    })
+  }
+  
 
 
 

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue

@@ -586,7 +586,9 @@ export default {
             this.queryParams.createBy = this.user.userName
             this.queryParams.companyId = this.user.companyId
             let res;
-
+            if(this.queryParams.leaseType==1){
+              this.queryParams.taskStatus = 117
+            }
             if(this.taskId){
               this.leaseApplyInfoList.forEach(v => {
                 v = Object.assign(v,this.queryParams.leaseApplyInfo)

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue

@@ -124,6 +124,9 @@
       <el-button type="primary" @click="agree">同意</el-button>
       <el-button @click="refuse">驳回</el-button>
     </div>
+    <div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;" v-if="queryParams.taskStatus==117&&!this.isView">
+      <el-button type="primary" @click="confirm">确认</el-button>
+    </div>
 
     <!-- 同意 -->
     <el-dialog title="审核意见" :visible.sync="examineVisible" width="600px" :close-on-click-modal="false">
@@ -150,7 +153,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { auditLeaseByCompanyCq, getLeaseListAllCq,rejectLeaseByCompanyCq } from '@/api/claimAndRefund/receive'
+import { auditLeaseByCompanyCq, getLeaseListAllCq,rejectLeaseByCompanyCq,updateLeaseTaskStatusConfirmByCq  } from '@/api/claimAndRefund/receive'
 import {mapState} from 'vuex'
 export default {
   name: "ReceiveExamine",
@@ -176,6 +179,12 @@ export default {
           remarkKey:'directAuditRemark',
           authorKey:'directAuditBy',
           timeKey:'directAuditTime'
+        },{
+          id:117,
+          name:'机具分公司确认',
+          remarkKey:'directAuditRemark',
+          authorKey:'directAuditBy',
+          timeKey:'directAuditTime'
         }
       ],
       isView:false,
@@ -269,10 +278,13 @@ export default {
     async subAuditLeaseByCompany(type){
       console.log()
       const params = JSON.parse(JSON.stringify(this.queryParams))
-      params.taskStatus = params.taskStatus+1
-      
+      if(params.taskStatus==31){
+        params.taskStatus = 32
+      }else if(params.taskStatus==32){
+        params.taskStatus=117
+      }
       params.leaseApplyInfoList.forEach(v => {
-        console.log(v)
+        // console.log(v)
         this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
         this.$set(v,'companyAuditBy',this.user.id)
         this.$set(v,'examineStatusId',Number(params.examineStatusId))
@@ -288,7 +300,20 @@ export default {
       }
       console.log('subAuditLeaseByCompany ==================',res)
     },
+	    //确认
+      confirm(){
+        const taskData = JSON.parse(JSON.stringify(this.queryParams))
+        console.log(taskData)
+        let param = {
+          taskId:taskData.taskId,
+          taskStatus:33
+        }
+        updateLeaseTaskStatusConfirmByCq(param).then(response => {
+          this.$modal.msgSuccess("操作成功");
+          this.getData(taskData.taskId)
+        });
 
+      },
     //审核  驳回
     refuse(){
       this.refuseVisible = true
@@ -360,6 +385,10 @@ export default {
           break
         }
       }
+      if(this.queryParams.examineStatusId==33){
+        this.flowPath[2].color = '#0bbd87'
+        this.flowPath[2].icon = 'el-icon-check'
+      }
       // console.log(this.flowPath)
       if(this.queryParams.examineStatusId==98){
         this.flowPath[0].color = 'red'

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue

@@ -112,7 +112,7 @@
             type="primary"
             @click="handleExamine(scope.row)"
             v-hasPermi="['receive:examine:fgs']"
-            v-if="Number(scope.row.examineStatusId)==31"
+            v-if="Number(scope.row.examineStatusId)==31||Number(scope.row.examineStatusId)==117"
           >审批</el-button>
           <el-button
             size="mini"

sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue

@@ -235,7 +235,7 @@ import {
   submitLeaseApply,
   getUseTypeTreee
 } from '@/api/claimAndRefund/receive'
-import { ApiSubmitBackApply } from "@/api/claimAndRefund/return"
+import { submitBackApplyApi  } from "@/api/claimAndRefund/return"
 import { submitBackApplyApiByCq,materialReturnNoteByApply,submitRefuseBackApply } from "@/api/claimAndRefund/return.js"
 import { mapState } from 'vuex'
 import {
@@ -682,7 +682,7 @@ export default {
               backApplyInfo: this.queryParams.backApplyInfo,
               backApplyDetails: this.queryParams.leaseApplyDetails,
             }
-            const res = await submitBackApplyApiByCq(params)
+            const res = await submitBackApplyApi(params)
             if (res.code == 200) {
               this.$message({ type: 'success', message: '申请成功'})
               setTimeout(() => {