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:
caill
2024-06-07 10:08:09 +08:00
parent 1493f62889
commit 4294336caa
8 changed files with 347 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/style/layout.css
View File

@@ -214,6 +214,12 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
border: 1px solid #889dc7; border: 1px solid #889dc7;
box-shadow: 0 0 0 1px rgba(136, 157, 199,.2); box-shadow: 0 0 0 1px rgba(136, 157, 199,.2);
} }
.td_input_1 {
font-size: 12px;
line-height: 28px;
width: 80px;
height: 28px;
}
.td_change { .td_change {
font-size: 12px; font-size: 12px;
line-height: 26px; line-height: 26px;
@@ -222,6 +228,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
border: 1px solid #4980BD; border: 1px solid #4980BD;
border-radius: 6px; border-radius: 6px;
} }
.td_change_focus {
border: 1px solid #889dc7;
box-shadow: 0 0 0 1px rgba(136, 157, 199,.2);
}
.td_scan_wraper { .td_scan_wraper {
min-width: 120px; min-width: 120px;
} }
@@ -521,8 +531,6 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
.zd-pop-td { .zd-pop-td {
background-color: RGBA(23, 123, 172, 0.4); background-color: RGBA(23, 123, 172, 0.4);
border-bottom: 1px solid #177BAC; border-bottom: 1px solid #177BAC;
height: 40px;
font-size: 12px;
} }
.popChecked .zd-pop-td { .popChecked .zd-pop-td {
background-color: RGBA(23, 123, 172, 1); background-color: RGBA(23, 123, 172, 1);

3
pages/home/home.vue
View File

@@ -33,7 +33,8 @@
data() { data() {
return { return {
intervalId: null, intervalId: null,
interTime: this.$store.getters.setTime, // interTime: this.$store.getters.setTime,
interTime: 60000,
userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).person_name : '', userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).person_name : '',
menuList: [] menuList: []
}; };

4
pages/login/login.vue
View File

@@ -43,12 +43,12 @@
<input type="text" placeholder="域名地址" v-model.trim="baseUrl" class="inputStyle"> <input type="text" placeholder="域名地址" v-model.trim="baseUrl" class="inputStyle">
</view> </view>
</view> </view>
<view class="zd-row mgb20"> <!-- <view class="zd-row mgb20">
<view class="zd-col-7 login_label">刷新时间(s)</view> <view class="zd-col-7 login_label">刷新时间(s)</view>
<view class="zd-col-17"> <view class="zd-col-17">
<input type="number" placeholder="刷新时间" v-model.trim="setTime" class="inputStyle"> <input type="number" placeholder="刷新时间" v-model.trim="setTime" class="inputStyle">
</view> </view>
</view> </view> -->
</view> </view>
<view class="zd-row mgt20 mgb20"> <view class="zd-row mgt20 mgb20">
<button class="primary-button" :disabled="disabled" @tap="toConfig">配&nbsp;&nbsp;置</button> <button class="primary-button" :disabled="disabled" @tap="toConfig">配&nbsp;&nbsp;置</button>

79
pages/management/alloc-maintenance.vue
View File

@@ -8,9 +8,6 @@
<view class="zd-col-8 select_wraper mgl10"> <view class="zd-col-8 select_wraper mgl10">
<zxz-uni-data-select placeholder="请选择组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select> <zxz-uni-data-select placeholder="请选择组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
</view> </view>
<view class="zd-col-8 select_wraper mgl10">
<zxz-uni-data-select placeholder="请选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
</view>
</view> </view>
<button class="confirm-button" @tap="toSearch">查询</button> <button class="confirm-button" @tap="toSearch">查询</button>
</view> </view>
@@ -24,11 +21,12 @@
<view class="zd-col-2 zd-th"><text>业务日期</text></view> <view class="zd-col-2 zd-th"><text>业务日期</text></view>
<view class="zd-col-2 zd-th"><text>调入组织</text></view> <view class="zd-col-2 zd-th"><text>调入组织</text></view>
<view class="zd-col-2 zd-th"><text>调出组织</text></view> <view class="zd-col-2 zd-th"><text>调出组织</text></view>
<view class="zd-col-3 zd-th"><text>调入仓库</text></view> <view class="zd-col-2 zd-th"><text>调入仓库</text></view>
<view class="zd-col-3 zd-th"><text>调出仓库</text></view> <view class="zd-col-2 zd-th"><text>调出仓库</text></view>
<view class="zd-col-2 zd-th"><text>状态</text></view> <view class="zd-col-2 zd-th"><text>状态</text></view>
<view class="zd-col-2 zd-th nowrap"><text>计划调入日期</text></view> <view class="zd-col-2 zd-th"><text>计划调入日期</text></view>
<view class="zd-col-3 zd-th"><text>备注</text></view> <view class="zd-col-3 zd-th"><text>备注</text></view>
<view class="zd-col-2 zd-th"><text>审核结果</text></view>
<view class="zd-col-2 zd-th">更多</view> <view class="zd-col-2 zd-th">更多</view>
</view> </view>
<view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id"> <view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id">
@@ -38,11 +36,12 @@
<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view> <view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.drkcmc}}</text></view> <view class="zd-col-2 zd-td"><text>{{e.drkcmc}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.dckcmc}}</text></view> <view class="zd-col-2 zd-td"><text>{{e.dckcmc}}</text></view>
<view class="zd-col-3 zd-td"><text>{{e.drckmc}}</text></view> <view class="zd-col-2 zd-td"><text>{{e.drckmc}}</text></view>
<view class="zd-col-3 zd-td"><text>{{e.dcckmc}}</text></view> <view class="zd-col-2 zd-td"><text>{{e.dcckmc}}</text></view>
<view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view> <view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.jhdrrq}}</text></view> <view class="zd-col-2 zd-td nowrap"><text>{{e.jhdrrq}}</text></view>
<view class="zd-col-3 zd-td"><text>{{e.flbz}}</text></view> <view class="zd-col-3 zd-td"><text>{{e.flbz}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.shjg}}</text></view>
<view class="zd-col-2 zd-td" @tap.stop="getDetails(3,e)"> <view class="zd-col-2 zd-td" @tap.stop="getDetails(3,e)">
<uni-icons type="more-filled" size="14" color="#fff"></uni-icons> <uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
</view> </view>
@@ -57,7 +56,6 @@
<th v-if="pkObj.djzt !== '审核后'">选择</th> <th v-if="pkObj.djzt !== '审核后'">选择</th>
<th><text class="fontcol1">物料编码</text></th> <th><text class="fontcol1">物料编码</text></th>
<th>物料名称</th> <th>物料名称</th>
<th>规格型号</th>
<th>计里单位</th> <th>计里单位</th>
<th>库存类型</th> <th>库存类型</th>
<th>库存状态</th> <th>库存状态</th>
@@ -84,12 +82,13 @@
</td> </td>
<td><view class="fontcol1">{{el.wlbm}}</view></td> <td><view class="fontcol1">{{el.wlbm}}</view></td>
<td>{{el.wlmc}}</td> <td>{{el.wlmc}}</td>
<td>{{el.ggxh}}</td>
<td>{{el.jldw}}</td> <td>{{el.jldw}}</td>
<td>{{el.kclx}}</td> <td>{{el.kclx}}</td>
<td>{{el.kczt}}</td> <td>{{el.kczt}}</td>
<td><input class="td_input" type="number" v-model="el.sl" @blur="_allocationBillUpdate(el)" /></td> <td>
<td @tap.stop="checkWarehouse(2, '调入仓库', el)"> <input class="td_input" type="number" confirm-type="go" v-model="el.sl" @blur="_allocationBillUpdate(el)" @confirm="_allocationBillUpdate(el)" />
</td>
<td @tap.stop="checkWarehouse(2, '修改调入仓库', el)">
<view class="zd-row td_change"> <view class="zd-row td_change">
<uni-icons type="shop" size="16" color="#fff"></uni-icons> <uni-icons type="shop" size="16" color="#fff"></uni-icons>
<view class="mgl10">{{el.drckbm}}</view> <view class="mgl10">{{el.drckbm}}</view>
@@ -101,7 +100,7 @@
<scan-input v-model="el.drkwbm" @handleChange="_allocationBillUpdate(el)" /> <scan-input v-model="el.drkwbm" @handleChange="_allocationBillUpdate(el)" />
</view> </view>
</td> </td>
<td @tap.stop="checkWarehouse(1, '调出仓库', el)"> <td @tap.stop="checkWarehouse(1, '修改调出仓库', el)">
<view class="zd-row td_change"> <view class="zd-row td_change">
<uni-icons type="shop" size="16" color="#fff"></uni-icons> <uni-icons type="shop" size="16" color="#fff"></uni-icons>
<view class="mgl10">{{el.dcckbm}}</view> <view class="mgl10">{{el.dcckbm}}</view>
@@ -125,8 +124,11 @@
<view class="mgl10">{{el.jhdcrq}}</view> <view class="mgl10">{{el.jhdcrq}}</view>
</view> </view>
</td> </td>
<td @tap.stop="checkWarehouse(5, '跟踪号', el)"> <td>
<view class="td_change"><view>{{el.gzh}}</view></view> <view class="zd-row td_change" :class="{'td_change_focus': fstate}">
<input class="td_input_1" type="text" confirm-type="go" v-model="el.gzh" @focus="fstate = true" @blur="fstate = false, _allocationBillUpdate(el)" @confirm="fstate = false,_allocationBillUpdate(el)" />
<uni-icons class="mgl10" type="search" size="20" color="#a2b6cc" @tap="checkWarehouse(5, '库存信息', el)"></uni-icons>
</view>
</td> </td>
<td @tap.stop="getDetails(3,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td> <td @tap.stop="getDetails(3,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
</tr> </tr>
@@ -136,7 +138,6 @@
<td>{{j+1}}</td> <td>{{j+1}}</td>
<td>{{el.wlbm}}</td> <td>{{el.wlbm}}</td>
<td>{{el.wlmc}}</td> <td>{{el.wlmc}}</td>
<td>{{el.ggxh}}</td>
<td>{{el.jldw}}</td> <td>{{el.jldw}}</td>
<td>{{el.kclx}}</td> <td>{{el.kclx}}</td>
<td>{{el.kczt}}</td> <td>{{el.kczt}}</td>
@@ -177,7 +178,7 @@
<view class="footer"></view> <view class="footer"></view>
<grid-detail :show="delShow" :data="detailObj" @closeDetail="delShow=false"></grid-detail> <grid-detail :show="delShow" :data="detailObj" @closeDetail="delShow=false"></grid-detail>
<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}"> <view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
<view class="allwidth pop-title">修改{{modalObj.title}}</view> <view class="allwidth pop-title">{{modalObj.title}}</view>
<view v-if="modalObj.type === 1 || modalObj.type === 2" class="zd-row jcenter kwcode_wraper"> <view v-if="modalObj.type === 1 || modalObj.type === 2" class="zd-row jcenter kwcode_wraper">
<view class="zd-col-12 select_wraper"> <view class="zd-col-12 select_wraper">
<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select> <zxz-uni-data-select placeholder="请选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select>
@@ -200,7 +201,7 @@
<view class="zd-col-3 zd-sec-th"><text>库位</text></view> <view class="zd-col-3 zd-sec-th"><text>库位</text></view>
<view class="zd-col-3 zd-sec-th"><text>跟踪号</text></view> <view class="zd-col-3 zd-sec-th"><text>跟踪号</text></view>
</view> </view>
<view class="zd-row zd-td-wraper" v-for="(ele, t) in dataList3" :key="ele.id" @tap="toCheck3(ele)" :class="{'popChecked': ele.trackNo === iid}"> <view class="zd-row zd-td-wraper" v-for="(ele, t) in dataList3" :key="ele.id" @tap="toCheck3(ele)" :class="{'popChecked': ele.id === iid}">
<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-3 zd-sec-td zd-pop-td"><text>{{ele.materialName}}</text></view> <view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.materialName}}</text></view>
<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.materialNo}}</text></view> <view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.materialNo}}</text></view>
@@ -209,7 +210,7 @@
<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.lot}}</text></view> <view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.lot}}</text></view>
<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.warehouseName}}</text></view> <view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.warehouseName}}</text></view>
<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.locationName}}</text></view> <view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.locationName}}</text></view>
<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.trackNo}}</text></view> <view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.trackno}}</text></view>
</view> </view>
</view> </view>
<view class="mgb20 zd-row jcenter"> <view class="mgb20 zd-row jcenter">
@@ -270,16 +271,15 @@
disabled: false, disabled: false,
value1: '', value1: '',
range1: [], range1: [],
value2: '',
range2: [],
dataList3: [], dataList3: [],
iid: '' iid: '',
iobj: {},
fstate: false
}; };
}, },
created () { created () {
this._getWarehouseInfo() this._getWarehouseInfo()
this._getOrganizationInfo() this._getOrganizationInfo()
this._getUserInfo()
}, },
methods: { methods: {
// 仓库下拉框 // 仓库下拉框
@@ -306,17 +306,6 @@
this.toSearch() 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 () { toSearch () {
this.queryParams1 = { this.queryParams1 = {
@@ -330,7 +319,7 @@
}, },
// 一级表格接口 // 一级表格接口
async _allocationPage () { async _allocationPage () {
let res = await allocationPage(this.val1, this.value1, this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '') let res = await allocationPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
if (res.code === 1) { if (res.code === 1) {
this.dataList1 = [...res.result] this.dataList1 = [...res.result]
this.totalCount1 = Number(res.totalElements) this.totalCount1 = Number(res.totalElements)
@@ -409,6 +398,7 @@
}, },
// 二级表格详情修改接口 // 二级表格详情修改接口
async _allocationBillUpdate (e) { async _allocationBillUpdate (e) {
console.log(e)
try { try {
let res = await allocationBillUpdate(e) let res = await allocationBillUpdate(e)
uni.showToast({ uni.showToast({
@@ -420,15 +410,16 @@
} }
}, },
// 根据跟踪号查询库存列表 // 根据跟踪号查询库存列表
async _allocationBillInventoryInfo (id) { async _allocationBillInventoryInfo (obj) {
let res = await allocationBillInventoryInfo(id) let res = await allocationBillInventoryInfo(obj)
if (res.code === 1) { if (res.code === 1) {
this.dataList3 = [...res.result] this.dataList3 = [...res.result]
} }
}, },
// 跟踪号查询库存列表选中一行 // 跟踪号查询库存列表选中一行
toCheck3 (e) { toCheck3 (e) {
this.iid = e.trackNo === this.iid ? '' : e.trackNo this.iid = e.id === this.iid ? '' : e.id
this.iobj = e.id === this.iid ? e : {}
}, },
// 修改调出仓库弹窗 // 修改调出仓库弹窗
checkWarehouse (type, title, e) { checkWarehouse (type, title, e) {
@@ -438,7 +429,9 @@
} else if (type === 2) { } else if (type === 2) {
this.value = e.drckbm this.value = e.drckbm
} else if (type === 5) { } else if (type === 5) {
this._allocationBillInventoryInfo(e.gzh) let {gzh, dckcbm, dcckbm, dckwbm, pc, wlbm} = {...e}
let obj = {gzh, dckcbm, dcckbm, dckwbm, pc, wlbm}
this._allocationBillInventoryInfo(obj)
} }
this.show = true this.show = true
}, },
@@ -470,7 +463,7 @@
} else if (this.modalObj.type === 5) { } else if (this.modalObj.type === 5) {
this.dataList2.map(e => { this.dataList2.map(e => {
if (e.flid === this.modalObj.id) { if (e.flid === this.modalObj.id) {
e.gzh = this.iid e.gzh = this.iobj.trackno
obj = e obj = e
} }
}) })
@@ -558,10 +551,14 @@
.mgr30 .mgr30
margin-right 30rpx margin-right 30rpx
.select_wraper .select_wraper
/deep/ .uni-select__input-box
height 30px
/deep/ .uni-select__selector /deep/ .uni-select__selector
z-index 11 z-index 11
/deep/ .uni-select /deep/ .uni-select
height: 30px; height: 30px;
min-height: 30px;
line-height: 30px;
padding: 0 2px 0 12px; padding: 0 2px 0 12px;
border: 1px solid #4980bd; border: 1px solid #4980bd;
background-color: rgba(45,88,184,0.1); background-color: rgba(45,88,184,0.1);

18
pages/management/in-storage.vue
View File

@@ -23,9 +23,9 @@
<view class="zd-col-1 zd-th"><text>序号</text></view> <view class="zd-col-1 zd-th"><text>序号</text></view>
<view class="zd-col-1 zd-th"><text>选择</text></view> <view class="zd-col-1 zd-th"><text>选择</text></view>
<view class="zd-col-2 zd-th"><text class="fontcol1">{{crType === 'IN'? '入库单号':'出库单号'}}</text></view> <view class="zd-col-2 zd-th"><text class="fontcol1">{{crType === 'IN'? '入库单号':'出库单号'}}</text></view>
<view class="zd-col-2 zd-th"><text>来源部门</text></view> <view class="zd-col-2 zd-th nowrap"><text>来源部门</text></view>
<view class="zd-col-2 zd-th"><text>去向部门</text></view> <view class="zd-col-2 zd-th nowrap"><text>去向部门</text></view>
<view class="zd-col-2 zd-th"><text>仓库名称</text></view> <view class="zd-col-2 zd-th nowrap"><text>仓库名称</text></view>
<view class="zd-col-2 zd-th"><text>状态</text></view> <view class="zd-col-2 zd-th"><text>状态</text></view>
<view class="zd-col-2 zd-th nowrap"><text>制单日期</text></view> <view class="zd-col-2 zd-th nowrap"><text>制单日期</text></view>
<view class="zd-col-2 zd-th nowrap"><text>制单人</text></view> <view class="zd-col-2 zd-th nowrap"><text>制单人</text></view>
@@ -33,7 +33,7 @@
<view class="zd-col-2 zd-th nowrap"><text>操作日期</text></view> <view class="zd-col-2 zd-th nowrap"><text>操作日期</text></view>
<view class="zd-col-2 zd-th"><text>操作人</text></view> <view class="zd-col-2 zd-th"><text>操作人</text></view>
<view v-if="crType === 'OUT'" class="zd-col-2 zd-th"><text>仓管员</text></view> <view v-if="crType === 'OUT'" class="zd-col-2 zd-th"><text>仓管员</text></view>
<view class="zd-col-2 zd-th">更多</view> <view class="zd-th" :class="crType === 'OUT' ? 'zd-col-1' : 'zd-col-2'">更多</view>
</view> </view>
<view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id"> <view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id">
<view class="zd-row" :class="{'zd-td-checked': pkId === e.id}" @tap="toCollapse(e)"> <view class="zd-row" :class="{'zd-td-checked': pkId === e.id}" @tap="toCollapse(e)">
@@ -46,13 +46,13 @@
<view class="zd-col-2 zd-td"><text>{{e.zzmc}}</text></view> <view class="zd-col-2 zd-td"><text>{{e.zzmc}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.ckmc}}</text></view> <view class="zd-col-2 zd-td"><text>{{e.ckmc}}</text></view>
<view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view> <view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.cjsj}}</text></view> <view class="zd-col-2 zd-td nowrap"><text>{{e.cjsj}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.cjr}}</text></view> <view class="zd-col-2 zd-td"><text>{{e.cjr}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view> <view class="zd-col-2 zd-td nowrap"><text>{{e.ywrq}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.update_time}}</text></view> <view class="zd-col-2 zd-td nowrap"><text>{{e.update_time}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.update_name}}</text></view> <view class="zd-col-2 zd-td"><text>{{e.update_name}}</text></view>
<view v-if="crType === 'OUT'" class="zd-col-2 zd-td"><text>{{e.cgymc}}</text></view> <view v-if="crType === 'OUT'" class="zd-col-2 zd-td"><text>{{e.cgymc}}</text></view>
<view class="zd-col-2 zd-td" @tap.stop="getDetails(1,e)"> <view class="zd-td" :class="crType === 'OUT' ? 'zd-col-1' : 'zd-col-2'" @tap.stop="getDetails(1,e)">
<uni-icons type="more-filled" size="14" color="#fff"></uni-icons> <uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
</view> </view>
</view> </view>
@@ -184,7 +184,7 @@
import ScanInput from '@/components/ScanInput.vue' import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue' import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue' import GridDetail from '@/components/GridDetail.vue'
// import {getWarehouseInfo, getUserInfo} from '@/utils/mork2.js' // import {getWarehouseInfo, getUserInfo} from '@/utils/getData2.js'
import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js' import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
export default { export default {
components: { components: {

7
pages/management/receive-confirm.vue
View File

@@ -57,7 +57,6 @@
<th><text class="fontcol1">采购订单号</text></th> <th><text class="fontcol1">采购订单号</text></th>
<th>物料编码</th> <th>物料编码</th>
<th>物料名称</th> <th>物料名称</th>
<th>规格型号</th>
<th>单位</th> <th>单位</th>
<th>订单量</th> <th>订单量</th>
<th>本次送货数量</th> <th>本次送货数量</th>
@@ -81,7 +80,6 @@
<td><view class="fontcol1">{{el.cgbh}}</view></td> <td><view class="fontcol1">{{el.cgbh}}</view></td>
<td>{{el.wlbm}}</td> <td>{{el.wlbm}}</td>
<td>{{el.wlmc}}</td> <td>{{el.wlmc}}</td>
<td>{{el.ggxh}}</td>
<td>{{el.jldw}}</td> <td>{{el.jldw}}</td>
<td>{{el.ddsl}}</td> <td>{{el.ddsl}}</td>
<td>{{el.bcshsl}}</td> <td>{{el.bcshsl}}</td>
@@ -109,7 +107,6 @@
<td>{{el.cgbh}}</td> <td>{{el.cgbh}}</td>
<td>{{el.wlbm}}</td> <td>{{el.wlbm}}</td>
<td>{{el.wlmc}}</td> <td>{{el.wlmc}}</td>
<td>{{el.ggxh}}</td>
<td>{{el.jldw}}</td> <td>{{el.jldw}}</td>
<td>{{el.ddsl}}</td> <td>{{el.ddsl}}</td>
<td>{{el.bcshsl}}</td> <td>{{el.bcshsl}}</td>
@@ -423,10 +420,14 @@
.mgr30 .mgr30
margin-right 30rpx margin-right 30rpx
.select_wraper .select_wraper
/deep/ .uni-select__input-box
height 30px
/deep/ .uni-select__selector /deep/ .uni-select__selector
z-index 11 z-index 11
/deep/ .uni-select /deep/ .uni-select
height: 30px; height: 30px;
min-height: 30px;
line-height: 30px;
padding: 0 2px 0 12px; padding: 0 2px 0 12px;
border: 1px solid #4980bd; border: 1px solid #4980bd;
background-color: rgba(45,88,184,0.1); background-color: rgba(45,88,184,0.1);

5
utils/getData2.js
View File

@@ -84,7 +84,6 @@ export const allocationPage = (fuzzy, kczzbm, cgybm, page, size) => request({
data: { data: {
fuzzy: fuzzy, fuzzy: fuzzy,
kczzbm: kczzbm, kczzbm: kczzbm,
cgybm: cgybm,
page: page, page: page,
size: size size: size
} }
@@ -109,9 +108,9 @@ export const allocationBillConfirm = (arr) => request({
data: arr data: arr
}) })
// 6.根据跟踪号查询库存列表 // 6.根据跟踪号查询库存列表
export const allocationBillInventoryInfo = (arr) => request({ export const allocationBillInventoryInfo = (obj) => request({
url:'api/allocationBill/queryInventoryInfo', url:'api/allocationBill/queryInventoryInfo',
data: arr data: obj
}) })
/** /**

348
utils/mork2.js
View File

@@ -101,13 +101,14 @@ export const easOutInBillPage = (size, page, fuzzy, djlx) => {
"cjsj": "2024-04-25", "cjsj": "2024-04-25",
"ywrq": "2024-04-25", "ywrq": "2024-04-25",
"cjr": "系统", "cjr": "系统",
"btbz": "04.2512804叉车线边库领料", "bmmc": "04.2512804叉车线边库领料",
"cksj": null, "cksj": null,
"llr": null, "llr": null,
"djly": "1", "djly": "1",
"update_id": null, "update_id": null,
"update_name": null, "update_name": 'admin',
"update_time": null "update_time": '2024-04-25',
"cgymc": '甲乙丙'
}, },
{ {
"id": "1783273986298351616", "id": "1783273986298351616",
@@ -414,6 +415,13 @@ export const easOutInBillDetailPage = (djid, page, size) => {
} }
return res return res
} }
export const easOutInBillUpdate = (arr) => {
let res = {
code: 1,
desc: 'ok'
}
return res
}
export const queryInventoryInfo = (arr) => { export const queryInventoryInfo = (arr) => {
let res = { let res = {
"pageNum": 1, "pageNum": 1,
@@ -1086,71 +1094,275 @@ export const allocationBillConfirm = () => {
return res return res
} }
export const allocationBillInventoryInfo = () => { export const allocationBillInventoryInfo = () => {
let res = { let res = {
code: 1, "pageNum": null,
desc: 'ok', "pageSize": null,
result: [ "totalPage": null,
{ "totalElements": 0,
"locationNo": "01.09.07", "result": [
"locationName": "四期智能工厂", {
"materialNo": "255025010002", "materialNo": "508038510000",
"materialName": "多路阀(三联晨光)", "id": '1',
"lot": '20201010', "materialName": "车架焊合(美540x1150)",
"unitNo": "PCS", "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"curStoreQty": "2", "unitNo": "PCS",
"warehouseNo": "3.04.001", "locationNo": null,
"warehouseName": "智能原材料库", "locationName": null,
"trackNo": '1' "curStoreQty": "2",
}, "trackno": "999",
{ "warehouseNo": "2.03.004",
"locationNo": "01.09.07", "warehouseName": "三期喷涂半成品库"
"locationName": "四期智能工厂", },
"materialNo": "255025010002", {
"materialName": "多路阀(三联晨光)", "materialNo": "2.03.651.SFH.1016KSJTYD",
"lot": '20201010', "id": '2',
"unitNo": "PCS", "materialName": "SFH-10-1.6快速移动带脚踏堆高车(焊) 轮子组件",
"curStoreQty": "2", "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"warehouseNo": "3.04.001", "unitNo": "PCS",
"warehouseName": "智能原材料库", "locationNo": null,
"trackNo": '2' "locationName": null,
}, "curStoreQty": "4",
{ "trackno": "999",
"locationNo": "01.09.07", "warehouseNo": "2.01.004",
"locationName": "四期智能工厂", "warehouseName": "特种喷涂半成品库(装备)"
"materialNo": "255025010002", },
"materialName": "多路阀(三联晨光)", {
"lot": '20201010', "materialNo": "2.03.651.3LB.3W220",
"unitNo": "PCS", "id": '3',
"curStoreQty": "2", "materialName": "3W220GGS堆高车(喷) 车架",
"warehouseNo": "3.04.001", "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"warehouseName": "智能原材料库", "unitNo": "PCS",
"trackNo": '3' "locationNo": null,
}, "locationName": null,
{ "curStoreQty": "64",
"locationNo": "01.09.07", "trackno": "999",
"locationName": "四期智能工厂", "warehouseNo": "2.01.004",
"materialNo": "255025010002", "warehouseName": "特种喷涂半成品库(装备)"
"materialName": "多路阀(三联晨光)", },
"lot": '20201010', {
"unitNo": "PCS", "materialNo": "2.03.651.3LB.3W220-1",
"curStoreQty": "2", "id": '4',
"warehouseNo": "3.04.001", "materialName": "3W220GGS堆高车(喷) 托盘",
"warehouseName": "智能原材料库", "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"trackNo": '4' "unitNo": "PCS",
}, "locationNo": null,
{ "locationName": null,
"locationNo": "01.09.07", "curStoreQty": "64",
"locationName": "四期智能工厂", "trackno": "999",
"materialNo": "255025010002", "warehouseNo": "2.01.004",
"materialName": "多路阀(三联晨光)", "warehouseName": "特种喷涂半成品库(装备)"
"lot": '20201010', },
"unitNo": "PCS", {
"curStoreQty": "2", "materialNo": "2.03.651.PS.0485-4",
"warehouseNo": "3.04.001", "id": '5',
"warehouseName": "智能原材料库", "materialName": "行李车板(喷) PS0485",
"trackNo": '5' "lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
} "unitNo": "PCS",
] "locationNo": null,
"locationName": null,
"curStoreQty": "1",
"trackno": "999",
"warehouseNo": "2.01.004",
"warehouseName": "特种喷涂半成品库(装备)"
},
{
"materialNo": "454253020014",
"id": '6',
"materialName": "支撑板",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "770",
"trackno": "999",
"warehouseNo": "4.03.001",
"warehouseName": "三期委外库"
},
{
"materialNo": "300523520008",
"id": '7',
"materialName": "止推板(喷锌)",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": "5期",
"locationName": "5期",
"curStoreQty": "1",
"trackno": "999",
"warehouseNo": "1.06.016",
"warehouseName": "国际配件仓（库位）"
},
{
"materialNo": "505634010001",
"id": '8',
"materialName": "钥匙开关RF-S27380A31-0",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": "A17-1-01a",
"locationName": "A17-1-01a",
"curStoreQty": "476",
"trackno": "999",
"warehouseNo": "3.03.013",
"warehouseName": "三期原材料库"
},
{
"materialNo": "534121510000",
"id": '9',
"materialName": "机体焊合",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "1",
"trackno": "999",
"warehouseNo": "2.04.005",
"warehouseName": "智能半成品销售库"
},
{
"materialNo": "508024020101-T31",
"id": '10',
"materialName": "电机保护罩",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "2",
"trackno": "999",
"warehouseNo": "1.06.001",
"warehouseName": "销售配件仓"
},
{
"materialNo": "508038520131-135",
"id": '11',
"materialName": "力臂块",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "2000",
"trackno": "999",
"warehouseNo": "9.09.02",
"warehouseName": "原材料销售专用库"
},
{
"materialNo": "506738510009",
"id": '12',
"materialName": "推杆焊合(1220)",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "15",
"trackno": "999",
"warehouseNo": "2.03.004",
"warehouseName": "三期喷涂半成品库"
},
{
"materialNo": "509938510021",
"id": '13',
"materialName": "车架焊合(685x1150)",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "1",
"trackno": "999",
"warehouseNo": "2.03.004",
"warehouseName": "三期喷涂半成品库"
},
{
"materialNo": "507017510001",
"id": '14',
"materialName": "护臂焊合",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "1",
"trackno": "999",
"warehouseNo": "2.03.004",
"warehouseName": "三期喷涂半成品库"
},
{
"materialNo": "508538530015",
"id": '15',
"materialName": "推杆焊合(2000)",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "2",
"trackno": "999",
"warehouseNo": "2.03.004",
"warehouseName": "三期喷涂半成品库"
},
{
"materialNo": "452221510000",
"id": '16',
"materialName": "底板焊合",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "20",
"trackno": "999",
"warehouseNo": "2.03.001",
"warehouseName": "三期下料半成品库"
},
{
"materialNo": "454421510001",
"id": '17',
"materialName": "连接板焊合(电器)",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "69",
"trackno": "999",
"warehouseNo": "2.03.002",
"warehouseName": "三期机加半成品库"
},
{
"materialNo": "567717020001",
"id": '18',
"materialName": "隔套Ф32xФ25x20",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": "C-1-01a",
"locationName": "C-1-01a",
"curStoreQty": "253",
"trackno": "999",
"warehouseNo": "3.03.013",
"warehouseName": "三期原材料库"
},
{
"materialNo": "450121510002",
"id": '19',
"materialName": "连接板焊合(电器)",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "11",
"trackno": "999",
"warehouseNo": "2.03.002",
"warehouseName": "三期机加半成品库"
},
{
"materialNo": "456053020002",
"id": '20',
"materialName": "支撑板",
"lot": "YNi0IQEOEADgBT3mfwAAAcznrtQ=",
"unitNo": "PCS",
"locationNo": null,
"locationName": null,
"curStoreQty": "57",
"trackno": "999",
"warehouseNo": "2.03.002",
"warehouseName": "三期机加半成品库"
}
],
"code": 1,
"desc": "操作完成"
} }
return res return res
} }