From c7149356be83869dd7ac5dd62fcd9c4f70f334a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 23 Jun 2023 17:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E4=BA=BA=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/InDetail.vue  | 21 ++++++++++++++++++++-
 jshERP-web/src/views/report/OutDetail.vue | 21 ++++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index 1bb4e9916..bec2d6606 100644
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@@ -65,6 +65,15 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                        {{ item.userName }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input placeholder="请输入备注" v-model="queryParam.remark"></a-input>
@@ -122,7 +131,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectOrgan, findBillDetailByNumber} from '@/api/api'
+  import {findBySelectOrgan, findBillDetailByNumber, getUserList} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -152,6 +161,7 @@
           endTime: moment().format('YYYY-MM-DD'),
           roleType: Vue.ls.get('roleType'),
           type: "入库",
+          creator: "",
           remark: '',
         },
         ipagination:{
@@ -163,6 +173,7 @@
         defaultTimeStr: '',
         organList: [],
         depotList: [],
+        userList: [],
         tabKey: "1",
         // 表头
         columns: [
@@ -199,6 +210,7 @@
     created () {
       this.getDepotData()
       this.initSupplier()
+      this.initUser()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     mounted () {
@@ -235,6 +247,13 @@
           }
         })
       },
+      initUser() {
+        getUserList({}).then((res)=>{
+          if(res) {
+            this.userList = res;
+          }
+        });
+      },
       myHandleDetail(record) {
         findBillDetailByNumber({ number: record.number }).then((res) => {
           if (res && res.code === 200) {
diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue
index c35b9fcd1..bd0b02694 100644
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@@ -65,6 +65,15 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                        {{ item.userName }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input placeholder="请输入备注" v-model="queryParam.remark"></a-input>
@@ -122,7 +131,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectOrgan, findBillDetailByNumber} from '@/api/api'
+  import {findBySelectOrgan, findBillDetailByNumber, getUserList} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -152,6 +161,7 @@
           endTime: moment().format('YYYY-MM-DD'),
           roleType: Vue.ls.get('roleType'),
           type: "出库",
+          creator: "",
           remark: ''
         },
         ipagination:{
@@ -163,6 +173,7 @@
         defaultTimeStr: '',
         organList: [],
         depotList: [],
+        userList: [],
         tabKey: "1",
         // 表头
         columns: [
@@ -199,6 +210,7 @@
     created () {
       this.getDepotData()
       this.initSupplier()
+      this.initUser()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     mounted () {
@@ -235,6 +247,13 @@
           }
         })
       },
+      initUser() {
+        getUserList({}).then((res)=>{
+          if(res) {
+            this.userList = res;
+          }
+        });
+      },
       myHandleDetail(record) {
         findBillDetailByNumber({ number: record.number }).then((res) => {
           if (res && res.code === 200) {