From 9e34e3c4a5fce250614ac014ecc3e83f41d6f637 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 17:26:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 558a287..8d285c2 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -77,6 +77,7 @@
 				<el-row class="title">
 					<el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
 					<el-col :span="12" style="text-align: right;">
+            <el-button size="medium" type="primary" @click="playOrder(4)">鍏夌氦閰嶇疆</el-button>
 						<el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>
 					</el-col>
 				</el-row>
@@ -120,17 +121,17 @@
             <div class="search_thing" style="width: 20%;" v-if="more">
               <div class="search_label">涓嬪崟浜猴細</div>
               <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
-                  v-model="componentData.entity.value1" @keyup.enter.native="refreshTable()"></el-input></div>
+                  v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
             </div>
             <div class="search_thing" style="width: 20%;" v-if="more">
               <div class="search_label">宸ョ▼鍚嶇О锛�</div>
               <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
-                  v-model="componentData.entity.value2" @keyup.enter.native="refreshTable()"></el-input></div>
+                  v-model="componentData.entity.engineering" @keyup.enter.native="refreshTable()"></el-input></div>
             </div>
             <div class="search_thing" style="width: 20%;" v-if="more">
               <div class="search_label">鐢熶骇鍗曚綅锛�</div>
               <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
-                  v-model="componentData.entity.value3" @keyup.enter.native="refreshTable()"></el-input></div>
+                  v-model="componentData.entity.production" @keyup.enter.native="refreshTable()"></el-input></div>
             </div>
           </el-col>
           <el-col :span="4">
@@ -227,7 +228,8 @@
 			</el-dialog>
 		</div>
 		<div style="width: 100%;height: 100%;" v-if="active >0">
-			<Add :active="active" :currentId="currentId" />
+			<Add :active="active" :currentId="currentId" v-show="active<4" />
+      <fiberOpticConfig :currentId="currentId" v-if="active==4" />
 		</div>
 	</div>
 </template>
@@ -235,10 +237,12 @@
 <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
+			Add,
+      fiberOpticConfig
 		},
 		data() {
 			return {
@@ -269,9 +273,9 @@
             sampleModel: null,
             sampleCode: null,
 						state: 0,
-            value1:null,
-            value2:null,
-            value3:null,
+            name:null,
+            engineering:null,
+            production:null,
 						orderBy: {
 							field: 'id',
 							order: 'asc'

--
Gitblit v1.9.3