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

no message

Browse Source
master
hou 4 years ago
parent 293370a96f
commit be99dff890
11 changed files with 156 additions and 123 deletions
Show Stats Download Patch File Download Diff File

1
src/i18n/lang/cn.ts
Unescape Escape View File

@ -49,6 +49,7 @@ export default {
workArea_WarehouseClassify: '仓库类', workArea_WarehouseClassify: '仓库类',
workArea_Confirm: '确定', workArea_Confirm: '确定',
ReservoirArea: '库区', ReservoirArea: '库区',
Confirm:'是否确认',
//原材料菜单 //原材料菜单
rawMenu_ReceivingGoods: '收货', rawMenu_ReceivingGoods: '收货',
rawMenu_Handover: '交接', rawMenu_Handover: '交接',

1
src/i18n/lang/en.ts
Unescape Escape View File

@ -56,6 +56,7 @@ export default {
workArea_RegionName: 'Region name', workArea_RegionName: 'Region name',
workArea_WorkAreaName: 'Work area name', workArea_WorkAreaName: 'Work area name',
workArea_WarehouseClassify: 'WH classify', workArea_WarehouseClassify: 'WH classify',
Confirm:'Confirm',
workArea_Confirm: 'Confirm', workArea_Confirm: 'Confirm',
//jpicker提示 //jpicker提示
unselected: 'Unchecked', unselected: 'Unchecked',

61
src/pages/product/warehouse/LocationInventory/index.vue
Unescape Escape View File

@ -168,31 +168,42 @@ export default class ProductCheckReceipt extends BasePage {
this.customToast(this.$t('message.product_Tip3') as string); this.customToast(this.$t('message.product_Tip3') as string);
return; return;
} }
const params = { uni.showModal({
factoryCode: session.factoryCode, content: this.$t('message.Confirm') as string,
user: session.loginName, cancelText: this.$t('message.product_Cancel') as string,
pddno: this.form.pddNo, confirmText: this.$t('message.workArea_Confirm') as string,
regionCode: this.Some.regionCode, success: async (res: any) => {
areaCode: this.Some.areaCode, if (res.confirm) {
whCode: this.Some.whCode, const params = {
snFlag: '1', factoryCode: session.factoryCode,
pdMode: '10', user: session.loginName,
}; pddno: this.form.pddNo,
await this.model.onTakeoutConfirm(params); regionCode: this.Some.regionCode,
if (this.model.status == 'S') { areaCode: this.Some.areaCode,
uni.showToast({ whCode: this.Some.whCode,
icon: 'success', snFlag: '1',
title: this.$t('message.success') as string, pdMode: '10',
}); };
this.form.pddNo = ''; await this.model.onTakeoutConfirm(params);
this.form.barcode = ''; if (this.model.status == 'S') {
this.wl = {}; uni.showToast({
this.Some = {}; icon: 'success',
this.codeList = []; title: this.$t('message.success') as string,
this.total = ''; });
this.areaCode = ''; this.form.pddNo = '';
this.model.modelList = []; this.form.barcode = '';
} this.wl = {};
this.Some = {};
this.codeList = [];
this.total = '';
this.areaCode = '';
this.model.modelList = [];
}
} else if (res.cancel) {
return;
}
},
});
} }
} }
</script> </script>

2
src/pages/product/warehouse/LocationInventory/model.ts
Unescape Escape View File

