From 25d10ee678644a6283454ca486d74a938eeccfd1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 05 十二月 2024 16:50:45 +0800
Subject: [PATCH] Merge branch 'cnas' into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 32ee71d..b04a320 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -277,10 +277,11 @@
<el-button size="small" type="primary" @click="handleSubmit" v-if="state==1"
:loading="submitLoading">鎻愪氦</el-button>
<!-- 澶嶆牳 -->
- <el-button size="small" type="primary" @click="upInsReview(1,'缁х画璇曢獙')" :loading="reviewLoading"
- v-if="state>1&&!isLook">缁х画璇曢獙</el-button>
+ <!-- <el-button size="small" type="primary" @click="upInsReview(1,'缁х画璇曢獙')" :loading="reviewLoading"
+ v-if="state>1&&!isLook">缁х画娴嬭瘯涓嬩竴涓牱鍝�</el-button>
<el-button size="small" @click="upInsReview(0,'鍐嶆璇曢獙')" v-if="state>1&&!isLook" type="danger">鍐嶆璇曢獙</el-button>
- <el-button size="small" @click="upInsReview(2,'缁撴潫璇曢獙')" v-if="state>1&&!isLook">缁撴潫璇曢獙</el-button>
+ <el-button size="small" @click="upInsReview(2,'缁撴潫璇曢獙')" v-if="state>1&&!isLook">姝ゅ鎵樺崟缁撴潫</el-button> -->
+ <el-button size="small" type="primary" @click="upInsReviewDia=true" v-if="state>1&&!isLook">澶嶆牳</el-button>
<el-button size="small" @click="handleBack" v-if="!noBack">杩斿洖</el-button>
</el-col>
</el-row>
@@ -940,6 +941,18 @@
<el-button type="primary" @click="addTemplateDia" :loading="templateLoading">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <el-dialog title="澶嶆牳" :visible.sync="upInsReviewDia" width="400px">
+ <el-radio-group v-model="upInsReviewType" style="display: flex;flex-direction: column">
+ <el-radio :label="1" style="margin: 10px 0; ">缁х画娴嬭瘯涓嬩竴涓牱鍝佹垨鍏朵粬绔欑偣浠诲姟</el-radio>
+ <el-radio :label="0" style="margin: 10px 0; ">鍐嶆妫�楠岃鏍峰搧</el-radio>
+ <el-radio :label="2" style="margin: 10px 0; ">姝ゅ鎵樺崟缁撴潫</el-radio>
+ <p style="font-size: 12px;color:red">鎱庨噸锛氬鏋滆繕鏈夊叾浠栨牱鍝佸湪妫�锛岀偣鍑荤粨鏉熷彲鑳戒細涓柇锛岃纭繚鎵�鏈夋牱鍝侀兘妫�楠屼笖澶嶆牳瀹屾垚鍐嶇偣鍑�</p>
+ </el-radio-group>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="upInsReviewDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="upInsReview" :loading="reviewLoading">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -967,6 +980,8 @@
lookFileVisible:false,//棰勮鏂囦欢
experimentDia:false,
experimentDia0:false,
+ upInsReviewDia:false,
+ upInsReviewType:1,
experimentInfo:{
note:'',
term:''
@@ -3224,23 +3239,19 @@
})
},
// 澶嶆牳
- upInsReview(e,type) {
- this.$confirm(type=='缁撴潫璇曢獙'?'纭缁撴潫璇曢獙锛熺‘瀹氬悗姝ゅ鎵樺崟鍋滄璇曢獙锛屽苟涓旀棤娉曞啀娆℃楠岋紒':`鏄惁${type}?`, "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- if (e == 1||e==2) {
+ upInsReview() {
+ if (this.upInsReviewType == 1||this.upInsReviewType==2) {
// 缁х画璇曢獙
this.reviewLoading = true;
this.$axios.post(this.$api.insOrderPlan.verifyPlan, {
sampleId: this.orderId,
- type: e,
+ type: this.upInsReviewType,
laboratory: this.sonLaboratory,
tell: null
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
+ this.upInsReviewDia = false;
this.$emit('goback')
}
this.reviewLoading = false;
@@ -3252,7 +3263,6 @@
// 鍐嶆璇曢獙
this.reviewDia = true;
}
- })
},
handleReviewDia() {
if (this.noReason) {
@@ -3315,6 +3325,9 @@
}
if(!this.otherForm.humidity){
this.$message.error('璇疯緭鍏ユ箍搴�')
+ return
+ }
+ if(this.sonLaboratory === '鐢佃矾璇曢獙'&&!this.$refs.CircuitParameters.saveAll()){
return
}
this.experimentDia = true
@@ -3820,7 +3833,9 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- this.$emit('goback')
+ if(this.$refs.CircuitParameters.saveAll()){
+ this.$emit('goback')
+ }
})
}else{
this.$emit('goback')
--
Gitblit v1.9.3