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

cosmoim-852 fix 泰国成品dn出库退扫调整，俄罗斯调整

Browse Source
master
guoshuang 3 years ago
parent 57e4909eb4
commit cc446d1aa8
10 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File

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

@ -546,5 +546,7 @@ export default {
SONO: 'SO单号',
Closecount: '是否关闭盘点单',
SPDR: '备件DN收货',
Nodefectname: '没有缺陷名称',
Nozonename: '没有区域名称',
},
};

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

@ -545,5 +545,7 @@ export default {
SONO: 'SO NO',
Closecount: 'Close the count sheet?',
SPDR: 'Spare Part DN Receive',
Nodefectname: 'No defect name',
Nozonename: 'No zone name',
},
};

2
src/i18n/lang/ru.ts
Unescape Escape View File

@ -545,5 +545,7 @@ export default {
SONO: 'SO NO',
Closecount: 'Закрыты ли инвентарные ведомости?',
SPDR: 'Запасные части DN Получение',
Nodefectname: 'Имя дефекта отсутствует',
Nozonename: 'Нет названия региона',
},
};

4
src/pages/login/login/index.vue
Unescape Escape View File

@ -171,9 +171,9 @@ export default class LoginPage extends BasePage {
console.log('......', server.serverAddress);
if (server.serverAddress.includes('https://eurmom.haier.net')) {
//修改俄罗斯版本号
this.Version = '1.1.19';
this.Version = '1.1.22';
} else {
this.Version = '1.0.46';
this.Version = '1.0.47';
}
console.log('////', this.Version);
}

43
src/pages/product/outbound/stoOutbound/Back.vue
Unescape Escape View File

@ -15,6 +15,14 @@
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
</view>
</u-form-item>
<!-- 已扫数量 -->
<u-form-item :label="$t('message.SweptQuantity')">
<u-input v-model="scanAmount" :disabled="true" />
</u-form-item>
<!-- 已退数量 -->
<u-form-item :label="$t('message.QuantityReturned')">
<u-input v-model="retreatNum" :disabled="true" />
</u-form-item>
<!-- 成品条码 -->
<u-form-item :label="$t('message.sweepBarCode')">
<u-search :placeholder="$t('message.barcode')" v-model="barCode" @search="BackSweep" :show-action="false"></u-search>
@ -112,38 +120,9 @@ export default class stoOutboundDom extends BasePage {
// duration: 2000,
// image: '/static/icons/icon-51.png',
// });
if (this.rowItemIndex == null) {
this.form.productCode = this.model.materielList[0].materialCode;
this.form.productDescZh = this.model.materielList[0].materialDesc;
this.form.rowItem = this.model.materielList[0].materialCode;
this.form.row = this.model.materielList[0].rowItem;
this.form.orderAmount = this.model.materielList[0].orderAmount;
this.form.scanAmount = parseFloat(this.model.materielList[0].outAmount);
this.rowItemIndex = this.model.materielList[0].rowItem;
} else {
let rowIndex: any = null;
this.model.materielList.forEach((item: any, index) => {
if (item.rowItem == this.rowItemIndex) {
rowIndex = index;
}
});
if (rowIndex == null) {
this.form.productCode = this.model.materielList[0].materialCode;
this.form.productDescZh = this.model.materielList[0].materialDesc;
this.form.rowItem = this.model.materielList[0].materialCode;
this.form.row = this.model.materielList[0].rowItem;
this.form.orderAmount = this.model.materielList[0].orderAmount;
this.form.scanAmount = parseFloat(this.model.materielList[0].outAmount);
this.rowItemIndex = this.model.materielList[0].rowItem;
} else {
this.form.productCode = this.model.materielList[rowIndex].materialCode;
this.form.productDescZh = this.model.materielList[rowIndex].materialDesc;
this.form.rowItem = this.model.materielList[rowIndex].materialCode;
this.form.row = this.model.materielList[rowIndex].rowItem;
this.form.orderAmount = this.model.materielList[rowIndex].orderAmount;
this.form.scanAmount = parseFloat(this.model.materielList[rowIndex].outAmount);
}
}
this.model.materielList.forEach((item: any) => {
this.scanAmount += parseFloat(item.outAmount);
});
}
}
}

16
src/pages/raw/LineSide/rejectsOffline/index.vue
Unescape Escape View File

