From 3e75e5cce8dc60ec5786487111982f5de4a7004a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 22 八月 2024 14:31:11 +0800
Subject: [PATCH] 修改复核
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 6 ++----
src/components/view/b1-inspect-order-plan.vue | 44 ++++++++++++++++++++++----------------------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index f4ec2e1..070fbb1 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -3370,9 +3370,8 @@
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
entrustCode: this.insOrder.entrustCode
- }).then(async res => {
+ }).then(res => {
if (res.code === 200) {
- await this.handleCType()
this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
@@ -3403,9 +3402,8 @@
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser
- }).then( async res => {
+ }).then( res => {
if (res.code === 200) {
- await this.handleCType()
this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 53ece84..160846c 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -181,7 +181,7 @@
</el-select>
</div>
</div>
- <div class="search_thing">
+ <!-- <div class="search_thing">
<div class="search_label" style="width:90px"><span class="required-span">* </span>璇曢獙瀹わ細</div>
<div class="search_input">
<el-select v-model="connect.sonLaboratory" placeholder="璇烽�夋嫨" style="width: 100%;" filterable>
@@ -193,7 +193,7 @@
</el-option>
</el-select>
</div>
- </div>
+ </div> -->
<span slot="footer" class="dialog-footer">
<el-button @click="connectVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="confirmConnect" :loading="loading">纭� 瀹�</el-button>
@@ -399,7 +399,7 @@
connectVisible:false,
connect:{
connectPerson:'',
- sonLaboratory:''
+ // sonLaboratory:''
},
loading:false,
currentTime: null,
@@ -614,35 +614,35 @@
this.orderId = row.id
this.connect = {}
this.connectVisible=true;
- this.$axios.post(this.$api.insOrderPlan.upPlanUser2, {
- orderId:this.orderId,
- }).then(res => {
- if (res.code === 200&&res.data.length>0) {
- this.sonLaboratoryList = [];
- res.data.forEach(m=>{
- this.sonLaboratoryList.push({
- value:m,
- label:m
- })
- })
- this.connect.sonLaboratory = this.sonLaboratoryList[0].value
- }
- })
+ // this.$axios.post(this.$api.insOrderPlan.upPlanUser2, {
+ // orderId:this.orderId,
+ // }).then(res => {
+ // if (res.code === 200&&res.data.length>0) {
+ // this.sonLaboratoryList = [];
+ // res.data.forEach(m=>{
+ // this.sonLaboratoryList.push({
+ // value:m,
+ // label:m
+ // })
+ // })
+ // // this.connect.sonLaboratory = this.sonLaboratoryList[0].value
+ // }
+ // })
},
confirmConnect(){
if(this.connect.connectPerson==null||this.connect.connectPerson==''||this.connect.connectPerson==undefined){
this.$message.error('鏈�夋嫨浜ゆ帴浜哄憳')
return
}
- if(this.connect.sonLaboratory==null||this.connect.sonLaboratory==''||this.connect.sonLaboratory==undefined){
- this.$message.error('鏈�夋嫨璇曢獙瀹�')
- return
- }
+ // if(this.connect.sonLaboratory==null||this.connect.sonLaboratory==''||this.connect.sonLaboratory==undefined){
+ // this.$message.error('鏈�夋嫨璇曢獙瀹�')
+ // return
+ // }
this.loading = true;
this.$axios.post(this.$api.insOrderPlan.upPlanUser, {
orderId:this.orderId,
userId:this.connect.connectPerson,
- sonLaboratory:this.connect.sonLaboratory,
+ sonLaboratory:this.componentData.entity.sonLaboratory,
}).then(res => {
if (res.code === 200) {
this.loading = false;
--
Gitblit v1.9.3