From df33895b6a072ce2963dc8b0688ebfd0989eef2c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 22 八月 2024 14:06:53 +0800
Subject: [PATCH] 变更检验下单
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index e6886ed..f4ec2e1 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -258,7 +258,7 @@
<el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">濂楃鍒囨崲</el-button> -->
<el-button size="small" type="primary" @click="sampleVisible=true;uploadSample()">鏍峰搧鍒囨崲</el-button>
<el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
- <el-button size="small" type="primary" @click="addVerifyDia = true" v-if="state==1"
+ <el-button size="small" type="primary" @click="handleSubmit" v-if="state==1"
:loading="submitLoading">鎻愪氦</el-button>
<!-- 澶嶆牳 -->
<el-button size="medium" type="primary" @click="upInsReview(1)" :loading="reviewLoading"
@@ -1460,7 +1460,7 @@
}else{
str0 = i+','+j
}
- if(j!='frequency'&&data[i][j]&&typeof data[i][j].result == 'string'){
+ if(j!='frequency'&&data[i][j]&&(!data[i][j].result||typeof data[i][j].result == 'string')){
// 澶勭悊鏁伴噰淇℃伅鏍煎紡
this.dataAcquisitionInfo[str0] = {
value:data[i][j].result,
@@ -3336,6 +3336,14 @@
this.$message.error('鏈緭鍏ヤ笉閫氳繃鍘熷洜')
}
},
+ handleSubmit(){
+ if(this.insOrder.orderType=='C'){
+ this.verifyUser = this.insOrder.prepareUserId
+ this.submit()
+ }else{
+ this.addVerifyDia = true
+ }
+ },
submit() {
if (this.verifyUser === null || this.verifyUser === '') {
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�")
@@ -3362,8 +3370,9 @@
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
entrustCode: this.insOrder.entrustCode
- }).then(res => {
+ }).then(async res => {
if (res.code === 200) {
+ await this.handleCType()
this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
@@ -3394,8 +3403,9 @@
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser
- }).then(res => {
+ }).then( async res => {
if (res.code === 200) {
+ await this.handleCType()
this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
@@ -3413,6 +3423,20 @@
})
return
},
+ async handleCType(){
+ if(this.insOrder.departmentLims=='璐ㄩ噺閮�'){
+ await this.$axios.post(this.$api.insOrderPlan.verifyPlan, {
+ orderId: this.orderId,
+ type: 1,
+ laboratory: this.sonLaboratory,
+ tell: null
+ }).then(res => {
+ if (res.code === 200) {
+ }
+ }).catch(error => {
+ })
+ }
+ },
// 缁熶竴鍦ㄨ繖閲屼繚瀛樻暟鎹�
saveInsContext() {
try {
--
Gitblit v1.9.3