@ -32,11 +32,11 @@
<u-input :disabled="true" v-model="Some.materialCode" placeholder="" />
</u-form-item>
<!-- 缺陷 -->
<u-form-item :label="$t('message.defect')">
<u-form-item :required="true" :label="$t('message.defect')">
<u-search placeholder="" v-model.trim="Some.reason" @search="queryreason" :show-action="false"></u-search>
<!-- <u-input v-model="Some.reason" placeholder="" /> -->
</u-form-item>
<u-form-item :label="$t('message.DefectName')">
<u-form-item :required="true" :label="$t('message.DefectName')">
<u-input :disabled="true" v-model="reasonList.dicName" placeholder="" style="overflow: hidden" />
</u-form-item>
<!-- 责任人 -->
@ -44,11 +44,11 @@
<u-input v-model="Some.responsibleUser" placeholder="" />
</u-form-item>
<!-- 责任区域 -->
<u-form-item :label="$t('message.ResponsibleProcess')">
<u-form-item :required="true" :label="$t('message.ResponsibleProcess')">
<!-- <u-input v-model="Some.responsibleProcess" placeholder="" /> -->
<u-search placeholder="" v-model.trim="Some.responsibleProcess" @search="queryProcess" :show-action="false"></u-search>
</u-form-item>
<u-form-item :label="$t('message.workArea_RegionName')">
<u-form-item :required="true" :label="$t('message.workArea_RegionName')">
<u-input :disabled="true" v-model="ProcessList.dicName" placeholder="" style="overflow: hidden" />
</u-form-item>
<!-- 备注 -->
@ -182,6 +182,14 @@ export default class productCheckReceipt extends BasePage {
this.customToast(this.$t('message.Pleasedefects') as string);
return;
}
if (this.reasonList.dicName == '') {
this.customToast(this.$t('message.Nodefectname') as string);
return;
}
if (this.ProcessList.dicName == '') {
this.customToast(this.$t('message.Nozonename') as string);
return;
}
// if (!this.Some.responsibleUser) {
// this.customToast(this.$t('message.PleaseOne') as string);
// return;

12
src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue
Unescape Escape View File

@ -33,7 +33,7 @@
<u-search placeholder="" v-model.trim="reason" @search="queryreason" :show-action="false"></u-search>
<!-- <u-input v-model="reason" :border="border" :placeholder="$t('message.po_PleaseInput')" /> -->
</u-form-item>
<u-form-item :label="$t('message.DefectName')">
<u-form-item :required="true" :label="$t('message.DefectName')">
<u-input :disabled="true" v-model="reasonList.dicName" placeholder="" style="overflow: hidden" />
</u-form-item>
<!-- 责任人 -->
@ -45,7 +45,7 @@
<u-search placeholder="" v-model.trim="responsibleProcess" @search="queryProcess" :show-action="false"></u-search>
<!-- <u-input v-model="responsibleProcess" :border="border" :placeholder="$t('message.po_PleaseInput')" /> -->
</u-form-item>
<u-form-item :label="$t('message.workArea_RegionName')">
<u-form-item :required="true" :label="$t('message.workArea_RegionName')">
<u-input :disabled="true" v-model="ProcessList.dicName" placeholder="" style="overflow: hidden" />
</u-form-item>
<!-- 备注 -->
@ -150,6 +150,14 @@ export default class KanDanHandOver extends BasePage {
this.customToast(this.$t('message.Pleasedefects') as string);
return;
}
if (this.reasonList.dicName == '') {
this.customToast(this.$t('message.Nodefectname') as string);
return;
}
if (this.ProcessList.dicName == '') {
this.customToast(this.$t('message.Nozonename') as string);
return;
}
// if (this.responsibleUser == '') {
// this.customToast(this.$t('message.PleaseOne') as string);
// return;

8
src/pages/raw/handover/picking/index.vue
Unescape Escape View File

@ -172,6 +172,14 @@ export default class pickingDom extends BasePage {
}
return params;
}
// async onLoad() {
// await this.getMRP();
// }
// async getMRP() {
// let params = {};
// await this.model.getMRP(params);
// this.form.mrpCodeRegion = model.mrpdata;
// }
// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
onReady() {
this.$form.setRules(this.rules);

10
src/pages/raw/handover/picking/model.ts
Unescape Escape View File

@ -20,6 +20,7 @@ export class PickingModule extends VuexModule {
sapFactoryCode: '';
formParams: '';
code = '';
//mrpdata: any;
orderOutIdList: any;
NEWparams: any;
LocList: any = [];
@ -405,6 +406,15 @@ export class PickingModule extends VuexModule {
console.log(this.detailedList);
return res;
}
//获取MRP
// @MutationAction
// async getMRP(params: any = {}) {
// const res: any = await http.post(url.sortscan.save.order, params);
// const code = res.code;
// const mrpdata = res.data;
// console.log('code', code);
// return { code, mrpdata };
// }
}
export default getModule(PickingModule);

2
src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue
Unescape Escape View File

@ -476,7 +476,7 @@ export default class dnReceiptDom extends BasePage {
text-align: center;
.title {
flex: 3;
flex: 6;
}
.left,

Write Preview
Loading…
Cancel
Save