From de600815e15124be106782e086929686d1c6b421 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Wed, 23 Aug 2023 21:23:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicdata/basicdataGoodsAllocation.js |   2 +-
 src/api/basicdata/basicdataGoodsShelfView.ts  |  12 +-
 .../goodsShelf/basicdataGoodsShelf.vue        |  53 +++----
 .../goodsShelf/basicdataGoodsShelfView.vue    |   5 +-
 .../warehouse/tray/basicdataTrayedt.vue       | 139 +-----------------
 5 files changed, 46 insertions(+), 165 deletions(-)

diff --git a/src/api/basicdata/basicdataGoodsAllocation.js b/src/api/basicdata/basicdataGoodsAllocation.js
index de7ce74a..7d8157ef 100644
--- a/src/api/basicdata/basicdataGoodsAllocation.js
+++ b/src/api/basicdata/basicdataGoodsAllocation.js
@@ -51,7 +51,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/logpm-basicdata/goodsAllocation/update',
+    url: '/api/logpm-warehouse/goodsAllocation/update',
     method: 'post',
     data: row
   })
diff --git a/src/api/basicdata/basicdataGoodsShelfView.ts b/src/api/basicdata/basicdataGoodsShelfView.ts
index 0ab62554..4a6ca74e 100644
--- a/src/api/basicdata/basicdataGoodsShelfView.ts
+++ b/src/api/basicdata/basicdataGoodsShelfView.ts
@@ -28,17 +28,17 @@ export function getstoreCargo(params): Promise<AxiosResponse<VisualizationRespon
     }
   })
 }
-/**  
+/**
  * 更新货位状态
  */
 export function updategood(data): Promise<AxiosResponse<VisualizationResponseData>>{
   return request({
-    url: '/api/logpm-basicdata/goodsAllocation/update',
+    url: '/api/logpm-warehouse/warehouseGoodsAllocation/update',
     method: 'post',
     data
   })
 }
-/**  
+/**
  * 货位统计数据
  */
 export function Alloclocationsnub(): Promise<AxiosResponse<VisualizationResponseData>>{
@@ -47,7 +47,7 @@ export function Alloclocationsnub(): Promise<AxiosResponse<VisualizationResponse
     method: 'get',
   })
 }
-/**  
+/**
  * 货位统计数据
  */
 export function geturl(name,params): Promise<AxiosResponse<VisualizationResponseData>>{
@@ -57,7 +57,7 @@ export function geturl(name,params): Promise<AxiosResponse<VisualizationResponse
     params
   })
 }
-/**  
+/**
  * 货位上架
  */
 export function posturl(name,data): Promise<AxiosResponse<VisualizationResponseData>>{
@@ -66,4 +66,4 @@ export function posturl(name,data): Promise<AxiosResponse<VisualizationResponseD
     method: 'post',
     data
   })
-}
\ No newline at end of file
+}
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index 99abf0fe..b09f2cda 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -10,34 +10,34 @@
               <el-col >
                 <el-form-item label="货区:" prop="info" >
 <!--                  <el-cascader :options="optioner"   :show-all-levels="false" clearable >-->
-                    <el-cascader :options="optioner"  style="width: 80%"  v-model="query.goodsAreaInfo"   placeholder="请选择货区" :show-all-levels="false" />
+                    <el-cascader :options="optioner"  style="width: 80%"  v-model="query.goodsAreaInfo"   placeholder="请选择货区" :show-all-levels="false"  clearable />
 <!--                  </el-cascader>-->
                 </el-form-item>
                 <el-form-item label="货架名称" prop="info" >
                   <el-input v-model="query.goodsShelfName" placeholder="请输入货架名称"/>
                 </el-form-item>
-                <el-form-item label="货架状态:" prop="areaStatus">
-                  <!--            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
-                  <el-select v-model="query.goodsShelfStatus" clearable  placeholder="请选择货架状态" style="width: 80%;">
-                    <el-option
-                      v-for="item in goodsShelfStatusData"
-                      :key="item.dictKey"
-                      :label="item.dictValue"
-                      :value="item.dictKey">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="启用状态:" prop="areaStatus">
-                  <!--            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
-                  <el-select v-model="query.enableStatus" clearable  placeholder="请选择启用状态" style="width: 80%;">
-                    <el-option
-                      v-for="item in enableStatusData"
-                      :key="item.dictKey"
-                      :label="item.dictValue"
-                      :value="item.dictKey">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
+<!--                <el-form-item label="货架状态:" prop="areaStatus">-->
+<!--                  &lt;!&ndash;            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>&ndash;&gt;-->
+<!--                  <el-select v-model="query.goodsShelfStatus" clearable  placeholder="请选择货架状态" style="width: 80%;">-->
+<!--                    <el-option-->
+<!--                      v-for="item in goodsShelfStatusData"-->
+<!--                      :key="item.dictKey"-->
+<!--                      :label="item.dictValue"-->
+<!--                      :value="item.dictKey">-->
+<!--                    </el-option>-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="启用状态:" prop="areaStatus">-->
+<!--                  &lt;!&ndash;            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>&ndash;&gt;-->
+<!--                  <el-select v-model="query.enableStatus" clearable  placeholder="请选择启用状态" style="width: 80%;">-->
+<!--                    <el-option-->
+<!--                      v-for="item in enableStatusData"-->
+<!--                      :key="item.dictKey"-->
+<!--                      :label="item.dictValue"-->
+<!--                      :value="item.dictKey">-->
+<!--                    </el-option>-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
                 <el-button type="primary" icon="el-icon-search" @click="searchChange" >搜 索</el-button>
                 <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
               </el-col>
