From aa116eeff69a26889b98f9986f0d360346e124c3 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Mon, 11 Sep 2023 15:04:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=99=90=E5=88=B6=E8=B4=A7=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicdata/basicdataGoodsArea.js       | 11 +++++++
 .../goodsShelf/basicdataGoodsShelf.vue        | 32 +++++++++++--------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/api/basicdata/basicdataGoodsArea.js b/src/api/basicdata/basicdataGoodsArea.js
index ff2aa322..b5c5e63d 100644
--- a/src/api/basicdata/basicdataGoodsArea.js
+++ b/src/api/basicdata/basicdataGoodsArea.js
@@ -128,6 +128,17 @@ export const getGoodsAreaNodeList = () => {
     method: 'get',
   })
 }
+/**
+ * 货区列表信息
+ * @param id 仓库ID
+ * @returns {AxiosPromise}
+ */
+export const getGoodsAreaoptionList = () => {
+  return request({
+    url: '/api/logpm-basicdata/goodsArea/getAreaoption',
+    method: 'get',
+  })
+}
 
 /**
  * 查询当前登录人所能操作的备货区
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index e0faca26..cb294023 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -124,26 +124,26 @@
             </el-col>
             <el-col :span="12" v-if="allocation">
               <el-form-item label="列 数:" prop="rowNum"  label-width="100px">
-                <el-input v-model="form.rowNum" placeholder="请输入货架层数"  style="width: 88%;"/>
+                <el-input v-model="form.rowNum" placeholder="请输入货架列数"  style="width: 88%;"/>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="allocation">
               <el-form-item label="层 数:" prop="storeyNum"  label-width="100px">
-                <el-input v-model="form.storeyNum" placeholder="请输入货架列数"  style="width: 88%;"/>
+                <el-input v-model="form.storeyNum" placeholder="请输入货架层数"  style="width: 88%;"/>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="!allocation">
               <el-form-item label="货  区:" prop="goodsAreaId"  label-width="100px">
-                  <el-cascader :options="optioner"  style="width: 80%"  v-model="form.goodsAreaId"   placeholder="请选择货区" :show-all-levels="false"  clearable />
+<!--                  <el-cascader :options="optioner"  style="width: 80%"  v-model="form.goodsAreaId"   placeholder="请选择货区" :show-all-levels="false"  clearable />-->
 
-                  <!--                <el-select v-model="form.goodsAreaId" clearable  placeholder="请选择货区" style="width: 88%;">-->
-<!--                  <el-option-->
-<!--                    v-for="item in optioner"-->
-<!--                    :key="item.id"-->
-<!--                    :label="item.headline"-->
-<!--                    :value="item.id">-->
-<!--                  </el-option>-->
-<!--                </el-select>-->
+                                  <el-select v-model="form.goodsAreaId" clearable  placeholder="请选择货区" style="width: 88%;">
+                  <el-option
+                    v-for="item in areaoption"
+                    :key="item.id"
+                    :label="item.headline"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <!--            <el-col :span="12">-->
@@ -319,11 +319,11 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,addAllocation,disable,enable,addlayer } from "@/api/basicdata/basicdataGoodsShelf";
+import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,addAllocation,disable,enable,addlayer, } from "@/api/basicdata/basicdataGoodsShelf";
 import {getList as allgetList,update as allupdate,getPrintTemplate} from "@/api/basicdata/basicdataGoodsAllocation";
 import option from "@/option/basicdata/basicdataGoodsShelf";
 import { mapGetters } from "vuex";
-import {  getGoodsAreaNodeList } from '@/api/basicdata/basicdataGoodsArea';
+import {  getGoodsAreaNodeList,getGoodsAreaoptionList } from '@/api/basicdata/basicdataGoodsArea';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getTemplateData} from '@/api/basic/basicPrintTemplate'
 import { getLodop } from '@/utils/LodopFuncs.js'
@@ -687,6 +687,8 @@ export default {
       goodsAreaList: [],
       //级联选择器列表数据
       optioner: [],
+      //不需要级联,直接选择货区
+      areaoption:[],
       dialogVisible:false,
       //二维码展示列表
       qrCodeObj:[],
@@ -763,6 +765,10 @@ export default {
         const data = this.formatCascaderData(res.data.data);
         this.optioner = data
       })
+      getGoodsAreaoptionList().then(res=>{
+        const data = res.data.data;
+        this.areaoption = data
+      })
       getTemplateData("9").then(res=>{
         console.log(res.data.data);
         let data = res.data.data