diff --git a/components/GridDetail.vue b/components/GridDetail.vue
index bc2bad0..2eb948b 100644
--- a/components/GridDetail.vue
+++ b/components/GridDetail.vue
@@ -74,14 +74,6 @@
| 分录ID |
{{data.data.flid}} |
-
- | 来源部门 |
- {{data.data.bmmc}} |
-
-
- | 去向部门 |
- {{data.data.zzmc}} |
-
| 仓库名称 |
{{data.data.ckmc}} |
@@ -102,10 +94,6 @@
单位 |
{{data.data.jldw}} |
-
- | 库位 |
- {{data.data.kwbm}} |
-
| 数量 |
{{data.data.sl}} |
@@ -118,6 +106,10 @@
剩余数量 |
{{data.data.sysl}} |
+
+ | 已分配数量 |
+ {{data.data.assign_qty}} |
+
| 库存 |
{{data.data.kcsl}} |
diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue
index 094f0af..237f9cc 100644
--- a/pages/management/in-storage_new.vue
+++ b/pages/management/in-storage_new.vue
@@ -68,18 +68,17 @@
- 物料编号 |
- 仓库名称 |
+ 物料编号 |
物料名称 |
- 物料编号 |
+ 跟踪号 |
+ 仓库名称 |
单位 |
- 库位 |
数量 |
总数 |
{{crType === 'IN'? '已入数量':'已出数量'}} |
剩余数量 |
+ 已分配数量 |
库存 |
- 跟踪号 |
操作人 |
仓管员 |
操作日期 |
@@ -94,18 +93,17 @@
- {{el.wlbm}} |
- {{el.ckmc}} |
+ {{el.wlbm}} |
{{el.wlmc}} |
- {{el.wlbm}} |
+ {{el.gzhbm}} |
+ {{el.ckmc}} |
{{el.jldw}} |
- {{el.kwbm}} |
{{el.sl}} |
{{el.wlzs}} |
{{el.czsl}} |
{{el.sysl}} |
+ {{el.assign_qty}} |
{{el.kcsl}} |
- {{el.gzhbm}} |
{{el.update_name}} |
{{el.cgymc}} |
{{el.update_time}} |
@@ -136,22 +134,28 @@
库位编码
数量
库存数量
+ 单据编号
+ 分录序号
+ 备注
{{t+1}}
{{ele.wlbm}}
{{ele.wlmc}}
- {{ele.kwbm}}
-
+ {{ele.kwbm}}
+
- {{ele.fpsl}}
-
+ {{ele.fpsl}}
+
{{ele.kcsl}}
+ {{ele.djbh}}
+ {{ele.flxh}}
+ {{ele.bz}}
{{t+1}}
@@ -166,6 +170,9 @@
{{ele.kcsl}}
+ {{ele.djbh}}
+ {{ele.flxh}}
+ {{ele.bz}}
@@ -393,6 +400,7 @@
this.$set(el, 'status', obj.status)
})
this.popData = [...res.result]
+ this.sortArr(this.popData)
this.popObj = e
this.show = true
} else {
@@ -402,6 +410,16 @@
})
}
},
+ sortArr (arr) {
+ // 按单据编号排序，单据编号相同按照分录序号排序
+ arr.sort((a, b) => {
+ if (a.djbh !== b.djbh) {
+ return a.djbh < b.djbh ? -1 : 1
+ } else {
+ return a.flxh < b.flxh ? -1 : 1
+ }
+ })
+ },
// 点击二级表格行中的物料编号，弹窗加载表格 -> 点击确定按钮
async _updateAssignDtl () {
this.popdisabled = true
@@ -429,6 +447,7 @@
let res = await inWarehouseAssignLocation(this.subCheckData, this.crType)
if (res.code ===1) {
this.popData = [...res.result]
+ this.sortArr(this.popData)
this.show = true
} else {
uni.showToast({
diff --git a/utils/mork2.js b/utils/mork2.js
index 1c6e881..2108a47 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -1817,82 +1817,111 @@ export const easOutInBillDetailUpdate = () => {
}
export const viewAssignDtl = () => {
let res = {
- "pageNum": 1,
- "pageSize": 10,
- "totalPage": 1,
- "totalElements": 1,
"result": [
- {
- "size": 10,
- "page": 0,
- "sort": null,
- "isAsc": null,
- "type": null,
- "fuzzy": null,
- "is_used": null,
- "start_time": null,
- "end_time": null,
- "doP": {
- "startTime": {
- "k": [
- "create_time"
- ],
- "type": "LT"
- },
- "endTime": {
- "k": [
- "create_time"
- ],
- "type": "LE"
- },
- "sort": {
- "k": [
- "sort"
- ],
- "type": "BY"
- },
- "blurry": {
- "k": [
- "name"
- ],
- "type": "LK"
- }
- },
- "id": null,
- "djid": "btAAAAW8Wd5QCrde",
+ {
+ "djbh": "a1",
+ "flxh": "ca1",
+ "wlbm": "910200200098",
+ "wlmc": "螺钉GB70.1-M12x30-8.8",
+ "kwbm": 'a01',
+ "fpsl": '1',
+ "kcsl": '2',
+ "djid": "btAAAAW8Wd5QCrde",
"djlx": "LLCKD",
"ywlx": "OUT",
- "djbh": "SOUT04240408783",
- "zzbm": "01.09.07",
- "zzmc": "四期智能工厂",
- "btbz": "04.2512804叉车线边库领料",
- "djzt": "提交",
- "cjsj": "2024-04-25",
- "ywrq": "2024-04-25",
- "cjr": "系统",
- "flid": "btAAAAW8Wd8Rd0u0",
- "flxh": "1",
- "wlbm": "910200200098",
- "wlmc": "螺钉GB70.1-M12x30-8.8",
- "ggxh": "内六角圆柱头螺钉GB70.1-M12x30-8.8-c1B",
- "pc": null,
- "jldw": "PCS",
- "jbjldw": "PCS",
- "fzjldw": null,
- "sl": 1050,
- "jbsl": "1050",
- "fzsl": "0",
- "ckbm": "3.04.001",
- "ckmc": "智能原材料库",
- "kwbm": null,
- "kwmc": null,
- "flbz": null,
- "sysl": 1050,
- "czsl": 0,
- "code": "1783279018838200320",
- "cksj": null,
- "llr": null
- }
+ "bz": 'dlfjlfjljfljfljfljf'
+ },
+ {
+ "djbh": "a2",
+ "flxh": "1",
+ "wlbm": "910200200098",
+ "wlmc": "螺钉GB70.1-M12x30-8.8",
+ "kwbm": 'a01',
+ "fpsl": '1',
+ "kcsl": '2',
+ "djid": "btAAAAW8Wd5QCrde",
+ "djlx": "LLCKD",
+ "ywlx": "OUT",
+ "bz": 'dlfjlfjljfljfljfljf'
+ },
+ {
+ "djbh": "a3",
+ "flxh": "1",
+ "wlbm": "910200200098",
+ "wlmc": "螺钉GB70.1-M12x30-8.8",
+ "kwbm": 'a01',
+ "fpsl": '1',
+ "kcsl": '2',
+ "djid": "btAAAAW8Wd5QCrde",
+ "djlx": "LLCKD",
+ "ywlx": "OUT",
+ "bz": 'dlfjlfjljfljfljfljf'
+ },
+ {
+ "djbh": "a4",
+ "flxh": "1",
+ "wlbm": "910200200098",
+ "wlmc": "螺钉GB70.1-M12x30-8.8",
+ "kwbm": 'a01',
+ "fpsl": '1',
+ "kcsl": '2',
+ "djid": "btAAAAW8Wd5QCrde",
+ "djlx": "LLCKD",
+ "ywlx": "OUT",
+ "bz": 'dlfjlfjljfljfljfljf'
+ },
+ {
+ "djbh": "a2",
+ "flxh": "1",
+ "wlbm": "910200200098",
+ "wlmc": "螺钉GB70.1-M12x30-8.8",
+ "kwbm": 'a01',
+ "fpsl": '1',
+ "kcsl": '2',
+ "djid": "btAAAAW8Wd5QCrde",
+ "djlx": "LLCKD",
+ "ywlx": "OUT",
+ "bz": 'dlfjlfjljfljfljfljf'
+ },
+ {
+ "djbh": "a1",
+ "flxh": "ca2",
+ "wlbm": "910200200098",
+ "wlmc": "螺钉GB70.1-M12x30-8.8",
+ "kwbm": 'a01',
+ "fpsl": '1',
+ "kcsl": '2',
+ "djid": "btAAAAW8Wd5QCrde",
+ "djlx": "LLCKD",
+ "ywlx": "OUT",
+ "bz": 'dlfjlfjljfljfljfljf'
+ },
+ {
+ "djbh": "a2",
+ "flxh": "1",
+ "wlbm": "910200200098",
+ "wlmc": "螺钉GB70.1-M12x30-8.8",
+ "kwbm": 'a01',
+ "fpsl": '1',
+ "kcsl": '2',
+ "djid": "btAAAAW8Wd5QCrde",
+ "djlx": "LLCKD",
+ "ywlx": "OUT",
+ "bz": 'dlfjlfjljfljfljfljf'
+ },
+ {
+ "djbh": "a1",
+ "flxh": "ca1",
+ "wlbm": "910200200098",
+ "wlmc": "螺钉GB70.1-M12x30-8.8",
+ "kwbm": 'a01',
+ "fpsl": '1',
+ "kcsl": '2',
+ "djid": "btAAAAW8Wd5QCrde",
+ "djlx": "LLCKD",
+ "ywlx": "OUT",
+ "bz": 'dlfjlfjljfljfljfljf'
+ }
],
"code": 1,
"desc": "查询成功"