From 1358c39b2bd4aa19f70f03d94be4311a9194e957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 7 Nov 2023 14:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=8C=BA=E5=90=8D=E7=A7=B0=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    | 117 +-----------------
 src/utils/disposition/formFields.ts           |  14 +--
 src/utils/disposition/tableColumns.ts         |   6 +-
 .../locationgroup/locationgroup.data.ts       |   4 +-
 4 files changed, 13 insertions(+), 128 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index ab4d476cd..c893fa868 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -7,121 +7,7 @@
       :schema="formSchema" 
       :is-col="true"
       @opensearchTable="opensearchTable"
-      >
-      <!-- <template #productItemCode="form">
-        <slot name="productItemCode" :param="form"></slot>
-      </template> -->
-      <!-- <template #itemCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'itemCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['itemCode']" :placeholder="'请选择物料代码'" @click="opensearchTable('itemCode', 'code')" />
-        </div>
-      </template>
-      <template #productItemCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'productItemCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['productItemCode']" :placeholder="'请选择物料代码'" @click="opensearchTable('productItemCode', 'code')" />
-        </div>
-      </template>
-      <template #componentItemCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'componentItemCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['componentItemCode']" :placeholder="'请选择物料代码'" @click="opensearchTable('componentItemCode', 'code')" />
-        </div>
-      </template>
-      <template #supplierCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'supplierCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['supplierCode']" :placeholder="'请选择供应商代码'" @click="opensearchTable('supplierCode', 'code')" />
-        </div>
-      </template>
-      <template #productionLineCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'productionLineCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['productionLineCode']" :placeholder="'请选择生产线代码'" @click="opensearchTable('productionLineCode', 'code')" />
-        </div>
-      </template>
-      <template #fgLocationCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'fgLocationCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['fgLocationCode']" :placeholder="'请选择库位代码'" @click="opensearchTable('fgLocationCode', 'code')" />
-        </div>
-      </template>
-      <template #defaultWarehouseCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'defaultWarehouseCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['defaultWarehouseCode']" :placeholder="'请选择仓库代码'" @click="opensearchTable('defaultWarehouseCode', 'code')" />
-        </div>
-      </template>
-      <template #defaultLocationCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'defaultLocationCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['defaultLocationCode']" :placeholder="'请选择库位代码'" @click="opensearchTable('defaultLocationCode', 'code')" />
-        </div>
-      </template>
-      <template #customerCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'customerCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['customerCode']" :placeholder="'请选择客户代码'" @click="opensearchTable('customerCode', 'code')" />
-        </div>
-      </template>
-      <template #warehouseCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'warehouseCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['warehouseCode']" :placeholder="'请选择仓库代码'" @click="opensearchTable('warehouseCode', 'code')" />
-        </div>
-      </template>
-      <template #areaCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'areaCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['areaCode']" :placeholder="'请选择库区代码'" @click="opensearchTable('areaCode', 'code')" />
-        </div>
-      </template>
-      <template #locationGroupCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'locationGroupCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['locationGroupCode']" :placeholder="'请选择库位组代码'" @click="opensearchTable('locationGroupCode', 'code')" />
-        </div>
-      </template>
-      <template #rawLocationCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'rawLocationCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['rawLocationCode']" :placeholder="'请选择库位代码'" @click="opensearchTable('rawLocationCode', 'code')" />
-        </div>
-      </template>
-      <template #workshopCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'workshopCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['workshopCode']" :placeholder="'请选择车间代码'" @click="opensearchTable('workshopCode', 'code')" />
-        </div>
-      </template>
-      <template #outAreaCodes="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'outAreaCodes'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['outAreaCodes']" :placeholder="'请选择库区代码'" @click="opensearchTable('outAreaCodes', 'code')" />
-        </div>
-      </template>
-      <template #inAreaCodes="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'inAreaCodes'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['inAreaCodes']" :placeholder="'请选择库区代码'" @click="opensearchTable('inAreaCodes', 'code')" />
-        </div>
-      </template>
-      <template #customercode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'customercode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['customercode']" :placeholder="'请选择客户代码'" @click="opensearchTable('customercode', 'code')" />
-        </div>
-      </template>
-      <template #itemcode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'itemcode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['itemcode']" :placeholder="'请选择物料代码'" @click="opensearchTable('itemcode', 'code')" />
-        </div>
-      </template>
-      <template #asnNumber="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'asnNumber'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['asnNumber']" :placeholder="'请选择发货单号'" @click="opensearchTable('asnNumber', 'asnNumber')" />
-        </div>
-      </template>
-            <template #poNumber="form" v-if="props.searchTableParams?.find((item: any) => (item.formField == 'poNumber'))">
-          <div class="w-[100%] flex">
-            <el-input v-model="form['poNumber']" :placeholder="'请选择发货单号'" @click="opensearchTable('poNumber', 'poNumber')" />
-          </div>
-        </template>
-        <template #toDockCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'toDockCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['toDockCode']" :placeholder="'请选择到月台代码'" @click="opensearchTable('toDockCode', 'code')" />
-        </div>
-      </template>
-      <template #carrierCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'asnNumber'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['carrierCode']" :placeholder="'请选择承运商代码'" @click="opensearchTable('carrierCode', 'code')" />
-        </div>
-      </template> -->
-    </Form>
+    />
     <div class="table" v-if="isBusiness && formType == 'create'">
       <TableForm ref="tableFormRef" 
         class="w-[100%]" 
