From 3ad96630cf2fb9e615201c663e3bde7f127a13cb Mon Sep 17 00:00:00 2001
From: FOAM <491460741@qq.com>
Date: Fri, 13 Sep 2024 13:52:43 +0800
Subject: [PATCH] no message

---
 src/views/base-data/area/index.vue  | 54 +++--------------------------
 src/views/base-data/point/index.vue |  6 ++--
 2 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/src/views/base-data/area/index.vue b/src/views/base-data/area/index.vue
index 6729b61..5d1a7e9 100644
--- a/src/views/base-data/area/index.vue
+++ b/src/views/base-data/area/index.vue
@@ -47,28 +47,7 @@
           <el-form-item label="库区名称" prop="name">
             <el-input v-model="form.name" style="width: 370px;"/>
           </el-form-item>
-          <el-form-item label="排序号" prop="name">
-            <el-input v-model="form.posX" style="width: 370px;"/>
-          </el-form-item>
-          <el-form-item label="接收工厂" >
-            <!--            <el-input v-model="form.workingStation" style="width: 370px;" />-->
-            <el-select v-model="form.gcCode" filterable  placeholder="请选择" clearable>
-              <el-option
-                v-for="item in this.dict.factory"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="描述">
-            <el-input v-model="form.description" style="width: 370px;"/>
-          </el-form-item>
-          <el-form-item label="接收担当">
-            <el-input v-model="form.shdd" style="width: 370px;"/>
-          </el-form-item>
-          <el-form-item label="所属工位">
+          <el-form-item label="属性">
             <!--            <el-input v-model="form.workingStation" style="width: 370px;" />-->
             <el-select v-model="form.workingStation" filterable  placeholder="请选择" clearable>
               <el-option
@@ -80,12 +59,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-
-          <div style="text-align: center;width: 100%;height: 30px;font-weight :bold">
-            <el-checkbox label="线边接收" style="font-weight :bold" v-model="form.bexb"></el-checkbox>
-            <el-checkbox label="收货仓库" style="font-weight :bold" v-model="form.besh"></el-checkbox>
-            <el-checkbox label="制造库位耗用" style="font-weight :bold" v-model="form.bezz"></el-checkbox>
-          </div>
+          <el-form-item label="描述" prop="description">
+            <el-input v-model="form.description" style="width: 370px;"/>
+          </el-form-item>
 
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -100,32 +76,12 @@
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="code" label="库区编号" width="80px" align="center"/>
         <el-table-column prop="name" label="库区名称" width="150px" align="center"/>
-        <el-table-column prop="station_type#workingStation" label="指示纳所"  width="150px">
+        <el-table-column prop="station_type#workingStation" label="库区属性"  width="150px">
           <template slot-scope="scope">
             {{ dict.label.station_type[scope.row.workingStation] }}
           </template>
         </el-table-column>
-        <el-table-column prop="pointCode" label="缓存库位"/>
-        <el-table-column prop="posX" label="排序号">
-        </el-table-column>
-        <el-table-column prop="gcCode" label="接收工厂"/>
-        <el-table-column prop="shdd" label="接收担当"/>
         <el-table-column prop="description" label="描述"/>
-        <el-table-column prop="bexb" label="线边接收">
-          <template slot-scope="scope">
-            {{ scope.row.bexb ? '是' : '否' }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="besh" label="收货仓库">
-          <template slot-scope="scope">
-            {{ scope.row.besh ? '是' : '否' }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="bezz" width="120px" label="制造库位耗用">
-          <template slot-scope="scope">
-            {{ scope.row.bezz ? '是' : '否' }}
-          </template>
-        </el-table-column>
         <el-table-column prop="enabled" label="启用">
           <template slot-scope="scope">
             <el-switch
diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index 78f7020..52ed840 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -83,7 +83,7 @@
           <el-form-item label="名称">
             <el-input v-model="form.name" style="width: 370px;"/>
           </el-form-item>
-          <el-form-item label="类型" prop="type">
+          <el-form-item label="属性" prop="type">
             <el-select v-model="form.type" filterable placeholder="请选择" style="width: 370px;"
                        :default-first-option="true"
             >
@@ -130,7 +130,7 @@
         </el-table-column>
         <el-table-column prop="code" label="代码"/>
         <el-table-column prop="name" label="名称"/>
-        <el-table-column prop="point_type#type" label="类型">
+        <el-table-column prop="point_type#type" label="属性">
           <template slot-scope="scope">
             {{ dict.label.point_type[scope.row.type] }}
           </template>
@@ -264,7 +264,7 @@ export default {
           { required: true, message: '代码不能为空', trigger: 'blur' }
         ],
         type: [
-          { required: true, message: '类型不能为空', trigger: 'blur' }
+          { required: true, message: '属性不能为空', trigger: 'blur' }
         ],
         area: [
           { required: true, message: '库区不能为空', trigger: 'blur' }