From 9bce6d06fc72b109ebfe1fa779c57e1d62a43b57 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 九月 2024 16:58:56 +0800
Subject: [PATCH] 来样方式改成订单类型
---
src/components/view/b1-inspection-order.vue | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index d866587..0289075 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -282,7 +282,7 @@
</el-dialog>
<!-- 涓嬪彂 -->
<el-dialog title="妫�楠屽垎閰�" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
- <div class="body" style="max-height: 60vh;">
+ <div class="body" style="max-height: 60vh;" v-if="issuedDialogVisible">
<el-row>
<el-col class="search_thing" style="width: 95%;">
<div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div>
@@ -293,7 +293,7 @@
</div>
</el-col>
<el-col class="search_thing" style="width: 95%;">
- <div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>鎸囨淳浜哄憳锛�</div>
+ <div class="search_label">鎸囨淳浜哄憳锛�</div>
<div class="search_input">
<el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable @change="changeUser">
<el-option v-for="(item,i) in personList" :key="i+'gbnm.'" :label="item.label" :value="item.value">
@@ -301,7 +301,7 @@
</el-select>
</div>
</el-col>
- <el-col class="search_thing" style="width: 95%;" v-if="distributeData.userId">
+ <el-col class="search_thing" style="width: 95%;">
<div class="search_label"><span class="required-span" >* </span>璇曢獙瀹わ細</div>
<div class="search_input">
<el-select v-model="distributeData.sonLaboratory" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable>
@@ -530,7 +530,21 @@
type: 'text',
method: 'handleVerify',
disabFun: (row, index) => {
- return row.state != 0
+ let state0 = false
+ if(this.currentRole=='妫�娴嬩腑蹇冧富浠�'){
+ if(row.checkState1||row.checkState1User){
+ state0 = true
+ }
+ }else if(this.currentRole=='鐮斿彂閮ㄧ粡鐞�'){
+ if(row.checkState2||row.checkState2User){
+ state0 = true
+ }
+ }else if(this.currentRole=='鎶�鏈礋璐ｄ汉'){
+ if(row.checkState3||row.checkState3User){
+ state0 = true
+ }
+ }
+ return row.state != 0 || state0 ||(this.currentRole!='妫�娴嬩腑蹇冧富浠�'&&this.currentRole!='鐮斿彂閮ㄧ粡鐞�'&&this.currentRole!='鎶�鏈礋璐ｄ汉')
}
}, {
id: 'quash',
@@ -554,7 +568,8 @@
type: 'text',
method: 'handleIssued',
disabFun: (row, index) => {
- return row.state != 1 || !!row.assign
+ // return row.state != 1 || !!row.assign
+ return row.appointed || row.state != 1
}
}],
linkEvent: {
@@ -744,7 +759,8 @@
],
qrData:[],
multipleSelection:[],
- sonLaboratoryList:[]
+ sonLaboratoryList:[],
+ currentRole:''
}
},
watch:{
@@ -756,6 +772,9 @@
this.isIndeterminate = true;
}
}
+ },
+ created() {
+ this.getAuthorizedPersonRole()
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
@@ -862,6 +881,11 @@
this.personList = data
})
},
+ getAuthorizedPersonRole() {
+ this.$axios.get(this.$api.role.getRole).then(res => {
+ this.currentRole = res.message
+ })
+ },
refreshTable(e) {
this.$refs['ValueTable'].selectList(e)
},
@@ -888,7 +912,7 @@
if (power[i].menuMethod == 'updateStatus') {
revoke = true
}
- if (power[i].menuMethod == 'upInsOrderOfState') {
+ if (power[i].menuMethod == 'upInsOrderOfState2') {
check = true
}
if (power[i].menuMethod == 'checkUpdate') {
@@ -1057,12 +1081,7 @@
this.$message.error('绾﹀畾鏃堕棿鏈～鍐�')
return
}
- //
- if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){
- this.$message.error('鎸囨淳浜哄憳鏈～鍐�')
- return
- }
- if(this.distributeData.userId&&(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory=='')){
+ if(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory==''){
this.$message.error('璇曢獙瀹ゆ湭濉啓')
return
}
@@ -1119,6 +1138,7 @@
playOrder(num) {
this.active = num
this.examine = 0
+ this.getAuthorizedPersonRole()
this.refreshTable('page')
},
handleTab(m, i) {
--
Gitblit v1.9.3