From 95e34f7f11a54ebebbadc4a21d4f3e2af2baa9aa Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 06 八月 2024 17:01:17 +0800
Subject: [PATCH] 1.递交

---
 src/views/workOrder/workOrderList.vue |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 6f348d3..c3f274e 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -359,7 +359,7 @@
                     v-if="mesSetting.workOrder"
                     class="el-icon-files"
                     style="cursor: pointer;color:#42b983;margin-right: 15px"
-                    @click="pre(row,1)"
+                    @click.stop="pre(row,1)"
                   />
                 </el-tooltip>
 
@@ -367,12 +367,12 @@
                   <i
                     class="el-icon-edit-outline"
                     :style="{color:$store.state.settings.theme}"
-                    @click="edit('edit',row)"
+                    @click.stop="edit('edit',row)"
                   />
                 </el-tooltip>
 
                 <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
-                  <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
+                  <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click.stop="del(row)" />
                 </el-tooltip>
 
                 <el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ崟" placement="top">
@@ -385,7 +385,7 @@
                     :style="{color:$store.state.settings.theme}"
                     class="el-icon-printer"
                     style="cursor: pointer;margin-right: 15px"
-                    @click="handlePrint(row.wo_code,row.saleOrderCod)"
+                    @click.stop="handlePrint(row.wo_code,row.saleOrderCod)"
                   />
                 </el-tooltip>
 
@@ -394,7 +394,7 @@
                     class="el-icon-view"
                     style="cursor: pointer;"
                     :style="{color:$store.state.settings.theme}"
-                    @click="edit('view',row)"
+                    @click.stop="edit('view',row)"
                   />
                 </el-tooltip>
 
@@ -2185,7 +2185,7 @@
     <el-dialog
       v-el-drag-dialog
       class="sop"
-      title="璁惧SOP棰勮"
+      title="SOP棰勮"
       :visible.sync="SopDialogVisible"
       width="800px"
       :close-on-click-modal="false"
@@ -2775,7 +2775,7 @@
       this.operation = operation
       this.dialogVisible = true
       this.dialogForm.data_sources = 'MES'
-
+      this.sourceType = true
       this.$nextTick(() => {
         this.setSort()
       })
@@ -2897,6 +2897,7 @@
             )
           })
           this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+          this.sourceType = true
         } else {
           const data2 = {
             wkshopcode: this.dialogForm.wkshopcode,
@@ -2914,6 +2915,7 @@
               )
             })
             this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+            this.sourceType = false
           }
         }
       } else {
@@ -2928,7 +2930,9 @@
             )
           })
           this.stepSelectedValue = this.stepTableData.map(i => i.stepcode)
+          this.sourceType = true
         } else {
+          this.sourceType = false
           await this.getBasicProcessData()
         }
       }
@@ -3679,7 +3683,7 @@
             }
           }, 0)
 
-          sums[index] += ' 鍗�'
+          sums[index] += ''
         }
       })
 

--
Gitblit v1.9.3