diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 220404a..d621f80 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -566,5 +566,7 @@ export default {
finQty: '扫描数量',
confirm: '确认',
HeaderText: '备注',
+ supplierCode: '供应商编码',
+ supplierName: '供应商名称',
},
};
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 18cec1b..7de4c45 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -568,5 +568,7 @@ export default {
so: 'Sell Order',
rawSo: 'Material So',
spSo: 'Spare So',
+ supplierCode: 'supplier code',
+ supplierName: 'supplier',
},
};
diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts
index be805dd..75beaa9 100644
--- a/src/i18n/lang/ru.ts
+++ b/src/i18n/lang/ru.ts
@@ -565,5 +565,7 @@ export default {
finQty: 'Количество сканирования',
confirm: 'Подтверждениe',
HeaderText: 'Примечания',
+ supplierCode: 'Код поставщика',
+ supplierName: 'Название поставщика',
},
};
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 1e33f08..40eba3e 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -173,7 +173,7 @@ export default class LoginPage extends BasePage {
//修改俄罗斯版本号
this.Version = '1.1.38';
} else {
- this.Version = '1.0.51';
+ this.Version = '1.0.52';
}
console.log('////', this.Version);
}
diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue
index 8b29d1d..af86bc8 100644
--- a/src/pages/raw/commission/goOut/index.vue
+++ b/src/pages/raw/commission/goOut/index.vue
@@ -19,6 +19,17 @@
{{ $t('message.Query') }}
+
+
+
+ {{ $t('message.supplierCode') }}
+
+
+
+ {{ $t('message.supplierName') }}
+
+
+
@@ -409,7 +420,7 @@ export default class dnReceiptDom extends BasePage {
height: 100%;
display: flex;
.number-left-title {
- width: 120rpx;
+ width: 182rpx;
height: 100%;
line-height: 100rpx;
}
@@ -425,7 +436,7 @@ export default class dnReceiptDom extends BasePage {
height: 100%;
display: flex;
.number-right-title {
- width: 120rpx;
+ width: 144rpx;
height: 100%;
line-height: 100rpx;
text-align: center;
diff --git a/src/pages/raw/warehouse/Relationship/index.vue b/src/pages/raw/warehouse/Relationship/index.vue
index 002aab9..35a70e1 100644
--- a/src/pages/raw/warehouse/Relationship/index.vue
+++ b/src/pages/raw/warehouse/Relationship/index.vue
@@ -46,6 +46,10 @@
+
+
+
+
{{ $t('message.po_Return') }}
@@ -77,6 +81,7 @@ export default class KanDanHandOver extends BasePage {
wl: any = {};
actualQty = 0;
Some: any = {};
+ userDefined3 = '';
MaterialList: any = [];
//查询单号
async query() {
@@ -134,6 +139,7 @@ export default class KanDanHandOver extends BasePage {
productCode: this.Some.productCode,
productDescZh: this.Some.productDescZh,
actualQty: this.Some.qty,
+ userDefined3: this.userDefined3,
originWl: this.Some.originWl,
type: '1',
loginName: session.loginName,
@@ -153,6 +159,7 @@ export default class KanDanHandOver extends BasePage {
});
this.Some = {};
this.actualQty = 0;
+ this.userDefined3 = '';
this.wl = {};
this.MaterialList = [];
this.query();