From 4163a1afd6fc4c787db36d53dc40c4b1f3f9b916 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 11 九月 2024 13:38:19 +0800
Subject: [PATCH] x新增历史记录查看功能
---
src/components/view/b1-inspect-order-plan.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index ba7325f..bb8207d 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -236,14 +236,15 @@
<el-table-column
fixed="right"
align="center" label="鎿嶄綔"
- width="250px"
+ width="320px"
>
<template slot-scope="scope">
<el-button @click="handleDataLook(scope.row)" type="text" size="small">鏁版嵁鏌ョ湅</el-button>
- <el-button @click="handleInspection(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState == 3 || scope.row.insState == 5||scope.row.insState == 6||(scope.row.userName&&!scope.row.userName.includes(userName))">妫�楠�</el-button>
- <el-button @click="handleConnect(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState == 5 || scope.row.insState == 3||scope.row.insState == 6||(scope.row.userName&&!scope.row.userName.includes(userName))">浜ゆ帴</el-button>
- <el-button @click="handleReview(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState != 3 ||(scope.row.checkName&&!scope.row.checkName.includes(userName))">澶嶆牳</el-button>
- <el-button @click="claimFun(scope.row)" type="text" size="small" :disabled="scope.row.userName != null || scope.row.checkName!=null">璁ら</el-button>
+ <el-button @click="handleInspection(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState == 3 || scope.row.insState == 5||scope.row.insState == 6||(scope.row.userName&&!scope.row.userName.includes(userName))" v-if="inspection">妫�楠�</el-button>
+ <el-button @click="handleConnect(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState == 5 || scope.row.insState == 3||scope.row.insState == 6||(scope.row.userName&&!scope.row.userName.includes(userName))" v-if="connect">浜ゆ帴</el-button>
+ <el-button @click="handleReview(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState != 3 ||(scope.row.checkName&&!scope.row.checkName.includes(userName))" v-if="review">澶嶆牳</el-button>
+ <el-button @click="claimFun(scope.row)" type="text" size="small" :disabled="scope.row.userName != null || scope.row.checkName!=null" v-if="claim">璁ら</el-button>
+ <el-button @click="lookHistory(scope.row)" type="text" size="small" :disabled="!scope.row.num1 || scope.row.num1<1" v-if="getInsProduct2">鏌ョ湅璁板綍</el-button>
</template>
</el-table-column>
</el-table>
@@ -298,7 +299,7 @@
<div style="width: 100%;height: 100%;" v-if="activeFace >0">
<Add :active="activeFace" :currentId="currentId" :examine="examine"/>
</div>
- <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state" :orderStateId="orderStateId" :version="version"/>
+ <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :inspectorList="inspectorList" :sonLaboratory="componentData.entity.sonLaboratory" :state="state" :orderStateId="orderStateId" :version="version" :isLook="isLook" :num1="num1"/>
<el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%">
<div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
<ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'" :url="$api.insOrder.selectSampleAndProductByOrderId"
@@ -452,6 +453,14 @@
disabFun: (row, index) => {
return row.userName != null || row.checkName!=null
}
+ }, {
+ id: '',
+ font: '鏌ョ湅璁板綍',
+ type: 'text',
+ method: 'claimFun',
+ disabFun: (row, index) => {
+ return !row.num1 || row.num1<2
+ }
}
],
linkEvent: {
@@ -525,7 +534,14 @@
label: '鏈嚭缁撴灉',
type: 'info'
}],
- typeList:[]
+ typeList:[],
+ getInsProduct2:false,
+ claim:false,
+ review:false,
+ connect:false,
+ inspection:false,
+ isLook:false,//鏄惁鏄煡鐪嬪巻鍙查〉闈�
+ num1:null,
}
},
created() {
@@ -595,6 +611,7 @@
let review = false
let claim = false
let jumpTeam = false
+ let getInsProduct2 = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'doInsOrder') {
inspection = true
@@ -611,19 +628,30 @@
if (power[i].menuMethod == 'jumpTeam') {
jumpTeam = true
}
+ if (power[i].menuMethod == 'getInsProduct2') {
+ getInsProduct2 = true
+ }
+ }
+ if (!getInsProduct2) {
+ this.componentData.do.splice(5, 1)
}
if (!claim) {
- this.componentData.do.splice(3, 1)
+ this.componentData.do.splice(4, 1)
}
if (!review) {
- this.componentData.do.splice(2, 1)
+ this.componentData.do.splice(3, 1)
}
if (!connect) {
- this.componentData.do.splice(1, 1)
+ this.componentData.do.splice(2, 1)
}
if (!inspection) {
- this.componentData.do.splice(0, 1)
+ this.componentData.do.splice(1, 1)
}
+ this.getInsProduct2 = getInsProduct2
+ this.claim = claim
+ this.review = review
+ this.connect = connect
+ this.inspection = inspection
this.jumpTeam = jumpTeam
},
changeCheckBox(val) {
@@ -796,6 +824,7 @@
this.version = row.version
this.orderStateId = row.orderStateId
this.state = 1;
+ this.isLook = false
},
handleConnect(row){
this.orderId = row.id
@@ -847,6 +876,7 @@
this.orderId = row.id
this.version = row.version
this.orderStateId = row.orderStateId
+ this.isLook = false
},
getAuthorizedPerson() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
@@ -860,6 +890,14 @@
this.personList = data
})
},
+ lookHistory(row){
+ this.isLook = true
+ this.state = 2;
+ this.orderId = row.id
+ this.version = row.version
+ this.orderStateId = row.orderStateId
+ this.num1 = row.num1
+ }
}
}
</script>
--
Gitblit v1.9.3