This commit is contained in:
蔡玲
2024-10-29 18:01:39 +08:00
parent f2b1ece554
commit 5ebe651655
3 changed files with 139 additions and 99 deletions

View File

@@ -68,18 +68,17 @@
<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
</view>
</th>
<th class="fontcol1" v-if="id === 'CGRKD' || id === 'LLCKD'">物料编号</th>
<th>仓库名称</th>
<th class="fontcol1">物料编号</th>
<th>物料名称</th>
<th class="fontcol1" v-if="id !== 'CGRKD' && id !== 'LLCKD'">物料编</th>
<th>跟踪</th>
<th>仓库名称</th>
<th>单位</th>
<th>库位</th>
<th>数量</th>
<th>总数</th>
<th>{{crType === 'IN'? '已入数量':'已出数量'}}</th>
<th>剩余数量</th>
<th>已分配数量</th>
<th>库存</th>
<th>跟踪号</th>
<th>操作人</th>
<th v-if="crType === 'OUT'">仓管员</th>
<th>操作日期</th>
@@ -94,18 +93,17 @@
<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
</view>
</td>
<td class="underline fontcol1" v-if="id === 'CGRKD' || id === 'LLCKD'" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
<td>{{el.ckmc}}</td>
<td class="underline fontcol1" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
<td>{{el.wlmc}}</td>
<td class="underline fontcol1" v-if="id !== 'CGRKD' && id !== 'LLCKD'" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
<td>{{el.gzhbm}}</td>
<td>{{el.ckmc}}</td>
<td>{{el.jldw}}</td>
<td>{{el.kwbm}}</td>
<td>{{el.sl}}</td>
<td>{{el.wlzs}}</td>
<td>{{el.czsl}}</td>
<td>{{el.sysl}}</td>
<td>{{el.assign_qty}}</td>
<td>{{el.kcsl}}</td>
<td>{{el.gzhbm}}</td>
<td>{{el.update_name}}</td>
<td v-if="crType === 'OUT'">{{el.cgymc}}</td>
<td>{{el.update_time}}</td>
@@ -136,22 +134,28 @@
<view class="zd-col-5 zd-sec-th"><text>库位编码</text></view>
<view class="zd-col-4 zd-sec-th"><text>数量</text></view>
<view class="zd-col-4 zd-sec-th"><text>库存数量</text></view>
<view class="zd-col-4 zd-sec-th"><text>单据编号</text></view>
<view class="zd-col-4 zd-sec-th"><text>分录序号</text></view>
<view class="zd-col-4 zd-sec-th"><text>备注</text></view>
</view>
<view v-if="type === 1" class="zd-row zd-td-wraper" v-for="(ele, t) in popData" :key="ele.id">
<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.wlbm}}</text></view>
<view class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.wlmc}}</text></view>
<view v-show="ele.status" class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.kwbm}}</text></view>
<view v-show="!ele.status" class="zd-col-5 zd-sec-td zd-pop-td">
<view v-show="!ele.status" class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.kwbm}}</text></view>
<view v-show="ele.status" class="zd-col-5 zd-sec-td zd-pop-td">
<scan-input
v-model="ele.kwbm"
/>
</view>
<view v-show="ele.status" class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.fpsl}}</text></view>
<view v-show="!ele.status" class="zd-col-4 zd-sec-td zd-pop-td">
<view v-show="!ele.status" class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.fpsl}}</text></view>
<view v-show="ele.status" class="zd-col-4 zd-sec-td zd-pop-td">
<input type="number" class="pop-input" v-model="ele.fpsl">
</view>
<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.kcsl}}</text></view>
<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.djbh}}</text></view>
<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.flxh}}</text></view>
<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.bz}}</text></view>
</view>
<view v-if="type === 2" class="zd-row zd-td-wraper" v-for="(ele, t) in popData" :key="ele.id">
<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
@@ -166,6 +170,9 @@
<input type="number" class="pop-input" v-model="ele.fpsl">
</view>
<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.kcsl}}</text></view>
<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.djbh}}</text></view>
<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.flxh}}</text></view>
<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.bz}}</text></view>
</view>
</view>
<view class="mgb20 zd-row jcenter">
@@ -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({