From e20c8cf7ad6d2a85817c5627fc9ee7c755884d5b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 02 十一月 2023 09:22:53 +0800
Subject: [PATCH] 1.统计报表  加上车间名称的查询条件

---
 src/views/produce/stepReport.vue |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 1ba74b9..008b90c 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -88,6 +88,23 @@
                     @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
                   />
                 </el-form-item>
+                <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+                  <el-select
+                    v-model="form.wkshopcode"
+                    filterable
+                    :popper-append-to-body="false"
+                    style="width: 200px"
+                    placeholder="璇烽�夋嫨"
+                  >
+                    <el-option
+                      v-for="item in wkshopcodeArr"
+                      :key="item.torg_code"
+                      :label="item.torg_name"
+                      :value="item.torg_code"
+                    />
+                  </el-select>
+                </el-form-item>
+
                 <!--                <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
                 <!--                  <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />-->
                 <!--                </el-form-item>-->
@@ -204,6 +221,13 @@
                   {{ row.partspec ? row.partspec : '/' }}
                 </template>
               </el-table-column>
+              <el-table-column
+                prop="wkshp_name"
+                min-width="110"
+                show-tooltip-when-overflow
+                label="杞﹂棿鍚嶇О"
+                sortable="custom"
+              />
               <el-table-column
                 prop="stepname"
                 label="宸ュ簭鍚嶇О"
@@ -522,7 +546,6 @@
           />
           <el-table-column
             prop="stepcode"
-            show-tooltip-when-overflow
             label="缂洪櫡缂栫爜/鍚嶇О"
             align="center"
             min-width="450"
@@ -549,7 +572,6 @@
           <el-table-column
             prop="badqty"
             label="涓嶈壇鏁伴噺"
-            show-tooltip-when-overflow
             align="center"
           >
             <template slot-scope="{row}">
@@ -662,7 +684,6 @@
           <el-table-column
             prop="repair_qty"
             label="缁翠慨鍚堟牸鏁伴噺"
-            show-tooltip-when-overflow
             align="center"
           >
             <template slot-scope="{row}">
@@ -678,7 +699,6 @@
           <el-table-column
             prop="laborbad_qty"
             label="宸ュ簾鏁伴噺"
-            show-tooltip-when-overflow
             align="center"
           >
             <template slot-scope="{row}">
@@ -694,7 +714,6 @@
           <el-table-column
             prop="materielbad_qty"
             label="鏂欏簾鏁伴噺"
-            show-tooltip-when-overflow
             align="center"
           >
             <template slot-scope="{row}">
@@ -783,7 +802,7 @@
   EqpPermissions,
   GroupsPermissions,
   GroupsPersonPermissions,
-  PersonPermissions
+  PersonPermissions, PrentOrganizationNoCompany
 } from '@/api/GeneralBasicData'
 import { nanoid } from 'nanoid'
 import { LabelBarCode } from '@/api/systemSetting'
@@ -800,6 +819,7 @@
       mainHeight: 0,
       tableHeight: 0,
       form: {
+        wkshopcode: '',
         wocode: '', // 宸ュ崟鍙�
         partcode: '', // 浜у搧缂栫爜
         partname: '', // 浜у搧鍚嶇О
@@ -809,6 +829,7 @@
         page: 1, // 绗嚑椤�
         rows: 20 // 姣忛〉澶氬皯鏉�
       },
+      wkshopcodeArr: [],
       total: 10,
       tableData: [],
       activeName: '鐢熶骇鍒楄〃',
@@ -818,6 +839,7 @@
         { code: 'IN', name: '澶栧崗鏀舵枡' },
         { code: 'BAD', name: '涓嶈壇寰呭鐞�' }
       ],
+
       radioSelected: '', // 澶氶�夋閫変腑鍊�
 
       dialogVisible: false,
@@ -933,6 +955,9 @@
 
       const { data: res5 } = await CustomerPermissions() // 寰�鏉ュ崟浣�
       this.wxArr = res5
+
+      const { data: res6 } = await PrentOrganizationNoCompany()// 鏃犲叕鍙哥殑缁勭粐涓嬫媺
+      this.wkshopcodeArr = res6
     },
     tabClick() {
       let belong
@@ -1429,6 +1454,7 @@
       })
     },
     reset() {
+      this.form.wkshopcode = ''
       this.form.wocode = ''
       this.form.partcode = ''
       this.form.partname = ''

--
Gitblit v1.9.3