diff --git a/common/style/layout.css b/common/style/layout.css
index 0afcbee..009e95e 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -524,6 +524,9 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
height: 40px;
font-size: 12px;
}
+.popChecked .zd-pop-td {
+ background-color: RGBA(23, 123, 172, 1);
+}
.pop-input {
width: 100%;
height: 28px;
diff --git a/common/style/reset.css b/common/style/reset.css
index 45be82e..22d0195 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -150,6 +150,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
.mgl10 {
margin-left: 10px;
}
+.mgl52 {
+ margin-left: 52px;
+}
.mgr5 {
margin-right: 5px;
}
diff --git a/pages/management/alloc-maintenance.vue b/pages/management/alloc-maintenance.vue
index 00d6bf2..986889d 100644
--- a/pages/management/alloc-maintenance.vue
+++ b/pages/management/alloc-maintenance.vue
@@ -3,13 +3,16 @@
-
-
-
-
+
+
+
+
+
+
+
-
+
调拨单
@@ -67,6 +70,7 @@
| 调出库位 |
计划调入日期 |
计划调出日期 |
+ 跟踪号 |
更多 |
@@ -121,6 +125,9 @@
{{el.jhdcrq}}
+
+ {{el.gzh}}
+ |
|
@@ -138,26 +145,25 @@
{{el.drckmc}} |
{{el.drkwbm}} |
{{el.dcckbm}} |
- {{el.drckmc}} |
+ {{el.dcckmc}} |
{{el.dckwbm}} |
{{el.jhdrrq}} |
{{el.jhdcrq}} |
+ {{el.gzh}} |
|
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -172,14 +178,40 @@
修改{{modalObj.title}}
-
-
+
+
-
+
+
+
+
+
+ 序号
+ 物料名称
+ 物料编码
+ 计量单位
+ 可用数量
+ 批次
+ 仓库
+ 库位
+ 跟踪号
+
+
+ {{t+1}}
+ {{ele.materialName}}
+ {{ele.materialNo}}
+ {{ele.unitNo}}
+ {{ele.curStoreQty}}
+ {{ele.lot}}
+ {{ele.warehouseName}}
+ {{ele.locationName}}
+ {{ele.trackNo}}
+
+
@@ -198,7 +230,7 @@
import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue'
- import {getWarehouseInfo, allocationPage, allocationBillPage, allocationBillUpdate, allocationBillConfirm} from '@/utils/getData2.js'
+ import {getWarehouseInfo, getOrganizationInfo, getUserInfo, allocationPage, allocationBillPage, allocationBillUpdate, allocationBillConfirm, allocationBillInventoryInfo} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -237,11 +269,17 @@
modalObj: {},
disabled: false,
value1: '',
- range1: []
+ range1: [],
+ value2: '',
+ range2: [],
+ dataList3: [],
+ iid: ''
};
},
created () {
this._getWarehouseInfo()
+ this._getOrganizationInfo()
+ this._getUserInfo()
},
methods: {
// 仓库下拉框
@@ -253,10 +291,32 @@
this.$set(e, 'text', e.ckmc)
this.$set(e, 'value', e.ckbm)
})
- this.range1 = [...this.range]
this.toSearch()
}
},
+ // 组织信息下拉框
+ async _getOrganizationInfo () {
+ let res = await getOrganizationInfo()
+ if (res.code === 1) {
+ this.range1 = [...res.result]
+ this.range1.map(e => {
+ this.$set(e, 'text', e.kczzmc)
+ this.$set(e, 'value', e.kczzbm)
+ })
+ this.toSearch()
+ }
+ },
+ // 仓管员下拉框
+ async _getUserInfo () {
+ let res = await getUserInfo()
+ if (res.code === 1) {
+ this.range2 = [...res.result]
+ this.range2.map(e => {
+ this.$set(e, 'text', e.cgymc)
+ this.$set(e, 'value', e.cgybm)
+ })
+ }
+ },
// 查询一级表格
toSearch () {
this.queryParams1 = {
@@ -270,7 +330,7 @@
},
// 一级表格接口
async _allocationPage () {
- let res = await allocationPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+ let res = await allocationPage(this.val1, this.value1, this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
if (res.code === 1) {
this.dataList1 = [...res.result]
this.totalCount1 = Number(res.totalElements)
@@ -359,6 +419,17 @@
console.log(e)
}
},
+ // 根据跟踪号查询库存列表
+ async _allocationBillInventoryInfo (id) {
+ let res = await allocationBillInventoryInfo(id)
+ if (res.code === 1) {
+ this.dataList3 = [...res.result]
+ }
+ },
+ // 跟踪号查询库存列表选中一行
+ toCheck3 (e) {
+ this.iid = e.trackNo === this.iid ? '' : e.trackNo
+ },
// 修改调出仓库弹窗
checkWarehouse (type, title, e) {
this.modalObj = {type: type, title: title, id: e.flid}
@@ -366,10 +437,12 @@
this.value = e.dcckbm
} else if (type === 2) {
this.value = e.drckbm
+ } else if (type === 5) {
+ this._allocationBillInventoryInfo(e.gzh)
}
this.show = true
},
- // 修改调出仓库确定
+ // 修改调出仓库确定和修改跟踪号
modalConfirm () {
let mc = ''
this.range.map(el => {
@@ -394,6 +467,13 @@
obj = e
}
})
+ } else if (this.modalObj.type === 5) {
+ this.dataList2.map(e => {
+ if (e.flid === this.modalObj.id) {
+ e.gzh = this.iid
+ obj = e
+ }
+ })
}
this.show = false
this._allocationBillUpdate(obj)
diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
index 52dbab2..850296a 100644
--- a/pages/management/in-storage.vue
+++ b/pages/management/in-storage.vue
@@ -3,21 +3,16 @@
-
-
-
+
+
+
-
-
+
+
+
-
+
@@ -37,6 +32,7 @@
业务日期
操作日期
操作人
+ 仓管员
更多
@@ -50,62 +46,75 @@
{{e.zzmc}}
{{e.ckmc}}
{{e.djzt}}
- {{e.cjsj}}
+ {{e.cjsj}}
{{e.cjr}}
- {{e.ywrq}}
- {{e.update_time}}
+ {{e.ywrq}}
+ {{e.update_time}}
{{e.update_name}}
+ {{e.cgymc}}
-
-
- 序号
- 选择
- 仓库名称
- 物料编号
- 物料名称
- 单位
- 库位
- 数量
- {{crType === 'IN'? '已入数量':'已出数量'}}
- 剩余数量
- 库存
- 操作人
- 操作日期
- 更多
+
+
+
+
+
+ | 序号 |
+ 选择 |
+ 仓库名称 |
+ 物料编号 |
+ 物料名称 |
+ 单位 |
+ 库位 |
+ 数量 |
+ {{crType === 'IN'? '已入数量':'已出数量'}} |
+ 剩余数量 |
+ 库存 |
+ 操作人 |
+ 仓管员 |
+ 操作日期 |
+ 更多 |
+
+
+
+
+ | {{j+1}} |
+
+
+
+
+ |
+ {{el.ckmc}} |
+ {{el.wlbm}} |
+ {{el.wlmc}} |
+ {{el.jldw}} |
+ {{el.kwbm}} |
+ {{el.sl}} |
+ {{el.czsl}} |
+ {{el.sysl}} |
+ {{el.kcsl}} |
+ {{el.update_name}} |
+ {{el.cgymc}} |
+ {{el.update_time}} |
+
+
+ |
+
+
+
-
- {{j+1}}
-
- {{el.ckmc}}
- {{el.wlbm}}
- {{el.wlmc}}
- {{el.jldw}}
- {{el.kwbm}}
- {{el.sl}}
- {{el.czsl}}
- {{el.sysl}}
- {{el.kcsl}}
- {{el.update_name}}
- {{el.update_time}}
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -175,7 +184,8 @@
import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue'
- import {getWarehouseInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
+ // import {getWarehouseInfo, getUserInfo} from '@/utils/mork2.js'
+ import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -206,7 +216,7 @@
currentPage1: 1,
totalCount2: 0,
queryParams2:{
- pageSize: 10,
+ pageSize: 500,
pageNum: 1
},
currentPage2: 1,
@@ -219,10 +229,10 @@
checkArr3: [],
delShow: false,
detailObj: {},
- value: '',
- range:[{value: 1, text: '提交'}, {value: 2, text: '审核'}],
value1: '',
- range1: []
+ range1: [],
+ value2: '',
+ range2: []
};
},
onShow() {
@@ -240,6 +250,7 @@
},
created () {
this._getWarehouseInfo()
+ this._getUserInfo()
},
methods: {
// 仓库下拉框
@@ -254,6 +265,17 @@
this.toSearch()
}
},
+ // 仓管员下拉框
+ async _getUserInfo () {
+ let res = await getUserInfo()
+ if (res.code === 1) {
+ this.range2 = [...res.result]
+ this.range2.map(e => {
+ this.$set(e, 'text', e.cgymc)
+ this.$set(e, 'value', e.cgybm)
+ })
+ }
+ },
// 查询一级表格
toSearch () {
this.queryParams1 = {
@@ -267,7 +289,7 @@
},
// 一级表格接口
async _easOutInBillPage () {
- let res = await easOutInBillPage(this.val1, this.id, this.value, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+ let res = await easOutInBillPage(this.val1, this.id, this.value1, this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
if (res.code === 1) {
this.checkArr1 = []
res.result.map(el => {
@@ -325,7 +347,7 @@
this.dataList2 = []
if (this.pkId === e.djid) {
this.queryParams2 = {
- pageSize: 10,
+ pageSize: 500,
pageNum: 1
}
this.currentPage2 = 1
@@ -504,7 +526,7 @@
this.disabled2 = false
this.show = false
this.queryParams2 = {
- pageSize: 10,
+ pageSize: 500,
pageNum: 1
}
this.currentPage2 = 1
diff --git a/pages/management/receive-confirm.vue b/pages/management/receive-confirm.vue
index 1f9b883..ab4f7a1 100644
--- a/pages/management/receive-confirm.vue
+++ b/pages/management/receive-confirm.vue
@@ -3,13 +3,13 @@
-
-
-
-
+
+
+
+
-
+
收货确认
@@ -124,17 +124,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -171,7 +169,7 @@
import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue'
- import {getWarehouseInfo, receiptPage, receiptBillPage, receiptBillUpdate, receiptBillConfirm} from '@/utils/getData2.js'
+ import {getWarehouseInfo, getOrganizationInfo, receiptPage, receiptBillPage, receiptBillUpdate, receiptBillConfirm} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -214,6 +212,7 @@
},
created () {
this._getWarehouseInfo()
+ this._getOrganizationInfo()
},
methods: {
// 仓库下拉框
@@ -225,7 +224,18 @@
this.$set(e, 'text', e.ckmc)
this.$set(e, 'value', e.ckbm)
})
- this.range1 = [...this.range]
+ this.toSearch()
+ }
+ },
+ // 组织信息下拉框
+ async _getOrganizationInfo () {
+ let res = await getOrganizationInfo()
+ if (res.code === 1) {
+ this.range1 = [...res.result]
+ this.range1.map(e => {
+ this.$set(e, 'text', e.kczzmc)
+ this.$set(e, 'value', e.kczzbm)
+ })
this.toSearch()
}
},
diff --git a/utils/getData2.js b/utils/getData2.js
index 3bacb4c..f8fc687 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -24,13 +24,13 @@ export const getBillsCount = (area) => request({
* 出入库
*/
// 1.分页查询出入库单据
-export const easOutInBillPage = (fuzzy, djlx, djzt, ckbm, page, size) => request({
+export const easOutInBillPage = (fuzzy, djlx, ckbm, cgybm, page, size) => request({
url:'api/easOutInBill/page',
data: {
fuzzy: fuzzy,
djlx: djlx,
- djzt: djzt,
ckbm: ckbm,
+ cgybm: cgybm,
page: page,
size: size
}
@@ -59,6 +59,16 @@ export const easOutInBillDetailUpdate = (arr) => request({
url:'api/easOutInBillDetail/update',
data: arr
})
+// 6.获取仓管员信息 ------ 下拉框带搜索功能
+export const getUserInfo = () => request({
+ url:'api/easOutInBill/getUserInfo',
+ data: {}
+})
+// 7.获取组织机构信息 ------ 下拉框带搜索功能
+export const getOrganizationInfo = () => request({
+ url:'api/easOutInBill/getOrganizationInfo',
+ data: {}
+})
/**
* 调拨维护
@@ -69,11 +79,12 @@ export const getWarehouseInfo = () => request({
data: {}
})
// 2.查询调拨单据
-export const allocationPage = (fuzzy, ckbm, page, size) => request({
+export const allocationPage = (fuzzy, kczzbm, cgybm, page, size) => request({
url:'api/allocationBill/allocationPage',
data: {
fuzzy: fuzzy,
- ckbm: ckbm,
+ kczzbm: kczzbm,
+ cgybm: cgybm,
page: page,
size: size
}
@@ -97,16 +108,21 @@ export const allocationBillConfirm = (arr) => request({
url:'api/allocationBill/confirm',
data: arr
})
+// 6.根据跟踪号查询库存列表
+export const allocationBillInventoryInfo = (arr) => request({
+ url:'api/allocationBill/queryInventoryInfo',
+ data: arr
+})
/**
* 收货确认
*/
// 1.收货单据分页
-export const receiptPage = (fuzzy, ckbm, page, size) => request({
+export const receiptPage = (fuzzy, kczzbm, page, size) => request({
url:'api/receiptBill/receiptPage',
data: {
fuzzy: fuzzy,
- ckbm: ckbm,
+ kczzbm: kczzbm,
page: page,
size: size
}
diff --git a/utils/mork2.js b/utils/mork2.js
index a251e43..989994d 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -539,6 +539,32 @@ export const getWarehouseInfo = () => {
}
return res
}
+export const getUserInfo = () => {
+ let res = {
+ "result": [
+ {
+ "cgybm": "1",
+ "cgymc": "admin"
+ }
+ ],
+ "code": 1,
+ "desc": "查询成功"
+ }
+ return res
+}
+export const getOrganizationInfo = () => {
+ let res = {
+ "result": [
+ {
+ "kczzbm": "a110",
+ "kczzmc": "管理部"
+ }
+ ],
+ "code": 1,
+ "desc": "查询成功"
+ }
+ return res
+}
export const allocationPage = () => {
let res = {
"pageNum": 1,
@@ -581,7 +607,7 @@ export const allocationPage = () => {
"drckmc": "销售成品仓-浙江大区",
"drkwbm": null,
"drkwmc": null,
- "gzh": null,
+ "gzh": 'aljljdljf',
"jhdrrq": "2024-05-01",
"jhdcrq": "2024-05-02",
"flbz": null
@@ -994,7 +1020,7 @@ export const allocationBillPage = () => {
"drckmc": "销售配件仓",
"drkwbm": null,
"drkwmc": null,
- "gzh": null,
+ "gzh": 'djlfjlfjlfj',
"jhdrrq": "2024-05-01",
"jhdcrq": "2024/05/08 17:09:47",
"flbz": null
@@ -1059,6 +1085,75 @@ export const allocationBillConfirm = () => {
}
return res
}
+export const allocationBillInventoryInfo = () => {
+ let res = {
+ code: 1,
+ desc: 'ok',
+ result: [
+ {
+ "locationNo": "01.09.07",
+ "locationName": "四期智能工厂",
+ "materialNo": "255025010002",
+ "materialName": "多路阀(三联晨光)",
+ "lot": '20201010',
+ "unitNo": "PCS",
+ "curStoreQty": "2",
+ "warehouseNo": "3.04.001",
+ "warehouseName": "智能原材料库",
+ "trackNo": '1'
+ },
+ {
+ "locationNo": "01.09.07",
+ "locationName": "四期智能工厂",
+ "materialNo": "255025010002",
+ "materialName": "多路阀(三联晨光)",
+ "lot": '20201010',
+ "unitNo": "PCS",
+ "curStoreQty": "2",
+ "warehouseNo": "3.04.001",
+ "warehouseName": "智能原材料库",
+ "trackNo": '2'
+ },
+ {
+ "locationNo": "01.09.07",
+ "locationName": "四期智能工厂",
+ "materialNo": "255025010002",
+ "materialName": "多路阀(三联晨光)",
+ "lot": '20201010',
+ "unitNo": "PCS",
+ "curStoreQty": "2",
+ "warehouseNo": "3.04.001",
+ "warehouseName": "智能原材料库",
+ "trackNo": '3'
+ },
+ {
+ "locationNo": "01.09.07",
+ "locationName": "四期智能工厂",
+ "materialNo": "255025010002",
+ "materialName": "多路阀(三联晨光)",
+ "lot": '20201010',
+ "unitNo": "PCS",
+ "curStoreQty": "2",
+ "warehouseNo": "3.04.001",
+ "warehouseName": "智能原材料库",
+ "trackNo": '4'
+ },
+ {
+ "locationNo": "01.09.07",
+ "locationName": "四期智能工厂",
+ "materialNo": "255025010002",
+ "materialName": "多路阀(三联晨光)",
+ "lot": '20201010',
+ "unitNo": "PCS",
+ "curStoreQty": "2",
+ "warehouseNo": "3.04.001",
+ "warehouseName": "智能原材料库",
+ "trackNo": '5'
+ }
+ ]
+ }
+ return res
+}
export const receiptPage = () => {
let res = {
"pageNum": 1,