From fadfcb72e9df6e376ab981bf11558982ff6c609b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 14:39:57 +0800
Subject: [PATCH] 优化检验下单代码

---
 src/components/view/b1-inspection-order.vue |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 069c75a..d872ee8 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -145,7 +145,7 @@
 				<ul class="tab">
 					<li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
 				</ul>
-				<ValueTable :style="'height: calc(100% - '+(more?'94':'44')+'px)'" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
+				<ValueTable :style="getStyle()" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
 					:key="'b'+upIndex"  />
 			</div>
 			<!-- 瀹℃牳 -->
@@ -171,7 +171,7 @@
 			<!-- 鎾ら攢 -->
 			<el-dialog title="涓嬪崟鎾ら攢" :visible.sync="quashDialogVisible" width="30%" :before-close="handleClose">
 				<p style="font-size:16px;color:#333333" v-if="!isQuash">濮旀墭缂栧彿<span
-						style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚︽挙閿�</p>
+						style="color:#34BD66">{{this.insOrderRow.entrustCode}}</span>鐨勪俊鎭槸鍚︽挙閿�</p>
 				<el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else>
 					<el-form-item label="璇疯緭鍏ユ挙閿�鍘熷洜锛�">
 						<el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input>
@@ -226,8 +226,7 @@
 			</el-dialog>
 		</div>
 		<div style="width: 100%;height: 100%;" v-if="active >0">
-			<Add :active="active" :currentId="currentId" v-if="active<4" />
-      <fiberOpticConfig :currentId="currentId" v-if="active==4" />
+			<Add :active="active" :currentId="currentId" />
 		</div>
 	</div>
 </template>
@@ -235,12 +234,10 @@
 <script>
 	import ValueTable from '../tool/value-table.vue'
 	import Add from '../do/b1-ins-order/add.vue'
-  import fiberOpticConfig from '../do/b1-ins-order/fiberoptic-config.vue'
 	export default {
 		components: {
 			ValueTable,
-			Add,
-      fiberOpticConfig
+			Add
 		},
 		data() {
 			return {
@@ -456,7 +453,8 @@
 				tabIndex: 0,
 				active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
 				currentId: null,
-        more:false
+        more:false,
+        insOrderRow:{}
 			}
 		},
 		mounted() {
@@ -557,6 +555,7 @@
 			// 鎾ら攢
 			handlEquash(row) {
 				this.quashDialogVisible = true;
+        this.insOrderRow=row
 			},
 			// 涓嬪彂
 			handleIssued(row) {
@@ -601,6 +600,25 @@
 			},
 			submitForm() {
 				this.upLoad = true;
+        if (this.tabIndex==1){
+          this.axios.put(this.$api.insOrder.updateInspected+"?id="+this.insOrderRow.id).then(res=>{
+            if (res.code===200){
+              this.upLoad=false
+              this.quashDialogVisible=false
+              this.refreshTable()
+              this.$message.success("鏇存柊鎴愬姛")
+            }
+          })
+        }else{
+          this.axios.put(this.$api.insOrder.updateStatus+"?id="+this.insOrderRow.id).then(res=>{
+            if (res.code===200){
+              this.upLoad = false
+              this.quashDialogVisible = false
+              this.refreshTable()
+              this.$message.success("鏇存柊鎴愬姛")
+            }
+          })
+        }
 				let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
 				delete this.formData.createTime
 				delete this.formData.updateTime
@@ -655,6 +673,9 @@
           this.componentData.tagField.orderType.select = res.data
         })
       },
+      getStyle(){
+        return 'height: calc(100% - '+(this.more?'94':'44')+'px)'
+      }
 		}
 	}
 </script>

--
Gitblit v1.9.3