@ -20,7 +20,7 @@ class OrderInInfo {
namespaced: true, namespaced: true,
dynamic: true, dynamic: true,
store, store,
name: 'product.warehouse.wholeCollect', name: 'product.warehouse.LocationInventory',
}) })
export class wholeCollect extends VuexModule { export class wholeCollect extends VuexModule {
WlList = []; WlList = [];

2
src/pages/product/warehouse/MaterialInventory/model.ts
Unescape Escape View File

@ -20,7 +20,7 @@ class OrderInInfo {
namespaced: true, namespaced: true,
dynamic: true, dynamic: true,
store, store,
name: 'product.warehouse.wholeCollect', name: 'product.warehouse.MaterialInventory',
}) })
export class wholeCollect extends VuexModule { export class wholeCollect extends VuexModule {
WlList = []; WlList = [];

54
src/pages/raw/handover/aggregating/model.ts
Unescape Escape View File

@ -79,12 +79,6 @@ export class AggregatingModule extends VuexModule {
clearProOrderList() { clearProOrderList() {
this.proOrderList = []; this.proOrderList = [];
} }
/**
* 汇总列表是否全选
*/
get isAggregateCheckedAll() {
return !this.aggregateList.filter((_: any) => !_.checked).length;
}
/** /**
* 全选/取消全选汇总列表 * 全选/取消全选汇总列表
@ -92,6 +86,7 @@ export class AggregatingModule extends VuexModule {
*/ */
@Mutation @Mutation
checkAllAggregateList(checked: boolean) { checkAllAggregateList(checked: boolean) {
console.log('this.nodel.aggregateList222', this.aggregateList);
this.aggregateList = this.aggregateList.map((item: any) => { this.aggregateList = this.aggregateList.map((item: any) => {
item.checked = checked; item.checked = checked;
if (item.checked) { if (item.checked) {
@ -102,7 +97,23 @@ export class AggregatingModule extends VuexModule {
return item; return item;
}); });
} }
/**
* 全选/取消按单列表
* @param checked
*/
@Mutation
checkAllOrderList(checked: boolean) {
console.log('this.nodel.orderList222', this.orderList);
this.orderList = this.orderList.map((item: any) => {
item.checked = checked;
if (item.checked) {
item.hvAmount = item.totalMoAmount - item.totalHvAmount;
} else {
item.hvAmount = 0;
}
return item;
});
}
/** /**
* 列表提交-汇总交接 * 列表提交-汇总交接
* @param params * @param params
@ -161,7 +172,12 @@ export class AggregatingModule extends VuexModule {
const newItem = { ...original, hvAmount }; const newItem = { ...original, hvAmount };
this.accessoryList.splice(index, 1, newItem); this.accessoryList.splice(index, 1, newItem);
} }
/**
* 汇总列表是否全选
*/
get isAggregateCheckedAll() {
return !this.aggregateList.filter((_: any) => !_.checked).length;
}
/** /**
* 按单列表是否全选 * 按单列表是否全选
*/ */
@ -179,22 +195,6 @@ export class AggregatingModule extends VuexModule {
checked, checked,
})); }));
} }
/**
* 全选/取消按单列表
* @param checked
*/
@Mutation
checkAllOrderList(checked: boolean) {
this.orderList = this.orderList.map((item: any) => {
item.checked = checked;
if (item.checked) {
item.hvAmount = item.totalMoAmount - item.totalHvAmount;
} else {
item.hvAmount = 0;
}
return item;
});
}
/** /**
* 查询看单号 * 查询看单号
@ -242,6 +242,7 @@ export class AggregatingModule extends VuexModule {
vm.customToast(vm.$t('message.Pi_NoDataFound') as any); vm.customToast(vm.$t('message.Pi_NoDataFound') as any);
return { aggregateList }; return { aggregateList };
} }
console.log('aggregateList', aggregateList);
return { aggregateList }; return { aggregateList };
} }
@ -254,10 +255,13 @@ export class AggregatingModule extends VuexModule {
const { queryParams, proOrderResultList } = params; const { queryParams, proOrderResultList } = params;
await http.post(url.sumscan.lock.list, queryParams); await http.post(url.sumscan.lock.list, queryParams);
const orderList = cloneDeep<any>(proOrderResultList); const orderList = cloneDeep<any>(proOrderResultList);
console.log('orderList', orderList); orderList.map((item: any) => {
item.checked = false;
});
if (orderList.length == 0) { if (orderList.length == 0) {
return { orderList }; return { orderList };
} }
console.log('orderList', orderList);
return { orderList }; return { orderList };
} }
/** /**

1
src/pages/raw/handover/aggregating/order.vue
Unescape Escape View File

@ -152,6 +152,7 @@ export default class AggregatingOrder extends BasePage {
* 全选 * 全选
*/ */
onSelectAll() { onSelectAll() {
console.log('this.nodel.orderList111',this.model.orderList)
model.checkAllOrderList(!model.isOrderCheckedAll); model.checkAllOrderList(!model.isOrderCheckedAll);
} }
clickIndex(e: any) { clickIndex(e: any) {

1
src/pages/raw/handover/aggregating/summary.vue
Unescape Escape View File

@ -175,6 +175,7 @@ export default class AggregatingSummary extends BasePage {
* 全选 * 全选
*/ */
onSelectAll() { onSelectAll() {
console.log('this.nodel.aggregateList111',this.model.aggregateList)
model.checkAllAggregateList(!model.isAggregateCheckedAll); model.checkAllAggregateList(!model.isAggregateCheckedAll);
} }

75
src/pages/raw/handover/picking/ByOrder.vue
Unescape Escape View File

@ -30,12 +30,15 @@
<view class="library-right"> <view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view> <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
<u-input v-model="qty" type="number" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" /> <u-input v-model="qty" type="number" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" />
<view class="add">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view> </view>
</view> </view>
<!-- 添加 --> <!-- 添加 -->
<view class="add"> <!-- <view class="add">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button> <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view> </view> -->
<!-- 表格 --> <!-- 表格 -->
<u-table class="library-table"> <u-table class="library-table">
<u-tr class="u-tr"> <u-tr class="u-tr">
@ -171,16 +174,16 @@ export default class RawReceiptDetail extends BasePage {
this.LocationList = []; this.LocationList = [];
this.qty = ''; this.qty = '';
await this.model.queryItemLoc({ await this.model.queryItemLoc({
workArea:session.workareaCode, workArea: session.workareaCode,
loginName:session.loginName, loginName: session.loginName,
sendSpot:null, sendSpot: null,
materialCode:this.some.materialCode, materialCode: this.some.materialCode,
factoryCode:session.factoryCode factoryCode: session.factoryCode,
}) });
this.Location = []; this.Location = [];
this.Location = this.model.LocList this.Location = this.model.LocList;
console.log('this.Location',this.Location) console.log('this.Location', this.Location);
this.wlCode = this.Location[0] this.wlCode = this.Location[0];
} }
Add() { Add() {
if (this.qty == '' || this.wlCode == '') { if (this.qty == '' || this.wlCode == '') {
@ -423,44 +426,46 @@ export default class RawReceiptDetail extends BasePage {
} }
.library { .library {
width: 100%; width: 100%;
height: 100rpx; height: 200rpx;
display: flex; // display: flex;
display: block;
.library-left { .library-left {
width: 50%; width: 100%;
height: 100%; height: 100rpx;
display: flex; padding-left: 56rpx;
view { // display: flex;
width: 230rpx; // view {
line-height: 100rpx; // width: 230rpx;
text-align: center; // line-height: 100rpx;
} // text-align: center;
// }
} }
.library-right { .library-right {
width: 50%; width: 100%;
height: 100%; height: 100rpx;
padding-left: 56rpx;
display: flex; display: flex;
.library-right-title { .library-right-title {
width: 120rpx; width: 120rpx;
height: 100%; height: 100%;
line-height: 100rpx; line-height: 100rpx;
text-align: center;
} }
.input { .input {
width: 200rpx; width: 200rpx;
height: 70rpx; height: 70rpx;
margin-top: 15rpx; margin-top: 15rpx;
margin-left: 15rpx; margin-left: 0rpx;
}
.add {
width: 200rpx;
height: 100rpx;
position: relative;
button {
position: absolute;
top: 10rpx;
right: 20rpx;
}
} }
}
}
.add {
width: 100%;
height: 100rpx;
position: relative;
button {
position: absolute;
top: 10rpx;
right: 20rpx;
} }
} }
.bottom-bar { .bottom-bar {

77
src/pages/raw/handover/picking/BySummary.vue
Unescape Escape View File

@ -26,17 +26,20 @@
<view class="library"> <view class="library">
<view class="library-left"> <view class="library-left">
<view>{{ $t('message.CommissionedLocation') }}:</view> <view>{{ $t('message.CommissionedLocation') }}:</view>
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" /> <jPicker sureColor="#ff0000" style="width: 400rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
</view> </view>
<view class="library-right"> <view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view> <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
<u-input v-model="qty" type="number" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" /> <u-input v-model="qty" type="number" :border="border" :placeholder="$t('message.Summary_PleaseInputNumber')" class="input" />
<view class="add">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
</view> </view>
</view> </view>
<!-- 添加 --> <!-- 添加 -->
<view class="add"> <!-- <view class="add">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button> <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view> </view> -->
<!-- 表格 --> <!-- 表格 -->
<u-table class="library-table"> <u-table class="library-table">
<u-tr class="u-tr"> <u-tr class="u-tr">
@ -160,16 +163,16 @@ export default class RawReceiptDetail extends BasePage {
this.LocationList = []; this.LocationList = [];
this.qty = ''; this.qty = '';
await this.model.queryItemLoc({ await this.model.queryItemLoc({
workArea:session.workareaCode, workArea: session.workareaCode,
loginName:session.loginName, loginName: session.loginName,
sendSpot:null, sendSpot: null,
materialCode:this.some.materialCode, materialCode: this.some.materialCode,
factoryCode:session.factoryCode factoryCode: session.factoryCode,
}) });
this.Location = []; this.Location = [];
this.Location = this.model.LocList this.Location = this.model.LocList;
console.log('this.Location',this.Location) console.log('this.Location', this.Location);
this.wlCode = this.Location[0] this.wlCode = this.Location[0];
} }
//添加库位和数量到数据和表格中 //添加库位和数量到数据和表格中
Add() { Add() {
@ -415,44 +418,46 @@ export default class RawReceiptDetail extends BasePage {
} }
.library { .library {
width: 100%; width: 100%;
height: 100rpx; height: 200rpx;
display: flex; // display: flex;
display: block;
.library-left { .library-left {
width: 50%; width: 100%;
height: 100%; height: 100rpx;
display: flex; padding-left: 56rpx;
view { // display: flex;
width: 230rpx; // view {
line-height: 100rpx; // width: 230rpx;
text-align: center; // line-height: 100rpx;
} // text-align: center;
// }
} }
.library-right { .library-right {
width: 50%; width: 100%;
height: 100%; height: 100rpx;
padding-left: 56rpx;
display: flex; display: flex;
.library-right-title { .library-right-title {
width: 120rpx; width: 120rpx;
height: 100%; height: 100%;
line-height: 100rpx; line-height: 100rpx;
text-align: center;
} }
.input { .input {
width: 200rpx; width: 200rpx;
height: 70rpx; height: 70rpx;
margin-top: 15rpx; margin-top: 15rpx;
margin-left: 15rpx; margin-left: 0rpx;
}
.add {
width: 200rpx;
height: 100rpx;
position: relative;
button {
position: absolute;
top: 10rpx;
right: 20rpx;
}
} }
}
}
.add {
width: 100%;
height: 100rpx;
position: relative;
button {
position: absolute;
top: 10rpx;
right: 20rpx;
} }
} }
.bottom-bar { .bottom-bar {

4
src/pages/raw/warehouse/rowInventory/index.vue
Unescape Escape View File

@ -8,15 +8,19 @@
<view class="right"></view> <view class="right"></view>
</view> </view>
<u-form class="form" ref="form" :model="form" label-width="180rpx"> <u-form class="form" ref="form" :model="form" label-width="180rpx">
<!-- 单号 -->
<u-form-item :required="true" :label="$t('message.InventoryOrderNo')" prop="pddNo"> <u-form-item :required="true" :label="$t('message.InventoryOrderNo')" prop="pddNo">
<u-search :placeholder="$t('message.InventoryPleaseScan')" v-model.trim="form.pddNo" @search="model.rawMaterialInventoryCheckRaw" :show-action="false"></u-search> <u-search :placeholder="$t('message.InventoryPleaseScan')" v-model.trim="form.pddNo" @search="model.rawMaterialInventoryCheckRaw" :show-action="false"></u-search>
</u-form-item> </u-form-item>
<!-- 物料号 -->
<u-form-item :label="$t('message.InventoryMaterielNo')" prop="productCode"> <u-form-item :label="$t('message.InventoryMaterielNo')" prop="productCode">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="checkRawProductCode" :show-action="false"></u-search> <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="checkRawProductCode" :show-action="false"></u-search>
</u-form-item> </u-form-item>
<!-- 物料名 -->
<u-form-item :label="$t('message.InventoryMateriel')" prop="productDescZh"> <u-form-item :label="$t('message.InventoryMateriel')" prop="productDescZh">
<u-input v-model="form.productDescZh" :placeholder="$t('message.po_PleaseInput')" /> <u-input v-model="form.productDescZh" :placeholder="$t('message.po_PleaseInput')" />
</u-form-item> </u-form-item>
<!-- 盘点总数 -->
<u-form-item :label="$t('message.InventoryTotalNumber')" prop="spQty"> <u-form-item :label="$t('message.InventoryTotalNumber')" prop="spQty">
<u-input v-model="form.spQty" :placeholder="$t('message.po_PleaseInput')" type="number" /> <u-input v-model="form.spQty" :placeholder="$t('message.po_PleaseInput')" type="number" />
</u-form-item> </u-form-item>

Write Preview
Loading…
Cancel
Save