diff --git a/common/style/layout.css b/common/style/layout.css
index b8ed233..166a413 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -126,7 +126,7 @@ uni-toast .uni-toast {
width: calc(100% - 20px);
height: calc(100% - 112px);
margin: 0 auto;
- padding: 4px 0;
+ padding: 4px 0 10px 0;
border: 1px solid #01c2f3;
border-radius: 4px;
background-color: rgba(1, 114, 195, 40%);
diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue
index a1f9aae..6cb3e0b 100644
--- a/pages/management/in-storage_new.vue
+++ b/pages/management/in-storage_new.vue
@@ -127,54 +127,54 @@
-
+
分配明细
序号
物料编号
- 物料名称
- 库位编码
- 数量
- 库存数量
+ 物料名称
+ 库位编码
+ 数量
+ 库存数量
单据编号
- 分录序号
+ 分录序号
备注
{{t+1}}
{{ele.wlbm}}
- {{ele.wlmc}}
- {{ele.kwbm}}
-
+ {{ele.wlmc}}
+ {{ele.kwbm}}
+
- {{ele.fpsl}}
-
+ {{ele.fpsl}}
+
- {{ele.kcsl}}
+ {{ele.kcsl}}
{{ele.djbh}}
- {{ele.flxh}}
+ {{ele.flxh}}
{{ele.bz}}
{{t+1}}
{{ele.wlbm}}
- {{ele.wlmc}}
-
+ {{ele.wlmc}}
+
-
+
- {{ele.kcsl}}
+ {{ele.kcsl}}
{{ele.djbh}}
- {{ele.flxh}}
+ {{ele.flxh}}
{{ele.bz}}
@@ -296,11 +296,17 @@
this.$set(el, 'checked', false)
this.$set(el, 'subData', [])
this.$set(el, 'subAllChecked', false)
+ this.$set(el, 'subOneChecked', false)
})
this.dataList = [...res.result]
this.totalCount1 = Number(res.totalElements)
this.queryParams1.pageSize = Number(res.pageSize)
this.queryParams1.pageNum = Number(res.pageNum)
+ if (this.val1 && this.id !== 'WWFLD' && this.id !== 'CGRKD') {
+ this.dataList.map(el => {
+ this.loadSubData(el)
+ })
+ }
} else {
uni.showToast({
title: res.desc,
@@ -332,10 +338,11 @@
this._easOutInBillDetailPage(e)
}
e.subAllChecked = false
+ e.subOneChecked = false
},
// 二级表格接口
async _easOutInBillDetailPage (e) {
- let res = await easOutInBillDetailPage(e.djid, '1', '500')
+ let res = await easOutInBillDetailPage(this.val1, e.djid, '1', '500')
if (res.code === 1) {
res.result.map(el => {
this.$set(el, 'checked', false)
@@ -343,6 +350,8 @@
this.dataList.map(el => {
if (el.djid === e.djid) {
el.subData = [...res.result]
+ el.subAllChecked = false
+ el.subOneChecked = false
}
})
} else {
@@ -355,6 +364,7 @@
// 二级表格全选
toSubAllCheckbox (e) {
e.subAllChecked = !e.subAllChecked
+ e.subOneChecked = e.subAllChecked
e.subData.map(el => {
el.checked = e.subAllChecked
})
@@ -383,6 +393,7 @@
}
let arr = e.subData.filter(ele => ele.checked === true)
e.subAllChecked = arr.length === e.subData.length
+ e.subOneChecked = arr.length > 0
},
showPop (type, e, obj) {
this.type = type
@@ -461,22 +472,31 @@
this.popdisabled = false
return
}
- try {
- let res = await addAssignDtl(this.popData, this.crType)
- if (res.code === 1) {
- this.show = false
- this.checkData = []
- this.subCheckData = []
- this._easOutInBillPage()
+ try {
+ let res = await addAssignDtl(this.popData, this.crType)
+ if (res.code === 1) {
+ this.show = false
+ this.checkData = []
+ this.subCheckData = []
+ uni.showToast({
+ title: res.desc,
+ icon: 'none'
+ })
+ this.dataList.map(el => {
+ if (el.subOneChecked) {
+ this._easOutInBillDetailPage(el)
+ }
+ })
+ } else {
+ uni.showToast({
+ title: res.desc,
+ icon: 'none'
+ })
+ }
+ this.popdisabled = false
+ } catch (e) {
+ this.popdisabled = false
}
- uni.showToast({
- title: res.desc,
- icon: 'none'
- })
- this.popdisabled = false
- } catch (e) {
- this.popdisabled = false
- }
},
// 库存提交
inWarehouseSure () {
@@ -492,12 +512,21 @@
if (res.code === 1) {
this.checkData = []
this.subCheckData = []
- this._easOutInBillPage()
+ uni.showToast({
+ title: res.desc,
+ icon: 'none'
+ })
+ this.dataList.map(el => {
+ if (el.subOneChecked) {
+ this._easOutInBillDetailPage(el)
+ }
+ })
+ } else {
+ uni.showToast({
+ title: res.desc,
+ icon: 'none'
+ })
}
- uni.showToast({
- title: res.desc,
- icon: 'none'
- })
this.popdisabled = false
} catch (e) {
this.popdisabled = false
diff --git a/utils/getData2.js b/utils/getData2.js
index e6c250f..e29c5d3 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -39,6 +39,7 @@ export const easOutInBillPage = (fuzzy, djlx, ckbm, cgybm, page, size) => reques
export const easOutInBillDetailPage = (djid, page, size) => request({
url:'api/easOutInBillDetail/page',
data: {
+ fuzzy: fuzzy,
djid: djid,
page: page,
size: size