diff --git a/nladmin-ui/src/views/wms/basedata/class/index.vue b/nladmin-ui/src/views/wms/basedata/class/index.vue
index 8aa983c..6a30052 100644
--- a/nladmin-ui/src/views/wms/basedata/class/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/class/index.vue
@@ -12,21 +12,22 @@
label-suffix=":"
>
-
+
-
+ :value="item.value"
+ />
diff --git a/nladmin-ui/src/views/wms/basedata/customer/index.vue b/nladmin-ui/src/views/wms/basedata/customer/index.vue
index ca51c24..be924c1 100644
--- a/nladmin-ui/src/views/wms/basedata/customer/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/customer/index.vue
@@ -127,7 +127,7 @@
-
+
diff --git a/nladmin-ui/src/views/wms/basedata/material/index.vue b/nladmin-ui/src/views/wms/basedata/material/index.vue
index e76f8d9..36c609a 100644
--- a/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -300,7 +300,7 @@ export default {
name: data.material_name
}), i18n.t('common.tips'), {
confirmButtonText: i18n.t('common.Confirm'),
- cancelButtonText: i18n.t('common.Cancel'),
+ cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'
}).then(() => {
crudMaterial.edit(data).then(res => {
diff --git a/nladmin-ui/src/views/wms/basedata/materialSet/index.vue b/nladmin-ui/src/views/wms/basedata/materialSet/index.vue
index adcbc87..e81569c 100644
--- a/nladmin-ui/src/views/wms/basedata/materialSet/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/materialSet/index.vue
@@ -32,18 +32,18 @@
- {{ $t('wms.basedata.materialSet.add') }}
-
+ slot="right"
+ class="filter-item"
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="addDig"
+ >
+ {{ $t('wms.basedata.materialSet.add') }}
+
-
+
- {{$t('common.No')}}
- {{$t('common.Yes')}}
+ {{ $t('common.No') }}
+ {{ $t('common.Yes') }}
diff --git a/nladmin-ui/src/views/wms/basedata/structattr/index.vue b/nladmin-ui/src/views/wms/basedata/structattr/index.vue
index 9438b17..9885972 100644
--- a/nladmin-ui/src/views/wms/basedata/structattr/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/structattr/index.vue
@@ -92,8 +92,7 @@
-
-
+
-
+
-
+
@@ -177,13 +176,13 @@
-
+
-
+
@@ -191,7 +190,7 @@
-
+
@@ -205,13 +204,13 @@
-
+
-
+
@@ -219,7 +218,7 @@
-
+
@@ -390,27 +389,27 @@ export default {
layerList: [
{ 'label': i18n.t('wms.basedata.structattr.layer_1'), 'value': '1' },
{ 'label': i18n.t('wms.basedata.structattr.layer_2'), 'value': '2' },
- { 'label': i18n.t('wms.basedata.structattr.layer_3'), 'value': '3'}
+ { 'label': i18n.t('wms.basedata.structattr.layer_3'), 'value': '3' }
],
isHaveList: [
{ 'label': i18n.t('wms.basedata.structattr.empty'), 'value': '1' },
- { 'label': i18n.t('wms.basedata.structattr.has_goods'), 'value': '2'}
+ { 'label': i18n.t('wms.basedata.structattr.has_goods'), 'value': '2' }
],
rules: {
struct_id: [
{ required: true, message: i18n.t('wms.basedata.structattr.struct_code_not_empty'), trigger: 'blur' }
],
struct_code: [
- { required: true, message: i18n.t('wms.basedata.structattr.position_code_not_empty'), trigger: 'blur'}
+ { required: true, message: i18n.t('wms.basedata.structattr.position_code_not_empty'), trigger: 'blur' }
],
struct_name: [
- { required: true, message: i18n.t('wms.basedata.structattr.position_name_not_empty'), trigger: 'blur'}
+ { required: true, message: i18n.t('wms.basedata.structattr.position_name_not_empty'), trigger: 'blur' }
],
sect_id: [
- { required: true, message: i18n.t('wms.basedata.structattr.warehouse_area_not_empty'), trigger: 'blur'}
+ { required: true, message: i18n.t('wms.basedata.structattr.warehouse_area_not_empty'), trigger: 'blur' }
],
stor_id: [
- { required: true, message: i18n.t('wms.basedata.structattr.warehouse_not_empty'), trigger: 'blur'}
+ { required: true, message: i18n.t('wms.basedata.structattr.warehouse_not_empty'), trigger: 'blur' }
],
row_num: [
{ required: false, message: i18n.t('wms.basedata.structattr.struct_code_not_empty'), trigger: 'blur' },
@@ -420,7 +419,7 @@ export default {
{ required: false, message: i18n.t('wms.basedata.structattr.struct_code_not_empty'), trigger: 'blur' },
{ validator: numberOne }
],
- layer_num: [
+ layer_num: [
{ required: false, message: i18n.t('wms.basedata.structattr.struct_code_not_empty'), trigger: 'blur' },
{ validator: numberOne }
]
diff --git a/nladmin-ui/src/views/wms/decision_manage/strategy/AddDialog.vue b/nladmin-ui/src/views/wms/decision_manage/strategy/AddDialog.vue
index d696976..6cdfcc6 100644
--- a/nladmin-ui/src/views/wms/decision_manage/strategy/AddDialog.vue
+++ b/nladmin-ui/src/views/wms/decision_manage/strategy/AddDialog.vue
@@ -70,8 +70,8 @@
@@ -106,13 +106,6 @@ export default {
type: Object
}
},
- watch: {
- dialogShow: {
- handler(newValue, oldValue) {
- this.dialogVisible = newValue
- }
- }
- },
data() {
return {
dialogVisible: false,
@@ -145,6 +138,13 @@ export default {
}
}
},
+ watch: {
+ dialogShow: {
+ handler(newValue, oldValue) {
+ this.dialogVisible = newValue
+ }
+ }
+ },
methods: {
handleClose(done) {
this.$confirm(i18n.t('wms.decision_manage.strategy.confirm_close'))
diff --git a/nladmin-ui/src/views/wms/decision_manage/strategy/index.vue b/nladmin-ui/src/views/wms/decision_manage/strategy/index.vue
index e2d3b93..b9a3ea3 100644
--- a/nladmin-ui/src/views/wms/decision_manage/strategy/index.vue
+++ b/nladmin-ui/src/views/wms/decision_manage/strategy/index.vue
@@ -27,7 +27,7 @@
-
+
-
+
- {{scope.row.ban?$t('wms.decision_manage.strategy.system_strategy'):$t('wms.decision_manage.strategy.custom_strategy')}}
+ {{ scope.row.ban?$t('wms.decision_manage.strategy.system_strategy'):$t('wms.decision_manage.strategy.custom_strategy') }}
-
-
+
+
-
+
@@ -129,7 +129,7 @@ export default {
return true
},
format_is_used(is_used) {
- return is_used==true
+ return is_used == true
},
changeEnabled(data, val) {
let msg = i18n.t('wms.decision_manage.strategy.confirm_disable')
diff --git a/nladmin-ui/src/views/wms/pm_manage/form_data/ViewDialog.vue b/nladmin-ui/src/views/wms/pm_manage/form_data/ViewDialog.vue
index a61af4a..4884028 100644
--- a/nladmin-ui/src/views/wms/pm_manage/form_data/ViewDialog.vue
+++ b/nladmin-ui/src/views/wms/pm_manage/form_data/ViewDialog.vue
@@ -8,33 +8,40 @@
@close="close"
@open="open"
>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -82,15 +89,15 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleDtlCurrentChange"
>
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -98,16 +105,21 @@
-
-
-
-
-
+
+
+
+
+
{{ scope.row.form_data[item.value] }}
-
-
+
+
@@ -115,9 +127,9 @@