diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index 1bb4e991..bec2d660 100644
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@@ -65,6 +65,15 @@
+
+
+
+
+ {{ item.userName }}
+
+
+
+
@@ -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 c35b9fcd..bd0b0269 100644
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@@ -65,6 +65,15 @@
+
+
+
+
+ {{ item.userName }}
+
+
+
+
@@ -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) {