diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 7a89606..0f0bf0b 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -419,7 +419,7 @@ export default {
Warehouse_Tip6: '请选择物料',
Warehouse_Tip7: '盘点未完成,确定继续吗',
selectCode: '请先选择编码',
- standard:'条码不规范',
+ standard: '条码长度必须是20位',
Warehouse_Tip8: '请输入成本中心',
Warehouse_Tip9: '操作成功',
DocumentNumber: '文件号',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 1f3cd91..e8ba97b 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -67,7 +67,7 @@ export default {
LBWK: 'List is empty',
CommissionedDetails:'detail',
closing:'Confirm closing order?',
- standard:'Non standard barcode',
+ standard:'FG barcode length must be 20',
rawMenu_InTheLibrary: 'RAW WH',
rawMenu_ReturnGoods: 'Return',
rawMenu_SignOut: 'Sign out',
diff --git a/src/pages/product/warehouse/wholeLnventory/index.vue b/src/pages/product/warehouse/wholeLnventory/index.vue
index 236052d..2b9e7f9 100644
--- a/src/pages/product/warehouse/wholeLnventory/index.vue
+++ b/src/pages/product/warehouse/wholeLnventory/index.vue
@@ -31,7 +31,7 @@
-
+
@@ -87,6 +87,7 @@ export default class productCheckReceipt extends BasePage {
* 页面Module
*/
model = model;
+ border = true;
aaa: number = null;
bbb: number = null;
/**
diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue
index da36be8..8513226 100644
--- a/src/pages/product/warehouse/wholeScrap/index.vue
+++ b/src/pages/product/warehouse/wholeScrap/index.vue
@@ -45,7 +45,7 @@
-
+
@@ -96,6 +96,7 @@ import { session } from '@/store/modules/session';
export default class productCheckReceipt extends BasePage {
@Ref('form') readonly $form!: VForm;
model = model;
+ border = true;
form = {
productCode: '',
order3: '',
diff --git a/src/pages/product/warehouse/wholeTransfer/config.ts b/src/pages/product/warehouse/wholeTransfer/config.ts
index f03cd17..264f19d 100644
--- a/src/pages/product/warehouse/wholeTransfer/config.ts
+++ b/src/pages/product/warehouse/wholeTransfer/config.ts
@@ -197,10 +197,10 @@ export const Headers = [
key: 'materialCode', //产品编码
width: 300,
},
- {
- label: vm.$t('message.Access_type'),
- key: 'oiType', //出入类型
- },
+ // {
+ // label: vm.$t('message.Access_type'),
+ // key: 'oiType', //出入类型
+ // },
{
label: vm.$t('message.product_Location'),
key: 'wlToCode', //库位
diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue
index 79274b0..7ff0f4c 100644
--- a/src/pages/raw/handover/aggregating/index.vue
+++ b/src/pages/raw/handover/aggregating/index.vue
@@ -11,7 +11,7 @@
-
+
-
+
@@ -162,6 +162,7 @@ export default class Aggregating extends BasePage {
* 页面Module
*/
model = model;
+ border = true;
/**
* 表头
*/
diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue
index 90211d8..2ee3fd9 100644
--- a/src/pages/raw/handover/aggregating/order.vue
+++ b/src/pages/raw/handover/aggregating/order.vue
@@ -25,12 +25,12 @@
-
+
-
+
@@ -83,7 +83,7 @@ export default class AggregatingOrder extends BasePage {
* 页面Module
*/
model = model;
-
+ border = true;
/**
* 表头
*/
diff --git a/src/pages/raw/handover/aggregating/summary.vue b/src/pages/raw/handover/aggregating/summary.vue
index 6269ab2..629195f 100644
--- a/src/pages/raw/handover/aggregating/summary.vue
+++ b/src/pages/raw/handover/aggregating/summary.vue
@@ -25,12 +25,12 @@
-
+
-
+
@@ -83,7 +83,7 @@ export default class AggregatingSummary extends BasePage {
* 页面Module
*/
model = model;
-
+ border = true;
/**
* 表头
*/
diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue
index 6ba1e29..e3bfb8a 100644
--- a/src/pages/raw/handover/feeding/Location.vue
+++ b/src/pages/raw/handover/feeding/Location.vue
@@ -83,12 +83,12 @@
-
+
-
+
diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue
index 66e7f30..3439aa9 100644
--- a/src/pages/raw/handover/picking/index.vue
+++ b/src/pages/raw/handover/picking/index.vue
@@ -12,11 +12,11 @@
-
+
-
+
@@ -24,7 +24,7 @@
-
+
@@ -76,7 +76,7 @@ export default class pickingDom extends BasePage {
* 页面Module
*/
model = model;
-
+ border = true;
/**
* 表头
*/
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index 94ab20c..c8305d0 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -54,17 +54,17 @@
-
+
-
+
-
+
@@ -104,6 +104,7 @@ export default class returningDom extends BasePage {
* 页面Module
*/
model = model;
+ border = true;
/**
* 表单数据
*/
diff --git a/src/pages/raw/handover/virtual/index.vue b/src/pages/raw/handover/virtual/index.vue
index cddb2f7..2b895b7 100644
--- a/src/pages/raw/handover/virtual/index.vue
+++ b/src/pages/raw/handover/virtual/index.vue
@@ -12,7 +12,7 @@
-
+
-
+
-
+
-
+
@@ -30,12 +30,12 @@
-
+
-
+
@@ -83,7 +83,7 @@ export default class VirtualSummary extends BasePage {
* 页面Module
*/
model = model;
-
+ border = true;
/**
* 表头
*/
diff --git a/src/pages/raw/warehouse/rowCollect/index.vue b/src/pages/raw/warehouse/rowCollect/index.vue
index 332d72a..15f3aec 100644
--- a/src/pages/raw/warehouse/rowCollect/index.vue
+++ b/src/pages/raw/warehouse/rowCollect/index.vue
@@ -39,9 +39,9 @@
-
+
{{ $t('message.po_Return') }}
@@ -84,7 +84,7 @@ export default class KanDanHandOver extends BasePage {
if (this.model.code == '1') {
uni.showToast({ icon: 'success', title: this.$t('message.successful') as string });
this.model.orderInInfoList.forEach((item: any) => {
- item.fileNo = '';
+ //item.fileNo = '';
let arr: any = {
label: item.productCode,
value: item.productCode,
@@ -115,10 +115,10 @@ export default class KanDanHandOver extends BasePage {
this.customToast(this.$t('message.Warehouse_Tip5') as string);
return;
}
- if (this.Some.fileNo == '' || this.Some.fileNo == null || this.Some.fileNo == undefined) {
- this.customToast(this.$t('message.fileNumber') as string);
- return;
- }
+ // if (this.Some.fileNo == '' || this.Some.fileNo == null || this.Some.fileNo == undefined) {
+ // this.customToast(this.$t('message.fileNumber') as string);
+ // return;
+ // }
let orderlist = [];
this.Some.type = '1';
this.Some.keepBy = session.loginName;
@@ -128,7 +128,7 @@ export default class KanDanHandOver extends BasePage {
if (this.model.code == '1') {
uni.showToast({ icon: 'success', title: this.$t('message.success') as string });
this.Some = {};
- this.Some.fileNo = ' ';
+ //this.Some.fileNo = ' ';
this.wl = {};
this.MaterialList = [];
this.query();
diff --git a/src/pages/raw/warehouse/rowScrap/index.vue b/src/pages/raw/warehouse/rowScrap/index.vue
index 0a7ac43..557f7b1 100644
--- a/src/pages/raw/warehouse/rowScrap/index.vue
+++ b/src/pages/raw/warehouse/rowScrap/index.vue
@@ -44,7 +44,7 @@
-
+
@@ -73,6 +73,7 @@ export default class KanDanHandOver extends BasePage {
//单号
order3 = '';
model = model;
+ border = true;
wl: any = {};
Some: any = {};
MaterialList: any = [];
diff --git a/src/pages/raw/warehouse/rowTransfer/index.vue b/src/pages/raw/warehouse/rowTransfer/index.vue
index c993c8c..2fae48f 100644
--- a/src/pages/raw/warehouse/rowTransfer/index.vue
+++ b/src/pages/raw/warehouse/rowTransfer/index.vue
@@ -35,7 +35,7 @@
-
+
@@ -62,6 +62,7 @@ export default class KanDanHandOver extends BasePage {
order3 = '';
NEWqty = '';
model = model;
+ border = true;
materialCodeSelect = false;
orderlist: any = [];
//查询单号