From 16edbbe772e24eb71f6519558576d513e3cf2746 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 9月 2025 15:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/DF22001YiQi

---
 yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue b/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
index b837b91..22bb665 100644
--- a/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
+++ b/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
@@ -73,6 +73,20 @@
                 </a-form-item>
               </a-col>
               <a-col :md="colMd" :sm="colSm">
+              <a-form-item label="鏄惁鏈夋垚鍝佺爜" >
+                <a-select
+                  allow-clear
+                  style="width: 100%"
+                  v-model="queryParam.IsHaveOP80Code"
+                  placeholder="璇烽�夋嫨鏄惁鏈夋垚鍝佺爜"
+                >
+                  <a-select-option v-for="(item, index) in IsHaveOP80Code" :key="index" :value="item.code">
+                    {{ item.name }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+              <a-col :md="colMd" :sm="colSm">
                 <a-form-item label="璐ㄩ噺鐘舵��">
                   <a-select
                     allow-clear
@@ -325,6 +339,12 @@
           dataIndex: 'timeSceonds'
         },
         {
+          title: '澶瑰叿宸ヤ綅',
+          align: 'center',
+          sorter: true,
+          dataIndex: 'jiaJuGongWei'
+        },
+        {
           title: '鏉ユ簮',
           align: 'center',
           sorter: true,
@@ -384,6 +404,7 @@
   created() {
     this.getEquipmentName()
     this.ProcessSelectData = this.$options.filters['dictData']('process_type')
+    this.IsHaveOP80Code = this.$options.filters['dictData']('yes_or_no')
     this.WorkPieceSelectData = this.$options.filters['dictData']('workpiece_state')
 
     this.modelEnums = [

--
Gitblit v1.9.3