Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Overseamom-518 feat 拣配库位修改

Browse Source
master
mabaoyan 2 years ago
parent 7dd8056d56
commit caaae983c7
3 changed files with 88 additions and 26 deletions
Show Stats Download Patch File Download Diff File

100
src/pages/raw/handover/picking-vn/index.vue
Unescape Escape View File

@ -84,7 +84,8 @@
<uni-td align="center">
<view class="td_select">
<!-- 地址可选 -->
<view @click="selectClick(index)">{{item.wkposCode}}
<view @click="selectClick(index)"
>{{ item.wkposCode }}
<!-- {{
loclist.find((item) => {return item.label == loc}) ? loc : '0011'
}} -->
@ -97,7 +98,7 @@
<!-- <view>{{ item.wkposCode }}</view> -->
<view v-if="index == indexChoose">
<u-select v-model="showList" :list="loclist" @confirm="locConfirm" :default-value="subjectAarr"></u-select>
<u-select v-model="showList" :list="loclist" @confirm="locConfirm"></u-select>
</view>
</view>
</uni-td>
@ -157,11 +158,8 @@ export default class pickingDom extends BasePage {
amountChange = null;
showList = false;
loc = '0';
subjectAarr = [0];
loclist = [
{ value: '0', label: '0011' },
{ value: '1', label: '0029' },
];
subjectAarr = [];
loclist = [];
arrList = [];
selectIndex = [];
tableData = [];
@ -283,15 +281,76 @@ export default class pickingDom extends BasePage {
const last_month = moment().endOf('month').format('YYYY-MM-DD'); // 获取当前月的最后一天
this.form.requireDateRegionFrom = first_month;
this.form.requireDateRegionTo = last_month;
} else {
} else if (session.factoryCode == '6640'
|| session.factoryCode == '6641'|| session.factoryCode == '6642'
|| session.factoryCode == '6644'|| session.factoryCode == '6645'
|| session.factoryCode == '6647' || session.factoryCode == '6648') {
this.mrpFlag = false;
this.$form.setRules(this.mrpRules);
//设置开始时间，结束时间
const first_month = moment().startOf('month').format('YYYY-MM-DD'); // 获取当前月的第一天
const last_month = moment().endOf('month').format('YYYY-MM-DD'); // 获取当前月的最后一天
this.form.requireDateRegionFrom = first_month;
this.form.requireDateRegionTo = last_month;
}else {
this.mrpFlag = true;
this.$form.setRules(this.rules);
}
model.clearProOrderList();
this.form.sapFactoryCode = session.factoryCode;
//this.form.requireDateRegion = this.getNowFormatDate();
this.subjectAarr = [];
if (this.form.sapFactoryCode == '9A61') {
this.loclist = [
{ value: '0', label: '0011' },
{ value: '1', label: '0029' },
{ value: '2', label: '0066' },
];
}else if (this.form.sapFactoryCode == '9A62') {
this.loclist = [
{ value: '0', label: '0011' },
{ value: '1', label: '0028' },
{ value: '2', label: '0029' },
{ value: '3', label: '0030' },
{ value: '4', label: '0066' },
];
}else if (this.form.sapFactoryCode == '6640') {
this.loclist = [
{ value: '0', label: 'ASY1' },
{ value: '1', label: 'ASY2' },
{ value: '2', label: 'ASY' },
{ value: '3', label: 'CBF' },
];
}else if (this.form.sapFactoryCode == '6647') {
this.loclist = [
{ value: '0', label: 'ST01' },
{ value: '1', label: 'ST02' },
{ value: '2', label: 'STG1' },
{ value: '3', label: 'STG2' },
{ value: '4', label: 'FOC' },
];
}else if (this.form.sapFactoryCode == '6648') {
this.loclist = [
{ value: '0', label: 'FOC' },
{ value: '1', label: 'ASY' },
{ value: '2', label: 'ASY1' },
{ value: '3', label: 'ASY2' },
{ value: '4', label: 'CBF' },
{ value: '5', label: 'CRF' },
{ value: '6', label: 'CVF' },
{ value: '7', label: 'DFM' },
{ value: '8', label: 'DPA' },
{ value: '9', label: 'PRS' },
{ value: '10', label: 'PRA' },
{ value: '11', label: 'DTA1' },
{ value: '12', label: 'DTA2' },
{ value: '13', label: 'HOLD' },
{ value: '14', label: '0068' },
];
} else {
this.loclist = [
];
}
}
startConfirm(startParams: any) {
@ -348,8 +407,8 @@ export default class pickingDom extends BasePage {
// this.onAggregate();
}, 2000);
}
// @ts-ignore
this.$refs.table.clearSelection()
// @ts-ignore
this.$refs.table.clearSelection();
}
/**
@ -363,14 +422,17 @@ export default class pickingDom extends BasePage {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
await this.model.queryProOrderPickUp(this.formParams);
this.model.checkAllProOrderList(true);
this.model.proOrderList.forEach((val) => {
val.wkposCode = this.loclist[0].label;
});
this.model.checkInfoProOrderList(true);
this.isFormChange = false;
model.mrpCodeRegion = this.form.mrpCodeRegion as any;
model.sapFactoryCode = this.form.sapFactoryCode as any;
model.formParams = this.formParams;
});
//@ts-ignore
this.$refs.table.clearSelection()
//@ts-ignore
this.$refs.table.clearSelection();
}
/**
@ -423,7 +485,7 @@ export default class pickingDom extends BasePage {
*/
locConfirm(e) {
this.loc = e[0].label;
this.model.proOrderList[this.indexChoose].wkposCode = e[0].label
this.model.proOrderList[this.indexChoose].wkposCode = e[0].label;
}
}
</script>
@ -492,15 +554,15 @@ export default class pickingDom extends BasePage {
padding: 20rpx;
}
}
.tr{
.tr {
height: 10px;
}
.td_input{
.td_input {
border: 1px solid rgb(228, 225, 225);
border-radius: 2px;
padding-left: 2px;
}
.td_select{
.td_select {
border: 1px solid rgb(228, 225, 225);
height: 30px;
}

8
src/pages/raw/handover/picking-vn/model.ts
Unescape Escape View File

@ -163,7 +163,7 @@ export class PickingModule extends VuexModule {
* @param checked
*/
@Mutation
checkAllProOrderList(checked: boolean) {
checkInfoProOrderList(checked: boolean) {
this.proOrderList = this.proOrderList.map((item: any) => ({
...item,
checked,
@ -244,9 +244,9 @@ export class PickingModule extends VuexModule {
// });
vm.customToast(vm.$t('message.Pi_NoDataFound') as any);
}
proOrderList.forEach(element => {
element.wkposCode = '0011'
});
// proOrderList.forEach(element => {
// element.wkposCode = '0011'
// });
// 返回的是proOrderList数组
console.log({ proOrderList }, 1111111111);
return { proOrderList };

6
src/pages/raw/handover/virtual-Vn/index.vue
Unescape Escape View File

@ -10,11 +10,11 @@
<u-form class="form" ref="form" :model="form" label-width="120rpx">
<u-row>
<!-- MRP -->
<u-col :span="12">
<!-- <u-col :span="12">
<u-form-item :required="true" label-width="120rpx" label="MRP" prop="mrpScope">
<u-input v-model="form.mrpScope" :border="border" :placeholder="$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
</u-col> -->
<!-- 工厂 -->
<u-col :span="12">
<u-form-item label-width="120rpx" :label="$t('message.Pi_factory')" prop="sapFactoryCode" :required="true">
@ -145,7 +145,7 @@ export default class Virtual extends BasePage {
* 表单校验
*/
rules = {
mrpScope: [{ required: true, message: this.$t('message.Pi_InputMrp') as string }],
// mrpScope: [{ required: true, message: this.$t('message.Pi_InputMrp') as string }],
sapFactoryCode: [{ required: true, message: this.$t('message.Pi_InputFactory') as string }],
};

Write Preview
Loading…
Cancel
Save