From 5bef91add4545277678cdcfb6a91f9bf87d653bc Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 15 Nov 2023 16:29:58 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=B7=A5=E5=8D=95=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product_manage/workorder/ViewDialog.vue   | 20 ++++++++++++++++++
 .../wms/product_manage/workorder/index.vue    | 21 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
index 8c5cb6a2..ef409798 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
@@ -96,6 +96,21 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="操作人">
+          <el-select
+            v-model="form.current_produce_person_id"
+            clearable
+            filterable
+            placeholder="请选择"
+            style="width: 200px"
+          >
+            <el-option
+              v-for="item in optNameList"
+              :label="item.person_name"
+              :value="item.user_id"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="物料系列">
           <el-input v-model="form.class_name" style="width: 200px;" />
         </el-form-item>
@@ -324,6 +339,7 @@
 </template>
 
 <script>
+import crudDevicerepairmst from '@/views/wms/device_manage/repair/devicerepair/devicerepairmst'
 import { crud } from '@crud/crud'
 import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
 import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
@@ -395,6 +411,7 @@ export default {
         is_canupdate_update: null,
         material_spec: null
       },
+      optNameList: [],
       workprocedureList: [],
       tableData: [],
       rules: {}
@@ -409,6 +426,9 @@ export default {
   },
   methods: {
     open() {
+      crudDevicerepairmst.getUser({}).then(res => {
+        this.optNameList = res
+      })
       this.getworkprocedure()
       this.getMaterialClass()
       crudProduceshiftorder.reportQuery3({ workorder_code: this.form.workorder_code }).then(res => {
diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue
index 1d237b17..018f5e75 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/index.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue
@@ -395,6 +395,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="操作人" prop="current_produce_person_id">
+            <el-select
+              v-model="form.current_produce_person_id"
+              clearable
+              filterable
+              size="mini"
+              placeholder="请选择/搜索"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in optNameList"
+                :label="item.person_name"
+                :value="item.user_id"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="销售单标识">
             <el-input v-model="form.sale_id" style="width: 200px;"/>
           </el-form-item>
@@ -737,6 +753,7 @@
 </template>
 
 <script>
+import crudDevicerepairmst from '@/views/wms/device_manage/repair/devicerepair/devicerepairmst'
 import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
@@ -839,6 +856,7 @@ export default {
       cxj: [{ value: 'A1_KXJ_1', label: '一线1号拆箱机' }, { value: 'A1_KXJ_2', label: '一线2号拆箱机' }],
       trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }],
       deviceList: [],
+      optNameList: [],
       classes3: [],
       materType: '01',
       materialShow: false,
@@ -889,6 +907,9 @@ export default {
     this.getworkprocedure()
     this.initClass3()
     this.getworkprocedureByarea(this.form.product_area)
+    crudDevicerepairmst.getUser({}).then(res => {
+      this.optNameList = res
+    })
   },
   methods: {
     databaseUploadApi() {