重庆审批流程2

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

@@ -70,6 +70,14 @@ export function getLeaseManageListAll(query) {
     params: query
   })
 }
+// 机具领料-申请列表
+export function getLeaseManageListAllCq(query) {
+  return request({
+    url: '/base/tm_task/getLeaseManageListAllCq',
+    method: 'get',
+    params: query
+  })
+}
 // 机具领料-管理列表
 export function getLeaseAuditListAll(query) {
   return request({
@@ -142,13 +150,21 @@ export function deleteTask( taskId ){
 }
 
 // 根据 领料任务id  获取详情数据
-export function getTaskDetail( params = {} ){
+export function getLeaseListAll( params = {} ){
   return request({
     url: '/base/tm_task/getLeaseListAll',
     method:'get',
     params:params
   })
 }
+// 根据 领料任务id  获取详情数据
+export function getLeaseListAllCq( params = {} ){
+  return request({
+    url: '/base/tm_task/getLeaseListAllCq',
+    method:'get',
+    params:params
+  })
+}
 
 // 领料审核  同意
 export function auditLeaseByCompany(params = {} ){

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>
@@ -146,7 +146,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { auditLeaseByCompanyCq, getTaskDetail,rejectLeaseByCompanyCq } from '@/api/claimAndRefund/receive'
+import { auditLeaseByCompanyCq, getLeaseListAllCq,rejectLeaseByCompanyCq } from '@/api/claimAndRefund/receive'
 import {mapState} from 'vuex'
 export default {
   name: "ReceiveExamine",
@@ -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)
@@ -323,7 +323,7 @@ export default {
     }, 
     /** 查询 */
     async getData(taskId) {
-      const res = await getTaskDetail({
+      const res = await getLeaseListAllCq({
         taskId
       })
       this.queryParams = {...this.queryParams,...res.rows[0]}

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

@@ -196,7 +196,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { getLeaseManageListAll, getUnitData, getProData, getTaskDetail } from '@/api/claimAndRefund/receive'
+import { getLeaseManageListAllCq, getUnitData, getProData, getLeaseListAllCq } from '@/api/claimAndRefund/receive'
 import { getInfo } from '@/api/login'
 import vueEasyPrint from 'vue-easy-print';
 export default {
@@ -304,7 +304,7 @@ export default {
         pageNum: this.queryParams.pageNum
       }
 
-      const res = await getLeaseManageListAll(params)
+      const res = await getLeaseManageListAllCq(params)
       this.loading = false;
       console.log('getList ============',res)
       this.leaseAuditList = res.data.rows;
@@ -397,7 +397,7 @@ export default {
     async openLld(row){
       this.open = true
 
-      const res = await getTaskDetail({taskId:row.taskId})
+      const res = await getLeaseListAllCq({taskId:row.taskId})
 
       this.leaseApplyDetails = res.rows[0].leaseApplyDetails
       this.leaseApplyData = res.rows[0]