From 58420e1c44780e408ea62a4a8a275e4e52d108a2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 04 六月 2024 16:29:49 +0800
Subject: [PATCH] 合并s冲突

---
 src/components/tool/excel.vue                          |    2 +-
 src/components/do/b1-inspect-order-plan/Inspection.vue |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 936331e..b48d136 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -120,6 +120,19 @@
   .collection:active {
     opacity: .7;
   }
+  .table_caret{
+    font-size: 16px;
+    margin: 0 5px;
+    color: rgba(0, 0, 0, 0.1);
+  }
+  .table_caret:hover{
+    color: #409eff;
+    cursor: pointer;
+  }
+
+  .table_caret:active{
+    opacity: .8;
+  }
 </style>
 <style>
   .inspection .el-form-item__label {
@@ -284,6 +297,16 @@
                       <el-option v-for="(e, i) in enumList" :key="i" :label="e.label" :value="e.value"></el-option>
                     </el-select> -->
                     <span :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
+                  </template>
+                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧缂栧彿'">
+                    <div style="display: flex;flex-wrap: nowrap;align-items: center;">
+                      <i class="el-icon-caret-left table_caret" @click="caretSample(-1)"></i>
+                      <div :style="`font-family:${n.v.ff} !important;`">{{currentSample.sampleCode}}</div>
+                      <i class="el-icon-caret-right table_caret" @click="caretSample(1)"></i>
+                    </div>
+                  </template>
+                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧鍨嬪彿'">
+                    <div :style="`font-family:${n.v.ff} !important;`" v-if="currentSample.model!==undefined&&currentSample.model!==null">{{currentSample.model}}</div>
                   </template>
                   <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
                 </div>
@@ -1459,6 +1482,29 @@
         nav.addEventListener("mouseleave", function(event) {
           flag = false;
         });
+      },
+      caretSample(num){
+        let index = this.currentKey + num
+        if(index < 1){
+          this.$message.error('褰撳墠鏄涓�涓牱鍝�')
+          return
+        } else if(index > this.sampleProduct.length){
+          this.$message.error('褰撳墠鏄渶鍚庝竴涓牱鍝�')
+          return
+        }
+        this.currentKey = index
+        this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
+        this.currentSample.insProduct.forEach(a => {
+          this.param[a.id] = {
+            insValue: [],
+            comValue: [],
+            resValue: null,
+            equipValue: [],
+            equipName: [],
+            insResult: null
+          }
+        })
+        this.getTableLists()
       }
     }
   }
diff --git a/src/components/tool/excel.vue b/src/components/tool/excel.vue
index 25f85b3..601f628 100644
--- a/src/components/tool/excel.vue
+++ b/src/components/tool/excel.vue
@@ -120,7 +120,7 @@
 					cellFormat: false // 璁剧疆鍗曞厓鏍兼牸寮�
 				},
 				option.myFolderUrl = this.LOCATIONVUE + '/',
-				option.functionButton = '<i class="save_i el-icon-info" title="绯荤粺鏀寔鐨勫彉閲忥細&#10搴忓彿&#10妫�楠岄」&#10妫�楠屽瓙椤�&#10璁惧鍚嶇О&#10璁惧缂栫爜&#10鍗曚綅&#10瑕佹眰鍊�&#10璇曢獙鏂规硶 | 妫�娴嬫柟娉�&#10鏈�缁堝��&#10缁撹&#10璁＄畻鍊�&#10妫�楠屽��"></i><button onClick="excelClosed()" class="save">淇濆瓨</button>'
+				option.functionButton = '<i class="save_i el-icon-info" title="绯荤粺鏀寔鐨勫彉閲忥細&#10鏍峰搧缂栧彿&#10鏍峰搧鍨嬪彿&#10搴忓彿&#10妫�楠岄」&#10妫�楠屽瓙椤�&#10璁惧鍚嶇О&#10璁惧缂栫爜&#10鍗曚綅&#10瑕佹眰鍊�&#10璇曢獙鏂规硶 | 妫�娴嬫柟娉�&#10鏈�缁堝��&#10缁撹&#10璁＄畻鍊�&#10妫�楠屽��"></i><button onClick="excelClosed()" class="save">淇濆瓨</button>'
 				luckysheet.create(option)
 			}
 		}

--
Gitblit v1.9.3