From d5c18517bf33ae8eafcf2e34ac11fe11a0bfd761 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 四月 2024 17:59:37 +0800
Subject: [PATCH] 修改检验任务
---
src/components/view/b1-report-preparation.vue | 2 +-
src/components/do/b1-inspect-order-plan/Inspection.vue | 22 ++++++++++++++++++++--
src/components/view/b1-inspect-order-plan.vue | 2 +-
src/assets/api/controller.js | 1 +
4 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index e605ddb..a7d66e9 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -139,6 +139,7 @@
saveInsContext: "/insOrderPlan/saveInsContext",//淇濆瓨妫�楠屽唴瀹�
upPlanUser: "/insOrderPlan/upPlanUser",//浠诲姟浜ゆ帴
verifyPlan: "/insOrderPlan/verifyPlan",//澶嶆牳妫�楠屼换鍔�
+ submitPlan: "/insOrderPlan/submitPlan",//妫�楠屼换鍔℃彁浜�
}
const systemLog = {
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 08cde83..502e308 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -124,6 +124,7 @@
<el-col :span="12" style="text-align: right;">
<el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button>
<el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
+ <el-button size="small" type="primary" @click="submit" v-show="state==1" :loading="submitLoading">鎻愪氦</el-button>
<!-- 澶嶆牳 -->
<el-button size="medium" type="primary" @click="upInsReview(1)" :loading="reviewLoading"
v-show="state>1">閫氳繃</el-button>
@@ -266,6 +267,7 @@
return {
sampleVisible: false,
taskVisible: false,
+ submitLoading:false,
searchForm: {
sampleName: null,
state: null
@@ -822,7 +824,7 @@
laboratory:this.sonLaboratory,
tell:null
}).then(res => {
- if (res.code === 200 && res.data) {
+ if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
@@ -845,7 +847,7 @@
laboratory:this.sonLaboratory,
tell:this.noReason
}).then(res => {
- if (res.code === 200 && res.data) {
+ if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
@@ -858,6 +860,22 @@
this.$message.error('鏈緭鍏ヤ笉閫氳繃鍘熷洜')
}
},
+ submit(){
+ this.submitLoading = true;
+ this.$axios.post(this.$api.insOrderPlan.submitPlan, {
+ orderId:this.orderId,
+ laboratory:this.sonLaboratory,
+ }).then(res => {
+ if (res.code === 200) {
+ this.$message.success("鎿嶄綔鎴愬姛")
+ this.$emit('goback')
+ }
+ this.submitLoading = false;
+ }).catch(error => {
+ console.error(error)
+ this.submitLoading = false;
+ })
+ }
}
}
</script>
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index a1d2ee0..e75c561 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -507,7 +507,7 @@
orderId:this.orderId,
userId:this.connectPerson
}).then(res => {
- if (res.code === 200 && res.data) {
+ if (res.code === 200) {
this.loading = false;
this.$message.success("鎿嶄綔鎴愬姛")
this.refreshTable()
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 1f90830..4579292 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -77,7 +77,7 @@
:key="upIndex" @handleWeave="handleWeave"/>
</div>
</div>
- <el-dialog title="鍦ㄧ嚎缂栧埗" :visible.sync="claimVisible" width="70%" :modal-append-to-body="false">
+ <el-dialog title="鍦ㄧ嚎缂栧埗" :visible.sync="claimVisible" width="80%" :modal-append-to-body="false">
<Word style="height:70vh" v-if="claimVisible" ref="Word"/>
<span slot="footer" class="dialog-footer">
<el-button @click="claimVisible = false">鍙� 娑�</el-button>
--
Gitblit v1.9.3