root/pad-nl-three-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
components/GridDetail.vue
View File

@@ -74,14 +74,6 @@
<td>分录ID</td> <td>分录ID</td>
<td>{{data.data.flid}}</td> <td>{{data.data.flid}}</td>
</tr> </tr>
<tr>
<td>来源部门</td>
<td>{{data.data.bmmc}}</td>
</tr>
<tr>
<td>去向部门</td>
<td>{{data.data.zzmc}}</td>
</tr>
<tr> <tr>
<td>仓库名称</td> <td>仓库名称</td>
<td>{{data.data.ckmc}}</td> <td>{{data.data.ckmc}}</td>
@@ -102,10 +94,6 @@
<td>单位</td> <td>单位</td>
<td>{{data.data.jldw}}</td> <td>{{data.data.jldw}}</td>
</tr> </tr>
<tr>
<td>库位</td>
<td>{{data.data.kwbm}}</td>
</tr>
<tr> <tr>
<td>数量</td> <td>数量</td>
<td>{{data.data.sl}}</td> <td>{{data.data.sl}}</td>
@@ -118,6 +106,10 @@
<td>剩余数量</td> <td>剩余数量</td>
<td>{{data.data.sysl}}</td> <td>{{data.data.sysl}}</td>
</tr> </tr>
<tr>
<td>已分配数量</td>
<td>{{data.data.assign_qty}}</td>
</tr>
<tr> <tr>
<td>库存</td> <td>库存</td>
<td>{{data.data.kcsl}}</td> <td>{{data.data.kcsl}}</td>

47
pages/management/in-storage_new.vue
View File

