diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 6087c71..52e39b8 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -181,8 +181,8 @@ export default {
Pi_QuantityHandedOver: 'Handedover Qty',
Pi_distribution: 'Distribution',
successful: 'Query was successful',
- ModelCode: 'MAT DESC',
- ModelName: 'MAT CODE',
+ ModelCode: 'MAT CODE',
+ ModelName: 'MAT DESC',
ModelScanned: 'Model scanned',
Pi_tip13: 'Please select the material to submit',
Pi_tip15: 'Please ensure that the handover quantity is equal to the demand quantity',
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 18005fb..39ef863 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -163,7 +163,7 @@ export default class LoginPage extends BasePage {
console.log('......', server.serverAddress);
if (server.serverAddress.includes('https://eurmom.haier.net')) {
//修改俄罗斯版本号
- this.Version = '1.1.9';
+ this.Version = '1.1.10';
} else {
this.Version = '1.0.40';
}
diff --git a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
index a34522c..97ae3bc 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
+++ b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
@@ -35,13 +35,10 @@
-
-
-
-
-
+
- -->
+
@@ -65,7 +62,6 @@ import { BasePage } from '@/components/base/page';
import { VForm } from 'vue/types/form';
import model from './model';
import jPicker from '@/components/J-Picker/jPicker.vue';
-//import { indexOf } from 'lodash';
@Component({
components: {
jPicker,
@@ -77,7 +73,6 @@ export default class rawMaterialInventory extends BasePage {
index() {
this.toPage(this.page.raw.index);
}
- barcode: any = '';
pddNo: any = '';
spQty: any = '';
productItem: any = {};
@@ -168,47 +163,6 @@ export default class rawMaterialInventory extends BasePage {
back() {
uni.navigateBack({ delta: 1 });
}
- async onSearchBarcode() {
- if (this.pddNo == '' || this.pddNo.length == 0) {
- this.customToast(this.$t('message.Commission_tips1') as string);
- return;
- }
- if (this.barcode == '' || this.barcode.length == 0) {
- this.customToast(this.$t('message.barcode') as string);
- return;
- }
- // let params = {
- // barcode:this.barcode,
- // // loginName: this.session.loginName,
- // // factoryCode: this.session.factoryCode,
- // // orderNo: this.orderNo,
- // // orderItem: this.histroyItem.orderItem,
- // // productCode: this.histroyItem.productCode,
- // // productDescZh: this.histroyItem.productDescZh,
- // // orderType: this.histroyItem.orderType,
- // // barcode: this.barcode,
- // // locCode: this.remove.value,
- // };
- await this.model.rawMaterialInventoryCheckBarcode(this.barcode);
- if (this.model.SubmitCode == '1') {
- //this.customToast(this.$t('message.Warehouse_Tip9') as string);
- if (JSON.stringify(this.model.InventoryList).indexOf(this.model.Semifedcode) != -1) {
- this.model.InventoryList.forEach((item: any) => {
- if (item.productCode == this.model.Semifedcode) {
- this.productItem = item;
- this.productItem.spQty += 1;
- }
- });
- } else {
- this.customToast(this.$t('message.Nomatch') as string);
- }
- // this.barcode = '';
- // this.histroyItem = {};
- // this.productCodeList = {};
- // this.model.empty();
- // await this.query();
- }
- }
}
@@ -281,5 +235,8 @@ export default class rawMaterialInventory extends BasePage {
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
padding: 20rpx;
}
+
+ .button-bar {
+ }
}
diff --git a/src/pages/raw/Semi-finished/Semi-finished-inventory/model.ts b/src/pages/raw/Semi-finished/Semi-finished-inventory/model.ts
index 3b45a06..bfd6ae5 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-inventory/model.ts
+++ b/src/pages/raw/Semi-finished/Semi-finished-inventory/model.ts
@@ -50,8 +50,7 @@ export class ReceiptModule extends VuexModule {
orderInInfoListEx: OrderInInfo[] = [];
InventoryList: any = [];
InventoryItemList: any = [];
- Semifedcode: any = {};
- SubmitCode: any = '';
+
/**
* 库位列表
*/
@@ -168,7 +167,6 @@ export class ReceiptModule extends VuexModule {
loginName: session.loginName,
});
const InventoryList = res.data;
- const SubmitCode = res.code;
const InventoryItemList = [];
InventoryList.forEach((item: any) => {
const arr = {
@@ -177,34 +175,7 @@ export class ReceiptModule extends VuexModule {
};
InventoryItemList.push(arr);
});
- return { SubmitCode, InventoryList, InventoryItemList };
- // uni.showToast({
- // icon: "none",
- // title: msg,
- // });
- }
- /**
- * 查询条码
- * 查询盘点条码
- * @param barcode
- */
- @MutationAction
- async rawMaterialInventoryCheckBarcode(barcode: string) {
- const res: any = await http.post(url.material.rawMaterialInventory.checkRaw, {
- barcode,
- factoryCode: session.factoryCode,
- loginName: session.loginName,
- });
- const Semifedcode = res.data;
- // const InventoryItemList = [];
- // InventoryList.forEach((item: any) => {
- // const arr = {
- // value: item.productCode,
- // label: item.productCode,
- // };
- // InventoryItemList.push(arr);
- // });
- return { Semifedcode };
+ return { InventoryList, InventoryItemList };
// uni.showToast({
// icon: "none",
// title: msg,