@@ -618,9 +618,10 @@ export default {
         this.goodsShelfStatusData = res.data.data;
       });
       getGoodsAreaNodeList().then(res=>{
+        const data = this.formatCascaderData(res.data.data);
+        console.log("data>>>>>>>>>>>>>>",data);
+        this.optioner = data
 
-        const data = res.data.data
-        this.optioner = this.formatCascaderData(data);
 
         console.log(">>>>>>>>>>>>>>>>optioner",this.optioner);
       })
@@ -636,7 +637,7 @@ export default {
       for (var i = 0; i < data.length; i++) {
         if (null==data[i].children ||data[i].children.length < 1) {
           // children若为空数组，则将children设为undefined
-          delete data[i].children;
+          delete data[i].leaf;
         } else {
           // children若不为空数组，则继续 递归调用 本方法
           this.formatCascaderData(data[i].children)
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index b68bb287..c0e71898 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -1,3 +1,6 @@
+
+
+
 <template>
   <div class="head_top">
     <div>
@@ -471,7 +474,7 @@ const addhuoj = async scope => {
     url='upService'
     data.upShelfOrderList=[scope.row]
       break;
-  
+
     default:
       break;
   }
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
index 5e44efd4..ba25fba9 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -249,8 +249,8 @@ export default {
             width:"100px"
           },
           {
-            label: "货位信息",
-            prop: "goodsAllocationName",
+            label: "所在库位",
+            prop: "positionCode",
             search: true,
             width:"100px"
           },
@@ -269,130 +269,7 @@ export default {
         ]
       },
 
-      // 表单配置
-      signoption: {
-        height:'auto',
-        width:'40px',
-        calcHeight: 30,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        viewBtn: true,
-        dialogClickModal: false,
-        emptyBtn: false, //隐藏清空按钮
-        submitBtn: false, //隐藏提交按钮
-        column: [
-          {
-            label: "收货人姓名",
-            labelWidth:'150',
-            span:11,
-            prop: "consignee",
-            type: "input",
-            width:"150px",
-            align:'center',
-            disabled:true,
-            // rules: [{
-            //   required: true,
-            //   message: "输入承运商编号",
-            //   trigger: "blur"
-            // }],
-          },
-          {
-            label: "收货人电话",
-            prop: "deliveryPhone",
-            labelWidth:'150',
-            span:11,
-            type: "input",
-            width:"150px",
-            align:'center',
-            disabled:true,
-          },
-          {
-            label: "收货地址",
-            prop: "deliveryAddress",
-            labelWidth:'150',
-            span:11,
-            type: "input",
-            width:"150px",
-            align:'center',
-            disabled:true,
-          },
-          {
-            label: "签收类型",
-            prop: "signingType",
-            labelWidth:'150',
-            span:11,
-            type: "radio",
-            width:"150px",
-            align:'center',
-            disabled:false,
-            dicData: [
-              {
-                label: '签收',
-                value: '1',
-              },
-              {
-                label: '代签收',
-                value: '2',
-              }
-            ],
-          },
-          {
-            label: "签收图片",
-            prop: "deliverySignPictures",
-            labelWidth:'150',
-            type: 'upload',
-            listType: 'picture-card',
-            width:"150px",
-            span:15,
-            multiple:true,
-            align:'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            limit: 5,
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-            disabled:false,
-          },
-          // {
-          //   label: "复核图片",
-          //   prop: "clerkSignPictures",
-          //   type: 'upload',
-          //   listType: 'picture-card',
-          //   dataType: 'string',
-          //   labelWidth:'150',
-          //   span:15,
-          //   multiple:true,
-          //   width:"200px",
-          //   align:'left',
-          //   action: '/blade-resource/oss/endpoint/put-file',
-          //   limit: 15,
-          //   propsHttp: {
-          //     res: 'data',
-          //     url: 'link',
-          //   },
-          //   rules: [{
-          //     required: true,
-          //     message: "请上传图片",
-          //     trigger: "blur"
-          //   }],
-          // },
 
-          {
-            label: "备注",
-            prop: "clerkSignRemarks",
-            labelWidth:'150',
-            span:15,
-            type: "input",
-            width:"150px",
-            align:'center',
-          },
-
-        ]
-      },
 
 
       // 表单配置
@@ -462,8 +339,8 @@ export default {
           //   width:"100px"
           // },
           {
-            label: "库位名称",
-            prop: "goodsAllocationName",
+            label: "所在库位",
+            prop: "positionCode",
             width:"100px"
           },
           {
@@ -535,8 +412,8 @@ export default {
             width:"100px"
           },
           {
-            label: "库位名称",
-            prop: "goodsAllocationName",
+            label: "所在库位",
+            prop: "positionCode",
             width:"100px"
           },
           {
@@ -601,8 +478,8 @@ export default {
             width:"100px"
           },
           {
-            label: "货位信息",
-            prop: "goodsAllocation",
+            label: "所在货位",
+            prop: "positionCode",
             search: true,
             width:"100px"
           },