From 6659a60b43b7fc4bb53602bff6269e5e54aa3fcd Mon Sep 17 00:00:00 2001
From: "SERVERM-0FVHDNN\\Administrator" <942005050@qq.com>
Date: Thu, 30 Mar 2023 13:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/views/basicData/BomManage/Bom.vue   | 31 ++++++++++++++++---
 .../CustomerManage/CustomerAddress.vue        |  6 +++-
 .../basicData/CustomerManage/CustomerItem.vue | 14 +++++----
 .../views/basicData/WarehouseManage/Dock.vue  |  2 +-
 .../WarehouseManage/LocationGroup.vue         |  4 +--
 5 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/fe/PC/src/views/basicData/BomManage/Bom.vue b/fe/PC/src/views/basicData/BomManage/Bom.vue
index 727110da5..9124f64a2 100644
--- a/fe/PC/src/views/basicData/BomManage/Bom.vue
+++ b/fe/PC/src/views/basicData/BomManage/Bom.vue
@@ -38,6 +38,7 @@
       :Options="editOptions"
       :Handle="editHandle"
       :Rules="formReveal ? editRules.cerateRule : editRules.editRule"
+      @push="selectDataPush"
       @FormSubmit="FormSubmit"
       @close="FormClose"
       @goBack="goBack"
