From 55fb24dc2886371ed51c21150e6b91dd428f2850 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 九月 2024 14:57:22 +0800
Subject: [PATCH] 用户管理接口更新
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 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..cbbee28 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -258,12 +258,13 @@
<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"
- v-if="state>1">閫氳繃</el-button>
- <el-button size="medium" @click="upInsReview(0)" v-if="state>1">涓嶉�氳繃</el-button>
+ <el-button size="small" type="primary" @click="upInsReview(1)" :loading="reviewLoading"
+ v-if="state>1">缁х画璇曢獙</el-button>
+ <el-button size="small" @click="upInsReview(0)" v-if="state>1" type="danger">鍐嶆璇曢獙</el-button>
+ <el-button size="small" @click="upInsReview(2)" v-if="state>1">缁撴潫璇曢獙</el-button>
<el-button size="small" @click="$emit('goback')">杩斿洖</el-button>
</el-col>
</el-row>
@@ -1460,7 +1461,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,
@@ -3291,12 +3292,12 @@
},
// 澶嶆牳
upInsReview(e) {
- if (e == 1) {
- // 閫氳繃
+ if (e == 1||e==2) {
+ // 缁х画璇曢獙
this.reviewLoading = true;
this.$axios.post(this.$api.insOrderPlan.verifyPlan, {
orderId: this.orderId,
- type: 1,
+ type: e,
laboratory: this.sonLaboratory,
tell: null
}).then(res => {
@@ -3309,8 +3310,8 @@
console.error(error)
this.reviewLoading = false;
})
- } else {
- // 涓嶉�氳繃
+ } else{
+ // 鍐嶆璇曢獙
this.reviewDia = true;
}
},
@@ -3334,6 +3335,14 @@
})
} else {
this.$message.error('鏈緭鍏ヤ笉閫氳繃鍘熷洜')
+ }
+ },
+ handleSubmit(){
+ if(this.insOrder.orderType=='C'){
+ this.verifyUser = this.insOrder.prepareUserId
+ this.submit()
+ }else{
+ this.addVerifyDia = true
}
},
submit() {
@@ -3394,8 +3403,9 @@
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser
- }).then(res => {
+ }).then( res => {
if (res.code === 200) {
+ this.submitLoading = false;
this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
@@ -3406,13 +3416,26 @@
}
}
- this.submitLoading = false;
}).catch(error => {
console.error(error)
this.submitLoading = false;
})
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