From 5bf412ce1aa8235c69d5a0cf3bd5e440ef23e512 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 12 Oct 2022 17:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AD=98=E6=94=BE=E5=9C=B0?=
=?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anruiscm/scmwarehouse/scmwarehouse.vue | 13 ++---
.../anruiscm/scmwarehouse/scmwarehouseAdd.vue | 48 ++++++++++---------
.../scmwarehouse/scmwarehouseInfo.vue | 33 +++++++------
3 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
index ff9a11a02e..520fc1e54c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
@@ -51,22 +51,23 @@
-
-
+
+
-
+
+
{{ scope.row.warehouseName }}
-
+
-
-
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
index fb38a38031..9edad38c90 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
@@ -18,12 +18,6 @@
存放地点
-
-
-
-
-
-
*使用组织
@@ -33,6 +27,16 @@
+
+ *编码
+
+
+
+
+
+
+
+
*名称
@@ -41,8 +45,6 @@
-
-
*负责人及电话
@@ -51,6 +53,8 @@
+
+
*分组
@@ -61,16 +65,6 @@
-
-
-
- *详细地址
-
-
-
-
-
-
*库管人员
@@ -82,6 +76,16 @@
+
+
+ *详细地址
+
+
+
+
+
+
+
@@ -126,7 +130,7 @@ export default {
sid: '',
useOrg: '', // 使用组织
useOrgSid: '', // 使用组织sid
- // warehouseCode: '', // 编码
+ gressionCode: '', // 编码
warehouseName: '', // 名称
warehouseAttribute: '', // 存放地点属性
warehouseContract: '', // 存放地点负责人
@@ -139,7 +143,7 @@ export default {
rules: {
useOrg: [{ required: true, message: '使用组织不能为空', trigger: 'change' }], // 使用组织
useOrgSid: [{ required: true, message: '使用组织sid不能为空', trigger: 'blur' }], // 使用组织sid
- // warehouseCode: [{ required: true, message: '编码不能为空', trigger: 'blur' }], // 编码
+ gressionCode: [{ required: true, message: '编码不能为空', trigger: 'blur' }], // 编码
warehouseName: [{ required: true, message: '名称不能为空', trigger: 'blur' }], // 名称
warehouseAttribute: [{ required: true, message: '存放地点详细地址不能为空', trigger: 'blur' }], // 存放地点属性
warehouseContract: [{ required: true, message: '存放地点负责人不能为空', trigger: 'blur' }], // 存放地点负责人
@@ -313,7 +317,7 @@ export default {
this.formobj.sid = '' // SID
this.formobj.useOrg = '' // 使用组织
this.useOrgSid = '' // 使用组织sid
- // this.warehouseCode = '' // 编码
+ this.gressionCode = '' // 编码
this.formobj.warehouseName = '' // 名称
this.formobj.warehouseAttribute = '' // 存放地点属性
this.formobj.warehouseContract = '' // 存放地点负责人
@@ -345,7 +349,7 @@ export default {
this.formobj.id = vdata.id
this.formobj.sid = vdata.sid // SID
this.formobj.useOrg = vdata.useOrg // 使用组织
- // this.formobj.warehouseCode = vdata.warehouseCode // 编码
+ this.formobj.gressionCode = vdata.gressionCode // 编码
this.formobj.warehouseName = vdata.warehouseName // 名称
this.formobj.warehouseAttribute = vdata.warehouseAttribute // 存放地点属性
this.formobj.warehouseContract = vdata.warehouseContract // 存放地点负责人
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue
index 71a37d5a60..40fdea1a1d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue
@@ -14,12 +14,6 @@
存放地点
-
-
-
-
-
-
使用组织
@@ -30,39 +24,39 @@
- 名称
+ 编码
- {{ formobj.warehouseName }}
+ {{ formobj.gressionCode }}
- 负责人及电话
+ 名称
- {{ formobj.warehouseContract }}
+ {{ formobj.warehouseName }}
- 分组
+ 负责人及电话
- {{ formobj.warehouseGroupValue }}
+ {{ formobj.warehouseContract }}
- 详细地址
+ 分组
- {{ formobj.warehouseAttribute }}
+ {{ formobj.warehouseGroupValue }}
@@ -74,6 +68,16 @@
+
+
+ 详细地址
+
+
+
+ {{ formobj.warehouseAttribute }}
+
+
+
@@ -102,6 +106,7 @@ export default {
this.formobj.sid = vdata.sid // SID
this.formobj.useOrg = vdata.useOrg // 使用组织
this.formobj.warehouseName = vdata.warehouseName // 名称
+ this.formobj.gressionCode = vdata.gressionCode // 编码
this.formobj.warehouseAttribute = vdata.warehouseAttribute // 存放地点属性
this.formobj.warehouseContract = vdata.warehouseContract // 存放地点负责人
this.formobj.warehouseContractSid = vdata.warehouseContractSid // 存放地点负责人sid