From b82aceaef6edfb97b0e7f49c2999f53fb2dfc67f Mon Sep 17 00:00:00 2001
From: "SERVERM-0FVHDNN\\Administrator" <942005050@qq.com>
Date: Thu, 30 Mar 2023 18:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tabsDesTions/index.js                |  2 +-
 .../views/basicData/WorkshopManage/WorkCenter.vue    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 33e55bbf3..cd2f31791 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -618,7 +618,7 @@ export const ProductionLineItem =  [
 export const WorkCenter =  [
   { label: "生产线编号", prop: "productionLineCode" },
   { label: "原料库位", prop: "rawLocation" },
-  { label: "成品编号", prop: "productLocation" },
+  { label: "成品库位", prop: "productLocation" },
   { label: "工作站编号", prop: "code" },
   { label: "工作站名称", prop: 'name' },
   { type: "filter", label: "类型", prop: "type", filters: "workCenterType" },
diff --git a/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue b/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue
index d13130273..b5fe0fcc3 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue
@@ -133,7 +133,7 @@ export default {
         description: null,
         type: 1,
         productionLineCode: null,
-        rawLocation: null,
+        rawLocationCode: null,
         productLocation: null,
         remark: null
       },
@@ -144,7 +144,7 @@ export default {
         description: null,
         type: 1,
         productionLineCode: null,
-        rawLocation: null,
+        rawLocationCode: null,
         productLocation: null,
         concurrencyStamp: null,
         remark: null
@@ -154,10 +154,10 @@ export default {
         { type: "filterSelect", label: "生产线编号", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "原料库位", prop: "rawLocation", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", 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: "filterSelect", label: "成品编号", prop: "productLocation", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "成品库位", prop: "productLocation", 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", validType:'numberLetter', colSpan: 12 },
@@ -170,10 +170,10 @@ export default {
         { type: "filterSelect", label: "生产线编号", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.editFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "原料库位", prop: "rawLocation", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "成品编号", prop: "productLocation", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "工作站编号", prop: "code", validType:'numberLetter', colSpan: 12 },