From 2788beeb20d8056da56f31662b4257824b385788 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 04 一月 2024 09:56:21 +0800
Subject: [PATCH] 包装台账修改

---
 src/views/quality/packageinspect/packageInspect-form.vue |    8 ++++----
 src/views/quality/Packaging_ledger/index.vue             |   19 +++++++++++++------
 src/views/product/workbench/index.vue                    |   11 +++++------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/views/product/workbench/index.vue b/src/views/product/workbench/index.vue
index ea1a613..aa7d640 100644
--- a/src/views/product/workbench/index.vue
+++ b/src/views/product/workbench/index.vue
@@ -531,7 +531,7 @@
           <!--  :style="{ backgroundColor: taskStatusColor() }" -->
           <div class="task-div-content" >
     <div v-if="!isShowNormalTracking" class="task-list-div" >
-      <operationTaskPane 
+      <operationTaskPane
         ref="operateTaskDiv"
         :workstationId="dutyForm.workstationId"
         :productSn="operateTaskForm.SN"
@@ -734,7 +734,6 @@
     <staffDialog
       :currshowlist.sync="showStaff"
       :selCol="selCol"
-      :selColValArr="selColValArr"
       :multiSelect="true"
       :dutyRecord="dutyForm"
       @handleSelectionChange="selectStaff"
@@ -2378,10 +2377,10 @@
       } else if (this.status) {
         this.$message.warning('璇ョ彮娆″凡缁忕‘璁わ紝涓嶅彲淇敼')
       } else {
-        this.selCol = 'staffNo'
-        for (let i = 0; i < this.personBoardList.length; i++) {
-          this.selColValArr.push(this.personBoardList[i].staffNo)
-        }
+        // this.selCol = 'staffNo'
+        // for (let i = 0; i < this.personBoardList.length; i++) {
+        //   this.selColValArr.push(this.personBoardList[i].staffNo)
+        // }
         this.showStaff = true
       }
     },
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index 445cd33..2230d2d 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -8,7 +8,7 @@
             :isShowHide="true"
             :prelang="prelang"
             :ajaxFun="ajaxFun"
-            :options="options" 
+            :options="options"
             @handleSelectionChange="handleSelectionChange"
             ref="processconfiguration"
             >
@@ -55,7 +55,7 @@
               :data="testStandardParams"
               id="testStandardParamTable"
               ref="testStandardParam"
-            
+
               highlight-current-row
               height="700"
               style="width: 100%"
@@ -145,7 +145,7 @@
                 <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
                 <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
               </el-row>
-              <el-row> 
+              <el-row>
                 <el-col :span="10" :offset="3">鍖呰缂栧彿锛�</el-col>
                 <el-col :span="10" style="font-weight: bold;">{{ item.packageNo }}</el-col>
               </el-row>
@@ -312,7 +312,14 @@
               icon: 'el-icon-position',
               type: 'text',
               size: 'small',
-              fun: this.check
+              fun: this.check,
+              show: {
+                val: [
+                    '鑽夌',
+                    '鏈姤妫�',
+                ],
+                key: 'state'
+              }
             })
       }
       if(this.permissions.quality_packaging_ledger_del){
@@ -344,7 +351,7 @@
               printable: 'qrCard',//椤甸潰
               type: "html",//鏂囨。绫诲瀷
                 maxWidth:450,
-                targetStyles:['*'],                 
+                targetStyles:['*'],
                 style: `@page {
                   margin:0;
                   padding: 0;
@@ -468,4 +475,4 @@
       },
     },
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/quality/packageinspect/packageInspect-form.vue b/src/views/quality/packageinspect/packageInspect-form.vue
index 636c5bf..724f678 100644
--- a/src/views/quality/packageinspect/packageInspect-form.vue
+++ b/src/views/quality/packageinspect/packageInspect-form.vue
@@ -202,7 +202,7 @@
     },
     data(){
         return{
-            isShow: true,
+            isShow: false,
             submitData: {
               id:null,
               result: null,
@@ -462,9 +462,9 @@
                     _than.list.push(ele)
                 }
               })
-              let find1 = _than.list.find(ele=>ele.name===inspect1[0].name) !=undefined;
-              let find2 = _than.list.find(ele=>ele.name===inspect2[0].name) !=undefined;
-              _than.isShow = find1||find2
+              let find1 = this.list.find(ele=>ele.name===inspect1[0].name&&ele.isEdit) !=undefined;
+              let find2 = this.list.find(ele=>ele.name===inspect2[0].name&&ele.isEdit) !=undefined;
+              this.isShow = find1||find2
               _than.conclusionTable = [{
                 packageNo: data.packageNo,
                 userName: Array.from(new Set(userNameList)).join(','),

--
Gitblit v1.9.3