From 976d776e39ec9bb87076fcfa11273af4729f519e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 四月 2024 15:44:43 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 7b70bdc..08cde83 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -241,7 +241,7 @@
:componentData="componentData" :key="upIndex" />
</el-drawer>
<el-dialog title="妫�楠屽鏍�" :visible.sync="reviewDia" width="400px">
- <div class="body" style="display: flex;align-items: center;" v-if="reviewDia">
+ <div class="body" style="display: flex;" v-if="reviewDia">
<div class="search_label" style="width: 120px;"><span class="required-span">* </span>涓嶉�氳繃鍘熷洜锛�</div>
<div class="search_input">
<el-input size="small" clearable v-model="noReason" type="textarea" :autosize="{ minRows: 3, maxRows: 5}"></el-input>
@@ -331,7 +331,8 @@
id(val) {
this.loading = true
this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
- id: val
+ id: val,
+ laboratory: this.sonLaboratory
}).then(res => {
this.insOrder = res.data.insOrder;
this.urgentList.forEach(m => {
@@ -820,16 +821,12 @@
type:1,
laboratory:this.sonLaboratory,
tell:null
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
}).then(res => {
if (res.code === 200 && res.data) {
- this.reviewLoading = false;
- this.$message.success("澶嶆牳閫氳繃")
+ this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
+ this.reviewLoading = false;
}).catch(error => {
console.error(error)
this.reviewLoading = false;
@@ -847,16 +844,12 @@
type:0,
laboratory:this.sonLaboratory,
tell:this.noReason
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
}).then(res => {
if (res.code === 200 && res.data) {
- this.reviewLoading = false;
- this.$message.success("澶嶆牳涓嶉�氳繃")
+ this.$message.success("鎿嶄綔鎴愬姛")
this.$emit('goback')
}
+ this.reviewLoading = false;
}).catch(error => {
console.error(error)
this.reviewLoading = false;
--
Gitblit v1.9.3