Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

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

@@ -126,8 +126,8 @@
       <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="examineVisible=false">取 消</el-button>
-        <el-button type="primary" @click="subAuditLeaseByCompany()">确 定</el-button>
-        
+        <el-button type="primary" @click="subAuditLeaseByCompany(9)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
+        <el-button type="primary" @click="subAuditLeaseByCompany(1)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbs']">确 定</el-button>
         
       </div>
     </el-dialog>
@@ -136,8 +136,8 @@
       <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="refuseVisible=false">取 消</el-button>
-        <el-button type="primary" @click="refuseAuditLeaseByCompany()">确 定</el-button>
-        
+        <el-button type="primary" @click="refuseAuditLeaseByCompany(10)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
+        <el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbs']">确 定</el-button>
 
       </div>
     </el-dialog>
@@ -262,7 +262,7 @@ export default {
       this.queryParams.companyAuditRemarks = '同意'
     },
     //审核  同意
-    async subAuditLeaseByCompany(){
+    async subAuditLeaseByCompany(type){
       console.log()
       const params = JSON.parse(JSON.stringify(this.queryParams))
       params.taskStatus = params.taskStatus+1
@@ -272,7 +272,7 @@ export default {
         this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
         this.$set(v,'companyAuditBy',this.user.id)
         this.$set(v,'examineStatusId',Number(params.examineStatusId))
-        // this.$set(v,'status','')   
+        this.$set(v,'status',type)   
       })
       params.updateTime = params.updateTimes
       params.createTime = params.createTimes
@@ -291,7 +291,7 @@ export default {
       this.queryParams.companyAuditRemarks = '驳回'
     },
     //审核  驳回
-    async refuseAuditLeaseByCompany(){
+    async refuseAuditLeaseByCompany(type){
       const params = JSON.parse(JSON.stringify(this.queryParams))
       if(params.taskStatus==31){
         params.taskStatus=99;
@@ -307,7 +307,7 @@ export default {
         this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
         this.$set(v,'companyAuditBy',this.user.id)
         this.$set(v,'examineStatusId',Number(params.examineStatusId))
-        // this.$set(v,'status',type)
+        this.$set(v,'status',type)
       })
       console.log(params)
       const res = await rejectLeaseByCompanyCq(params)