@@ -149,7 +35,6 @@ import { SearchTable } from '@/components/SearchTable';
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 import TableForm from '@/components/TableForm/src/TableForm.vue'
-import { string } from 'vue-types';
 
 const props = defineProps({
   // 校验rules 
diff --git a/src/utils/disposition/formFields.ts b/src/utils/disposition/formFields.ts
index a98d5adcc..f6b64fb24 100644
--- a/src/utils/disposition/formFields.ts
+++ b/src/utils/disposition/formFields.ts
@@ -247,11 +247,11 @@
   ]
 
 /**
- * @returns {Array}  区域
+ * @returns {Array}  库区
  */
  export const Area =  [
-    { label: "区域代码", prop: "code", },
-    { label: "区域名称", prop: 'name', },
+    { label: "库区代码", prop: "code", },
+    { label: "库区名称", prop: 'name', },
     { type: "filter", label: "是否功能区", prop: "isFunctional", filters: "whetherOrNot" },
     { type: "filter", label: "类型", prop: "areaType", filters: "areaType" },
     { label: "描述", prop: "description", },
@@ -262,7 +262,7 @@
  * @returns {Array}  库位组
  */
  export const LocationGroup =  [
-  { label: "区域代码", prop: "areaCode", },
+  { label: "库区代码", prop: "areaCode", },
   { type: "filter", label: "类型", prop: "groupType", filters: "locationType", },
   { type: "filter", label: "状态", prop: "defaultInventoryStatus", filters: "inventoryStage", },
   { label: "拣料优先级", prop: "pickPriority", },
@@ -303,7 +303,7 @@
  export const Location =  [
   { label: "库位代码", prop: "code", },
   { label: "库位名称", prop: "name", },
-  { label: "区域代码", prop: "areaCode", },
+  { label: "库区代码", prop: "areaCode", },
   { label: "库位组代码", prop: "locationGroupCode", },
   { label: "工作组代码", prop: "workGroupCode", },
   { type: "object", label: "库位数量", prop: "qty", showProp: "qty", },
@@ -1093,7 +1093,7 @@ export const InventoryTransferLogHegeZBuHeGe = [
   { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
   { type: "object", label: "仓库编号", prop: "location", showProp: "warehouse" },
   { type: "object", label: "库位组编号", prop: "location", showProp: "group" },
-  { type: "object", label: "区域编号", prop: "location", showProp: "area" },
+  { type: "object", label: "库区代码", prop: "location", showProp: "area" },
   { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
   { type: "filter", filters: "taskStatus", label: "状态", prop: "status", },
   { type: "dateTime", label: "创建时间", prop: "creationTime", },
@@ -1116,7 +1116,7 @@ export const InventoryTransferLogHegeZBuHeGe = [
   { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
   { type: "object", label: "仓库编号", prop: "location", showProp: "warehouse" },
   { type: "object", label: "库位组编号", prop: "location", showProp: "group" },
-  { type: "object", label: "区域编号", prop: "location", showProp: "area" },
+  { type: "object", label: "库区代码", prop: "location", showProp: "area" },
   { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
   { type: "filter", filters: "taskStatus", label: "状态", prop: "status", },
   { type: "dateTime", label: "创建时间", prop: "creationTime", },
diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts
index ffe3e4889..c060f8ac5 100644
--- a/src/utils/disposition/tableColumns.ts
+++ b/src/utils/disposition/tableColumns.ts
@@ -3462,7 +3462,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '区域代码',
+    label: '库区代码',
     field: 'areaCode',
     sort: 'custom',
     table: {
@@ -3585,7 +3585,7 @@ export const LocationgroupRules = reactive({
     { required: true, message: '请输入仓库代码', trigger: 'blur' }
   ],
   areaCode: [
-    { required: true, message: '请输入区域代码', trigger: 'blur' }
+    { required: true, message: '请输入库区代码', trigger: 'blur' }
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
@@ -3622,7 +3622,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '区域代码',
+    label: '库区代码',
     field: 'areaCode',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
index 6ae1e1a31..9170416fd 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
@@ -53,7 +53,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '区域代码',
+    label: '库区代码',
     field: 'areaCode',
     sort: 'custom',
     table: {
@@ -194,7 +194,7 @@ export const LocationgroupRules = reactive({
     { required: true, message: '请输入仓库代码', trigger: 'blur' }
   ],
   areaCode: [
-    { required: true, message: '请输入区域代码', trigger: 'blur' }
+    { required: true, message: '请输入库区代码', trigger: 'blur' }
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }