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/workOrder/workOrderClose.vue |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/views/workOrder/workOrderClose.vue b/src/views/workOrder/workOrderClose.vue
index f7fe008..4435910 100644
--- a/src/views/workOrder/workOrderClose.vue
+++ b/src/views/workOrder/workOrderClose.vue
@@ -15,6 +15,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-select
                 v-model="form.mesorderstus"
@@ -38,7 +54,7 @@
             <el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
               <el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�" />
             </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.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="鍗曟嵁绫诲瀷" style=" display: flex;">
@@ -1963,7 +1979,7 @@
   UpdateMesOrderStepSearch, MesOrderBitchClosedSeave
 } from '@/api/WorkOrder'
 import { PartSelect } from '@/api/ProductModel'
-import { PrentOrganization, StepData } from '@/api/GeneralBasicData'
+import { PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
 import Sortable from 'sortablejs'
 import ElDragSelect from '@/components/DragSelect'
 import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
@@ -1984,6 +2000,7 @@
       tableHeight: 0,
       username: '',
       form: {
+        wkshopcode: '',
         mesorderstus: '', // 宸ュ崟鐘舵�佺爜
         mesordercode: '', // 宸ュ崟缂栧彿
         partcode: '', // 浜у搧缂栫爜
@@ -2010,6 +2027,7 @@
         // { code: 'NOSCHED', name: '寰呮帓绋�' },
         // { code: 'SCHED', name: '宸叉帓绋�' }
       ],
+      wkshopcodeArr: [],
       total: 10,
       tableData: [],
       dialogVisible: false,
@@ -2278,8 +2296,13 @@
       this.getMesOrderClosedSearch().then(res => {
         if (res.code === '200') {
           this.getSelect()
+          this.getPrentOrganizationNoCompany()
         }
       })
+    },
+    async getPrentOrganizationNoCompany() {
+      const { data: res } = await PrentOrganizationNoCompany()
+      this.wkshopcodeArr = res
     },
     async getMesOrderClosedSearch() {
       // let tempDate = this.form.createdate
@@ -2288,6 +2311,7 @@
       // }
 
       const data = {
+        wkshopcode: this.form.wkshopcode,
         mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
         mesordercode: this.form.mesordercode, // 宸ュ崟缂栧彿
         partcode: this.form.partcode, // 浜у搧缂栫爜
@@ -2359,6 +2383,7 @@
 
     // 閲嶇疆
     reset(val) {
+      this.form.wkshopcode = ''
       this.form.mesorderstus = ''
       this.form.mesordercode = ''
       this.form.partcode = ''

--
Gitblit v1.9.3