From 611a5a14f9bcbc399f923f04521e69948ec77b60 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 01 十一月 2023 16:54:05 +0800
Subject: [PATCH] 1.工单管理、生产执行 新增 车间名称查询

---
 src/views/produce/reportVerify.vue |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index 97831a9..2f0b3fc 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -16,6 +16,22 @@
           style="display: flex;"
         >
           <div class="elForm">
+            <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.wo_code" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
@@ -25,7 +41,7 @@
             <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
               <el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
-            <el-form-item label="浜у搧瑙勬牸" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
               <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
 
@@ -134,6 +150,13 @@
           <el-table-column
             prop="partname"
             label="浜у搧鍚嶇О"
+            sortable="custom"
+            show-overflow-tooltip
+            min-width="110"
+          />
+          <el-table-column
+            prop="wkshp_name"
+            label="杞﹂棿鍚嶇О"
             sortable="custom"
             show-overflow-tooltip
             min-width="110"
@@ -288,6 +311,7 @@
 import elDragDialog from '@/directive/el-drag-dialog'
 import waves from '@/directive/waves'
 import { MesOrderDistribution, MesOrderStepReportVerifySearch, MesOrderStepReportVerifySeave } from '@/api/WorkOrder'
+import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
 
 export default {
   name: 'Zzjg',
@@ -302,6 +326,7 @@
       mainHeight: 0,
       tableHeight: 0,
       form: {
+        wkshopcode: '',
         wo_code: '', // 宸ュ崟缂栫爜
         partnumber: '', // 浜у搧缂栫爜
         partname: '', // 浜у搧鍚嶇О
@@ -318,6 +343,7 @@
       },
       total: 10,
       tableData: [],
+      wkshopcodeArr: [],
 
       multipleSelection: []
 
@@ -330,9 +356,13 @@
     this.getHeight()
 
     this.getMesOrderStepReportVerifySearch()
+    this.getPrentOrganizationNoCompany()
   },
   methods: {
-
+    async getPrentOrganizationNoCompany() {
+      const { data: res } = await PrentOrganizationNoCompany()
+      this.wkshopcodeArr = res
+    },
     // 鎶ュ伐璋冩暣鍒楄〃鏌ヨ
     async getMesOrderStepReportVerifySearch() {
       let tempDate = this.form.reportdate
@@ -340,6 +370,7 @@
         tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
       }
       const data = {
+        wkshopcode: this.form.wkshopcode,
         wo_code: this.form.wo_code,
         partnumber: this.form.partnumber,
         partname: this.form.partname,
@@ -372,6 +403,7 @@
     },
     // 閲嶇疆
     reset() {
+      this.form.wkshopcode = ''
       this.form.wo_code = ''
       this.form.partnumber = ''
       this.form.partname = ''

--
Gitblit v1.9.3