@@ -68,18 +68,17 @@
<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view> <view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
</view> </view>
</th> </th>
<th class="fontcol1" v-if="id === 'CGRKD' || id === 'LLCKD'">物料编号</th> <th class="fontcol1">物料编号</th>
<th>仓库名称</th>
<th>物料名称</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>数量</th>
<th>总数</th> <th>总数</th>
<th>{{crType === 'IN'? '已入数量':'已出数量'}}</th> <th>{{crType === 'IN'? '已入数量':'已出数量'}}</th>
<th>剩余数量</th> <th>剩余数量</th>
<th>已分配数量</th>
<th>库存</th> <th>库存</th>
<th>跟踪号</th>
<th>操作人</th> <th>操作人</th>
<th v-if="crType === 'OUT'">仓管员</th> <th v-if="crType === 'OUT'">仓管员</th>
<th>操作日期</th> <th>操作日期</th>
@@ -94,18 +93,17 @@
<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view> <view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
</view> </view>
</td> </td>
<td class="underline fontcol1" v-if="id === 'CGRKD' || id === 'LLCKD'" @tap="showPop(1, e, el)">{{el.wlbm}}</td> <td class="underline fontcol1" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
<td>{{el.ckmc}}</td>
<td>{{el.wlmc}}</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.jldw}}</td>
<td>{{el.kwbm}}</td>
<td>{{el.sl}}</td> <td>{{el.sl}}</td>
<td>{{el.wlzs}}</td> <td>{{el.wlzs}}</td>
<td>{{el.czsl}}</td> <td>{{el.czsl}}</td>
<td>{{el.sysl}}</td> <td>{{el.sysl}}</td>
<td>{{el.assign_qty}}</td>
<td>{{el.kcsl}}</td> <td>{{el.kcsl}}</td>
<td>{{el.gzhbm}}</td>
<td>{{el.update_name}}</td> <td>{{el.update_name}}</td>
<td v-if="crType === 'OUT'">{{el.cgymc}}</td> <td v-if="crType === 'OUT'">{{el.cgymc}}</td>
<td>{{el.update_time}}</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-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 class="zd-col-4 zd-sec-th"><text>分录序号</text></view>
<view class="zd-col-4 zd-sec-th"><text>备注</text></view>
</view> </view>
<view v-if="type === 1" class="zd-row zd-td-wraper" v-for="(ele, t) in popData" :key="ele.id"> <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-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-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 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"><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">
<scan-input <scan-input
v-model="ele.kwbm" v-model="ele.kwbm"
/> />
</view> </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"><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">
<input type="number" class="pop-input" v-model="ele.fpsl"> <input type="number" class="pop-input" v-model="ele.fpsl">
</view> </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.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 v-if="type === 2" class="zd-row zd-td-wraper" v-for="(ele, t) in popData" :key="ele.id"> <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> <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"> <input type="number" class="pop-input" v-model="ele.fpsl">
</view> </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.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> </view>
<view class="mgb20 zd-row jcenter"> <view class="mgb20 zd-row jcenter">
@@ -393,6 +400,7 @@
this.$set(el, 'status', obj.status) this.$set(el, 'status', obj.status)
}) })
this.popData = [...res.result] this.popData = [...res.result]
this.sortArr(this.popData)
this.popObj = e this.popObj = e
this.show = true this.show = true
} else { } 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 () { async _updateAssignDtl () {
this.popdisabled = true this.popdisabled = true
@@ -429,6 +447,7 @@
let res = await inWarehouseAssignLocation(this.subCheckData, this.crType) let res = await inWarehouseAssignLocation(this.subCheckData, this.crType)
if (res.code ===1) { if (res.code ===1) {
this.popData = [...res.result] this.popData = [...res.result]
this.sortArr(this.popData)
this.show = true this.show = true
} else { } else {
uni.showToast({ uni.showToast({

175
utils/mork2.js
View File

@@ -1817,82 +1817,111 @@ export const easOutInBillDetailUpdate = () => {
} }
export const viewAssignDtl = () => { export const viewAssignDtl = () => {
let res = { let res = {
"pageNum": 1,
"pageSize": 10,
"totalPage": 1,
"totalElements": 1,
"result": [ "result": [
{ {
"size": 10, "djbh": "a1",
"page": 0, "flxh": "ca1",
"sort": null, "wlbm": "910200200098",
"isAsc": null, "wlmc": "螺钉GB70.1-M12x30-8.8",
"type": null, "kwbm": 'a01',
"fuzzy": null, "fpsl": '1',
"is_used": null, "kcsl": '2',
"start_time": null, "djid": "btAAAAW8Wd5QCrde",
"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",
"djlx": "LLCKD", "djlx": "LLCKD",
"ywlx": "OUT", "ywlx": "OUT",
"djbh": "SOUT04240408783", "bz": 'dlfjlfjljfljfljfljf'
"zzbm": "01.09.07", },
"zzmc": "四期智能工厂", {
"btbz": "04.2512804叉车线边库领料", "djbh": "a2",
"djzt": "提交", "flxh": "1",
"cjsj": "2024-04-25", "wlbm": "910200200098",
"ywrq": "2024-04-25", "wlmc": "螺钉GB70.1-M12x30-8.8",
"cjr": "系统", "kwbm": 'a01',
"flid": "btAAAAW8Wd8Rd0u0", "fpsl": '1',
"flxh": "1", "kcsl": '2',
"wlbm": "910200200098", "djid": "btAAAAW8Wd5QCrde",
"wlmc": "螺钉GB70.1-M12x30-8.8", "djlx": "LLCKD",
"ggxh": "内六角圆柱头螺钉GB70.1-M12x30-8.8-c1B", "ywlx": "OUT",
"pc": null, "bz": 'dlfjlfjljfljfljfljf'
"jldw": "PCS", },
"jbjldw": "PCS", {
"fzjldw": null, "djbh": "a3",
"sl": 1050, "flxh": "1",
"jbsl": "1050", "wlbm": "910200200098",
"fzsl": "0", "wlmc": "螺钉GB70.1-M12x30-8.8",
"ckbm": "3.04.001", "kwbm": 'a01',
"ckmc": "智能原材料库", "fpsl": '1',
"kwbm": null, "kcsl": '2',
"kwmc": null, "djid": "btAAAAW8Wd5QCrde",
"flbz": null, "djlx": "LLCKD",
"sysl": 1050, "ywlx": "OUT",
"czsl": 0, "bz": 'dlfjlfjljfljfljfljf'
"code": "1783279018838200320", },
"cksj": null, {
"llr": null "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, "code": 1,
"desc": "查询成功" "desc": "查询成功"