root/hht-hengsen-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

单据出库修改

Browse Source
This commit is contained in:
蔡玲
2024-11-24 21:28:36 +08:00
parent 36c30539ed
commit a42d288bc8
3 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/style/layout.styl
View File

@@ -77,7 +77,7 @@ uni-button:after {
.filter_input { .filter_input {
width: 100%; width: 100%;
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 30rpx;
border: 0; border: 0;
background-color: transparent; background-color: transparent;
font-size: 28rpx; font-size: 28rpx;

53
pages/outbound/bill-out-store.vue
View File

@@ -16,27 +16,27 @@
<view v-if="JSON.stringify(currentData) !== '{}'" class="zd_wrapper"> <view v-if="JSON.stringify(currentData) !== '{}'" class="zd_wrapper">
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-6"><span class="filter_label">单据编码</span></view> <view class="zd-col-6"><span class="filter_label">单据编码</span></view>
<view class="zd-col-7"><span class="filter_input">{{currentData.code}}</span></view> <view class="zd-col-6"><span class="filter_input">{{currentData.code}}</span></view>
<view class="zd-col-6"><span class="filter_label">单据类型</span></view> <view class="zd-col-6"><span class="filter_label">单据类型</span></view>
<view class="zd-col-7"><span class="filter_input">{{currentData.form_type}}</span></view> <view class="zd-col-6"><span class="filter_input">{{currentData.form_type}}</span></view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-6"><span class="filter_label">备注</span></view> <view class="zd-col-6"><span class="filter_label">备注</span></view>
<view class="zd-col-7"><span class="filter_input">{{currentData.remark}}</span></view> <view class="zd-col-6"><span class="filter_input">{{currentData.remark}}</span></view>
<view class="zd-col-6"><span class="filter_label">创建时间</span></view> <view class="zd-col-6"><span class="filter_label">创建时间</span></view>
<view class="zd-col-7"><span class="filter_input">{{currentData.create_time}}</span></view> <view class="zd-col-6"><span class="filter_input">{{currentData.create_time}}</span></view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-6"><span class="filter_label">创建人</span></view> <view class="zd-col-6"><span class="filter_label">创建人</span></view>
<view class="zd-col-7"><span class="filter_input">{{currentData.create_name}}</span></view> <view class="zd-col-6"><span class="filter_input">{{currentData.create_name}}</span></view>
<view class="zd-col-6"><span class="filter_label">物料编码</span></view> <view class="zd-col-6"><span class="filter_label">物料编码</span></view>
<view class="zd-col-7"><span class="filter_input">{{currentData.material_code}}</span></view> <view class="zd-col-6"><span class="filter_input">{{currentData.material_code}}</span></view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-6"><span class="filter_label">申请数量</span></view> <view class="zd-col-6"><span class="filter_label">申请数量</span></view>
<view class="zd-col-7"><span class="filter_input">{{currentData.qty}}</span></view> <view class="zd-col-6"><span class="filter_input">{{currentData.qty}}</span></view>
<view class="zd-col-6"><span class="filter_label">计划数量</span></view> <view class="zd-col-6"><span class="filter_label">计划数量</span></view>
<view class="zd-col-7"><span class="filter_input">{{currentData.plan_qty}}</span></view> <view class="zd-col-6"><span class="filter_input">{{currentData.plan_qty}}</span></view>
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-6"><span class="filter_label">已分配数量</span></view> <view class="zd-col-6"><span class="filter_label">已分配数量</span></view>
@@ -46,17 +46,15 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-6"><span class="filter_label">批次号</span></view> <view class="zd-col-6"><span class="filter_label">批次号</span></view>
<view class="zd-col-7"><span class="filter_input">{{currentData.pcsn}}</span></view> <view class="zd-col-18"><span class="filter_input">{{currentData.pcsn}}</span></view>
<view class="zd-col-6"><span class="filter_label">创建时间</span></view>
<view class="zd-col-7"><span class="filter_input">{{currentData.create_time}}</span></view>
</view> </view>
</view> </view>
<view v-if="JSON.stringify(currentData) !== '{}'" class="zd_wrapper grid-wraper"> <view v-if="JSON.stringify(currentData) !== '{}'" class="grid-wraper">
<view class="slide_new"> <view class="slide_new">
<table> <table>
<thead> <thead>
<tr> <tr>
<th>单据编码</th> <th>单据id</th>
<th>物料名称</th> <th>物料名称</th>
<th>物料编码</th> <th>物料编码</th>
<th>物料类型</th> <th>物料类型</th>
@@ -65,6 +63,8 @@
<th>已分配数量</th> <th>已分配数量</th>
<th>单位</th> <th>单位</th>
<th>批次号</th> <th>批次号</th>
<th>仓库</th>
<th>车间</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -75,9 +75,15 @@
<td>{{e.material_spec}}</td> <td>{{e.material_spec}}</td>
<td>{{e.qty}}</td> <td>{{e.qty}}</td>
<td>{{e.plan_qty}}</td> <td>{{e.plan_qty}}</td>
<td><input type="number" class="sin_input" v-model="e.assign_qty" @blur="handleBlur(e)"></td> <td><input type="number" class="sin_input" v-model="e.now_assign_qty" @blur="handleBlur(e)"></td>
<td>{{e.unit_id}}</td> <td>{{e.unit_id}}</td>
<td>{{e.pcsn}}</td> <td>{{e.pcsn}}</td>
<td>
<uni-data-select v-model="e.stor_code" :localdata="options1"></uni-data-select>
</td>
<td>
<uni-data-select v-model="e.product_area" :localdata="options2"></uni-data-select>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -86,7 +92,7 @@
</view> </view>
<view class="zd-row submit-bar"> <view class="zd-row submit-bar">
<button class="zd-col-6 button-primary" @tap="toEmpty">清空</button> <button class="zd-col-6 button-primary" @tap="toEmpty">清空</button>
<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_outStorageConfirm">强制完成</button> <button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_outStorageConfirm">出库确认</button>
</view> </view>
</view> </view>
</template> </template>
@@ -106,7 +112,9 @@
options: [], options: [],
index: '', index: '',
currentData: {}, currentData: {},
disabled: false disabled: false,
options1: [{value: 'FStockPallet', text: '托盘库'}, {value: 'FStockId', text: '料箱库'}],
options2: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}],
}; };
}, },
onLoad (options) { onLoad (options) {
@@ -119,7 +127,7 @@
if (this.$store.getters.publicObj !== '') { if (this.$store.getters.publicObj !== '') {
this.currentData = this.$store.getters.publicObj this.currentData = this.$store.getters.publicObj
this.currentData.children.map(el => { this.currentData.children.map(el => {
this.$set(el, 'assign_qty', el.qty) this.$set(el, 'now_assign_qty', el.qty)
}) })
this.$store.dispatch('setPublicObj', '') this.$store.dispatch('setPublicObj', '')
} }
@@ -139,8 +147,8 @@
} }
}, },
handleBlur (e) { handleBlur (e) {
if (e.assign_qty < 0 || e.assign_qty > e.qty) { if (e.now_assign_qty < 0 || e.now_assign_qty > e.qty) {
e.assign_qty = e.qty e.now_assign_qty = e.qty
} }
}, },
toEmpty () { toEmpty () {
@@ -155,6 +163,9 @@
} }
try { try {
let res = await outStorageConfirm(this.currentData) let res = await outStorageConfirm(this.currentData)
if (res.code === '200') {
this.toEmpty()
}
this.disabled = false this.disabled = false
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
@@ -171,4 +182,8 @@
<style lang="stylus" scoped> <style lang="stylus" scoped>
.filter_label .filter_label
font-size: 26rpx; font-size: 26rpx;
.slide_new
padding-bottom 110px
.slide_new table td
overflow visible
</style> </style>

47
utils/getData2.js
View File

@@ -159,7 +159,7 @@ export const outStorageOrderList = (page, size, type) => request({
// "code": "22984980", // "code": "22984980",
// "form_type": "单据类型", // "form_type": "单据类型",
// "remark": "备注", // "remark": "备注",
// "create_time": "创建时间", // "create_time": "2024-10-20 21:41:50",
// "create_name": "创建人", // "create_name": "创建人",
// "material_code": "物料编码", // "material_code": "物料编码",
// "qty": 0.0, // "qty": 0.0,
@@ -169,34 +169,30 @@ export const outStorageOrderList = (page, size, type) => request({
// "pcsn": "批次", // "pcsn": "批次",
// "children": [ // "children": [
// { // {
// "id": "",
// "code": "bbb", // "code": "bbb",
// "proc_inst_id": "",
// "source_form_id": "",
// "source_form_type": "",
// "source_form_date": "",
// "form_type": "",
// "status": "",
// "remark": "",
// "create_time": "",
// "create_name": "",
// "material_id": "",
// "material_name": "物料名称", // "material_name": "物料名称",
// "material_code": "物料编码", // "material_code": "物料编码",
// "material_spec": "物料类型", // "material_spec": "物料类型",
// "single_weight": "", // "stor_code": "FStockPallet",
// "product_area": "A4",
// "qty": 10.0, // "qty": 10.0,
// "plan_qty": 0.0, // "plan_qty": 0.0,
// "assign_qty": 0.0, // "assign_qty": 0.0,
// "unit_id": "单位", // "unit_id": "单位",
// "pcsn": "批次", // "pcsn": "批次"
// "vehicle_code": "", // },
// "vehicle_id": "", // {
// "form_data": { // "code": "CCC",
// "": {} // "material_name": "物料名称",
// }, // "material_code": "物料编码",
// "parent_id": "", // "material_spec": "物料类型",
// "HasChildren": "public static final Boolean FALSE = new Boolean(false);" // "stor_code": "FStockPallet",
// "product_area": "A4",
// "qty": 10.0,
// "plan_qty": 0.0,
// "assign_qty": 0.0,
// "unit_id": "单位",
// "pcsn": "批次"
// } // }
// ] // ]
// } // }
@@ -210,4 +206,11 @@ export const outStorageOrderList = (page, size, type) => request({
export const outStorageConfirm = (obj) => request({ export const outStorageConfirm = (obj) => request({
url:'api/pda/outStorage/confirm', url:'api/pda/outStorage/confirm',
data: obj data: obj
}) })
// export const outStorageConfirm = (obj) => {
// let res = {
// code: '200',
// msg: 'ok'
// }
// return res
// }