From 07627fede3b7cf66ea6ac89565390a54889ab9f4 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Tue, 11 Jun 2024 17:04:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base-data/point/index.vue         | 46 ++++++++++++++++++---
 src/views/business-data/asnDetail/index.vue | 42 ++++---------------
 2 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index 00787d0..d418c08 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -122,6 +122,25 @@
           <el-form-item label="名称">
             <el-input v-model="form.name" style="width: 370px;"/>
           </el-form-item>
+
+          <el-form-item label="高度">
+            <el-select
+              v-model="form.itemHeight"
+              clearable
+              size="small"
+              placeholder="高度"
+              class="filter-item"
+              style="width: 370px"
+            >
+              <el-option
+                v-for="item in dict.item_height"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="类型" prop="type">
             <el-select v-model="form.type" filterable placeholder="请选择" style="width: 370px;"
                        :default-first-option="true">
@@ -179,6 +198,11 @@
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="code" label="代码"/>
         <el-table-column prop="name" label="名称"/>
+        <el-table-column prop="itemHeight" label="高度">
+          <template slot-scope="scope">
+            {{ dict.label.item_height[scope.row.itemHeight] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="type" label="类型">
           <template slot-scope="scope">
             {{ dict.label.point_type[scope.row.type] }}
@@ -189,7 +213,6 @@
             {{ dict.label.use_status[scope.row.status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="description" label="存储类型"/>
         <el-table-column :show-overflow-tooltip="true" prop="areaName" label="库区">
           <template slot-scope="scope">
             <div>{{ scope.row.area.name }}</div>
@@ -230,22 +253,32 @@
 </template>
 
 <script>
-import crudPoint, {pointCallStock} from '@/api/point'
+import crudPoint from '@/api/point'
 import CRUD, {presenter, header, form, crud} from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
-import {getAres, getAresXl} from '@/api/area'
+import {getAres} from '@/api/area'
 import Treeselect from '@riophae/vue-treeselect'
 import {getToken} from "@/utils/auth";
-import DonMessage from "@/utils/message";
 import viewFullStockIn from '@/views/base-data/point/fullStockIn.vue';
 import viewFullStockOut from '@/views/base-data/point/fullStockOut.vue';
 import pointUrl from '@/api/point'
 import multiAdjust from "@/views/base-data/point/multiAdjust.vue";
 
-const defaultForm = {id: null, status: 'FREE', enabled: 1, code: null, name: null, description: null, area: null}
+const defaultForm = {
+  id: null,
+  status: 'FREE',
+  enabled: 1,
+  code: null,
+  name: null,
+  type: null,
+  dept: null,
+  description: null,
+  area: null,
+  itemHeight: null
+}
 export default {
   name: 'Point',
   components: {
@@ -253,7 +286,7 @@ export default {
     Treeselect, pagination, crudOperation, udOperation, rrOperation, viewFullStockIn, viewFullStockOut
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['base_staus', 'use_status', 'point_type', 'agv_on_off', 'smallArea'],
+  dicts: ['base_staus', 'use_status', 'point_type', 'agv_on_off', 'smallArea', 'item_height'],
   cruds() {
     return CRUD({
       title: '点位', url: 'api/point', idField: 'id', sort: 'id,desc', crudMethod: {...crudPoint},
@@ -419,6 +452,7 @@ export default {
     MultiAdjust() {
       this.$refs.multiAdjust.dialog = true;
     }
+
   }
 }
 </script>
diff --git a/src/views/business-data/asnDetail/index.vue b/src/views/business-data/asnDetail/index.vue
index 78371aa..73b0b0f 100644
--- a/src/views/business-data/asnDetail/index.vue
+++ b/src/views/business-data/asnDetail/index.vue
@@ -118,7 +118,7 @@
           size="mini"
           @click="doManLiao"
         >
-          满料入库
+          原材料入库
         </el-button>
       </crudOperation>
       <AsnTask ref="asnTask"/>
@@ -212,19 +212,10 @@
       </div>
     </el-dialog>
     <!--满料入库组件-->
-    <el-dialog :visible.sync="manliao" title="满料入库" width="400px" :before-close="doManLiaoCancel">
+    <el-dialog :visible.sync="manliao" title="原材料入库" width="400px" :before-close="doManLiaoCancel">
       <el-form ref="manLiaoform" :model="BindStock" :rules="manLiaoRules" size="small" label-width="80px">
-        <el-form-item label="物料" prop="itemCode">
-          <el-select v-model="BindStock.itemCode" @focus="getItem" value-key="id" filterable placeholder="请选择物料"
-                     style="width: 200px;">
-            <el-option
-              @click.native="WuLiaoClick(item.packNumber)"
-              v-for="item in items"
-              :key="item.id"
-              :label="item.code"
-              :value="item.code"
-            />
-          </el-select>
+        <el-form-item label="MO" prop="itemCode">
+          <el-input type="textarea" v-model="BindStock.itemCode" style="width: 200px;"/>
         </el-form-item>
         <el-form-item label="容器" prop="stockCode">
           <el-select v-model="BindStock.stockCode" @focus="getStock" value-key="id" filterable placeholder="请选择容器"
@@ -237,18 +228,10 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="库区" prop="KuQu">
-          <el-select v-model="BindStock.KuQu" style="width:200px" @change="getPointByArea(BindStock.KuQu)"
-                     placeholder="请选择库区">
-            <el-option
-              v-for="item in KuQuList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"></el-option>
-          </el-select>
-        </el-form-item>
+
         <el-form-item label="点位" prop="pointCode">
-          <el-select v-model="BindStock.pointCode" style="width:200px" placeholder="请选择点位">
+          <el-select v-model="BindStock.pointCode" @focus="getPointByArea" value-key="id" filterable style="width:200px"
+                     placeholder="请选择点位">
             <el-option
               v-for="item in pointList"
               :key="item.id"
@@ -375,13 +358,6 @@ export default {
       pointList: [],
       BindStock: {stockCode: null, itemCode: null, pointCode: null},
       KuQu: null,
-      KuQuList: [{
-        value: '1F满车产线',
-        label: '1F满车产线'
-      }, {
-        value: '2F满车产线',
-        label: '2F满车产线'
-      }],
       manliao: false,
       headers: {'Authorization': getToken()},
       radio3: '全部',
@@ -607,8 +583,8 @@ export default {
       this.$refs['manLiaoform'].resetFields();
     },
 
-    getPointByArea(areaName) {
-      queryPointList({areaName}).then(res => {
+    getPointByArea() {
+      queryPointList({areaName: '大小件入库区'}).then(res => {
         this.pointList = res
       })
     },