@@ -79,6 +80,7 @@ import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
+import { filterSelectMixins } from '@/mixins/filter-Select'
 export default {
   name: "Bom",
   mixins: [
@@ -87,6 +89,7 @@ export default {
     drawerMixins,
     TableHeaderMixins,
     mixins,
+    filterSelectMixins,
     newAndEdiDialogMixins
   ],
   computed: {
@@ -141,12 +144,17 @@ export default {
         distributionType: 1,
         truncType: 1,
         plannedSplitRule: 1,
-        concurrencyStamp: null
+        concurrencyStamp: null,
+        component: null
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "父物料号", prop: "product", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "子物料号", prop: 'component', validType:'numberLetter', colSpan: 12 },
+        { type: "filterSelect", label: "父物料号", prop: "product", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
+        { type: "filterSelect", label: "子物料号", prop: "component", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "子物料用量", prop: 'componentQty', colSpan: 12, validType:'pointNumber' },
         { type: "input", label: "子物料用量单位", prop: 'componentUom', colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
@@ -161,6 +169,7 @@ export default {
       ],
       editForm: [
         { type: "input", label: "父物料号", prop: "product",disabled:"true",  colSpan: 12 },
+        { type: "input", label: "子物料号", prop: 'component', disabled:"true", colSpan: 12 },
         { type: "input", label: "子物料用量", prop: 'componentQty', colSpan: 12, validType:'pointNumber' },
         { type: "input", label: "子物料用量单位", prop: 'componentUom', colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
@@ -175,7 +184,7 @@ export default {
       ],
       editRules: {
         cerateRule: {
-          componentQty: [{ required: true, message: '不可为空', type: "number", trigger: 'blur' },],
+          componentQty: [{ required: true, message: '不可为空', trigger: 'blur' },],
           componentUom: [{ required: true, message: '不可为空', trigger: 'blur' },],
           beginTime: [{ required: true, message: '不可为空', trigger: 'blur' },],
           endTime: [{ required: true, message: '不可为空', trigger: 'blur' },],
@@ -183,7 +192,7 @@ export default {
           component: [{ required: true, trigger: "blur", message: "不可为空" }],
         },
         editRule: {
-          componentQty: [{ required: true, message: '不可为空', type: "number", trigger: 'blur' },],
+          componentQty: [{ required: true, message: '不可为空', trigger: 'blur' },],
           componentUom: [{ required: true, message: '不可为空', trigger: 'blur' },],
           beginTime: [{ required: true, message: '不可为空', trigger: 'blur' },],
           endTime: [{ required: true, message: '不可为空', trigger: 'blur' },],
@@ -223,6 +232,18 @@ export default {
   mounted () {
     this.paging();
   },
+  methods: {
+    // input下拉框 其他赋值处理
+    selectDataPush(val) {
+      if (val[1].prop == "component") {
+        if (this.displayDialog.newDialog) {
+          this.CreateFormData.componentUom = val[0].basicUom
+        } else {
+          this.editFormData.componentUom = val[0].basicUom
+        }
+      }
+    },
+  }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue b/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
index 56255609b..01a2d9ad0 100644
--- a/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
+++ b/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
@@ -150,6 +150,8 @@ export default {
         warehouseCode: null,
         desc: null,
         concurrencyStamp: null,
+        code: null,
+        customerCode: null
       },
       editOptions: {},
       CreateForm: [
@@ -163,7 +165,7 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData,[
             {logic:"And",column:"type",action:"==",value:"10"}
           ]) }, colSpan: 12 },
-        { type: "input", label: "客户地址编号", prop: "code", colSpan: 12 },
+        { type: "input", label: "客户地址编号", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "客户地址名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "城市", prop: "city", colSpan: 12 },
         { type: "input", label: "地址", prop: "address", colSpan: 12 },
@@ -172,6 +174,7 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
+      { type: "input", label: "客户编号", prop: 'customerCode', disabled:"true", colSpan: 12 },
         { type: "filterSelect", label: "库位编号", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
             {logic:"And",column:"type",action:"==",value:"10"}
@@ -179,6 +182,7 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,[
             {logic:"And",column:"type",action:"==",value:"10"}
           ]) }, colSpan: 12 },
+        { type: "input", label: "客户地址编号", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "客户地址名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "城市", prop: "city", colSpan: 12 },
         { type: "input", label: "地址", prop: "address", colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue b/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
index acdc2f5e7..8eb23c27f 100644
--- a/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
+++ b/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
@@ -150,6 +150,7 @@ export default {
         beginTime: null,
         endTime: null,
         concurrencyStamp: null,
+        itemCode: null
       },
       editOptions: {
         reportGroupId: [],
@@ -163,8 +164,8 @@ export default {
         focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
         searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.CreateFormData) }, colSpan: 12 },
         
-        { type: "input", label: "客户物料代码", prop: "customerItemCode", colSpan: 12 },
-        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'pointNumber' },
+        { type: "input", label: "客户物料代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
         { type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         // { type: "rangeDateTime", label: "时间窗口", prop: "timeRange", startDate: "beginTime", endDate: "endTime", colSpan: 24 },
@@ -173,9 +174,10 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
+        { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "客户代码", prop: "customerCode", disabled:"true", colSpan: 12 },
-        { type: "input", label: "客户物料代码", prop: "customerItemCode", colSpan: 12 },
-        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'pointNumber' },
+        { type: "input", label: "客户物料代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
         { type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         // { type: "rangeDateTime", label: "时间窗口", prop: "timeRange", startDate: "beginTime", endDate: "endTime", colSpan: 24 },
@@ -188,7 +190,7 @@ export default {
           customerCode: [{ required: true, trigger: "change", message: "不可为空" }],
           itemCode: [{ required: true, trigger: "change", message: "不可为空" }],
           customerItemCode: [{ required: true, trigger: "change", message: "不可为空" }],
-          customerPackQty: [{ required: true, trigger: "blur", type: "number", message: "不可为空" }],
+          customerPackQty: [{ required: true, trigger: "blur", message: "不可为空" }],
           customerPackUom: [{ required: true, trigger: "blur", message: "不可为空" }],
           beginTime: [{ required: true, trigger: "blur", message: "不可为空" }],
           endTime: [{ required: true, trigger: "blur", message: "不可为空" }],
@@ -196,7 +198,7 @@ export default {
         editRule: {
           customerItemCode: [{ required: true, trigger: "blur", message: "不可为空" }],
           customerPackUom: [{ required: true, trigger: "blur", message: "不可为空" }],
-          customerPackQty: [{ required: true, trigger: "blur", type: "number", message: "不可为空" }],
+          customerPackQty: [{ required: true, trigger: "blur", message: "不可为空" }],
           beginTime: [{ required: true, trigger: "blur", message: "不可为空" }],
           endTime: [{ required: true, trigger: "blur", message: "不可为空" }],
         }
diff --git a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
index 324964ba5..aa44c5808 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
@@ -150,7 +150,7 @@ export default {
         { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "收货口编号", prop: "code", colSpan: 12 },
+        { type: "input", label: "收货口编号", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
index 6198c2ea7..762857846 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
@@ -282,13 +282,13 @@ export default {
             { required: true, trigger: "blur", message: "不可为空" },
           ],
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
-          // warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+          pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
         },
         editRule: {
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
-          // warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+          pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
         }
       },
     };