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/api/distribution/disStockListDetail.js b/src/api/distribution/disStockListDetail.js
index a2d7ac7b..86b163f6 100644
--- a/src/api/distribution/disStockListDetail.js
+++ b/src/api/distribution/disStockListDetail.js
@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockListDetail/list',
+    url: '/api/logpm-distribution/disStockListDetail/list',
     method: 'get',
     params: {
       ...params,
@@ -12,9 +12,19 @@ export const getList = (current, size, params) => {
   })
 }
 
+export const getDisStockList = (params) => {
+  return request({
+    url: '/api/logpm-distribution/disStockListDetail/disStockList',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockListDetail/detail',
+    url: '/api/logpm-distribution/disStockListDetail/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +34,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockListDetail/remove',
+    url: '/api/logpm-distribution/disStockListDetail/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +44,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockListDetail/submit',
+    url: '/api/logpm-distribution/disStockListDetail/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +52,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockListDetail/submit',
+    url: '/api/logpm-distribution/disStockListDetail/submit',
     method: 'post',
     data: row
   })
diff --git a/src/api/distribution/disStockOrdercodeReco.js b/src/api/distribution/disStockOrdercodeReco.js
index b754d8cd..3773709d 100644
--- a/src/api/distribution/disStockOrdercodeReco.js
+++ b/src/api/distribution/disStockOrdercodeReco.js
@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockOrdercodeReco/list',
+    url: '/api/logpm-distribution/disStockOrdercodeReco/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getDetail = (id) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockOrdercodeReco/detail',
+    url: '/api/logpm-distribution/disStockOrdercodeReco/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +24,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockOrdercodeReco/remove',
+    url: '/api/logpm-distribution/disStockOrdercodeReco/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +34,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockOrdercodeReco/submit',
+    url: '/api/logpm-distribution/disStockOrdercodeReco/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +42,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockOrdercodeReco/submit',
+    url: '/api/logpm-distribution/disStockOrdercodeReco/submit',
     method: 'post',
     data: row
   })
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
diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue
index 9418251a..bb8d493b 100644
--- a/src/views/distribution/stockup/distributionStockupDetails.vue
+++ b/src/views/distribution/stockup/distributionStockupDetails.vue
@@ -83,6 +83,8 @@
         >
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" v-if="!slotProps.scope.row.stockupStatus" @click="handleStockUp(slotProps.scope.row,'2')">备货</el-text>
+            <el-button type="primary" text icon="el-icon-view"  @click="handleQRCode(row)">查看包条码</el-button>
+
           </template>
         </tablecmt>
 
@@ -112,7 +114,8 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" v-if="!row.stockupStatus" @click="handleStockUp(slotProps.scope.row,'2')">备货</el-text>
+            <el-text type="primary" text icon="el-icon-view"  @click="handleDetail(slotProps.scope.row)">明细</el-text>
+
           </template>
         </tablecmt>
 
@@ -133,6 +136,36 @@
         </el-tabs>
 
       </el-row>
+      <el-dialog title="包条码" :visible.sync="dialogPack" width="780px" v-model="dialogPack">
+        <div >
+          <span>lmy 666</span>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="dialogPack = false">确 定</el-button>
+          <el-button @click="dialogPack = false">取 消</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
+        <div>
+          <div v-html="html"></div>
+
+          <!-- <div v-for="(item,index) in qrCodeObj">
+            <el-row>
+              <el-col :span="24" >
+                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+              </el-col>
+            </el-row>
+          </div> -->
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+        </span>
+      </el-dialog>
       <el-dialog v-model="dialogHand" title="系统备货">
         <el-form :model="form">
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
@@ -214,10 +247,16 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import { getParcelListOwn } from '@/api/distribution/distributionParcelList';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getStockDetail } from '@/api/distribution/distributionStock';
+import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
+import { getLodop } from '@/utils/LodopFuncs';
+import dayjs from 'dayjs';
 
 export default {
   data () {
     return {
+      dialogVisible:false,
+      dialogPack:false,
+      html:'',
       columnListarrs:{
       columnReservation:[
         {
@@ -663,6 +702,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '230',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+
       ],
       },
       height: 0,
@@ -770,6 +820,135 @@ export default {
     }
   },
   methods: {
+    //查看库存品明细
+    handleDetail(row){
+      console.log("row>><><><",row);
+      this.dialogPack = true;
+
+    },
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr,type) {
+      // console.log(newarr,'+++++++++++')
+      if(type==1){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
+      }else if(type==2){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
+      }else if(type==3){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+      }
+
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+      // if(row.prop =='typeServiceName'){
+      //   this.query['typeService'] = index;
+      // }else if(row.prop =='stockupStatusName'){
+      //   this.query["stockupStatus"] = index;
+      // }else if(row.prop =='assignStatusName'){
+      //   this.query["assignStatus"] = index;
+      // }else{
+      //   this.query[row.prop] = index;
+      // }
+      // // this.query[row.prop] = index;
+      // this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+      if (!!index){
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] =  index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+      /*      if(row.prop =='typeServiceName'){
+              this.query['typeService'] = index;
+            }else if(row.prop =='stockupStatusName'){
+              this.query["stockupStatus"] = index;
+            }else if(row.prop =='assignStatusName'){
+              this.query["assignStatus"] = index;
+            }else{
+             this.query[row.prop] = index;
+             }*/
+      this.query[row.prop] = index;
+
+      this.onLoad(this.page);
+    },
+    //打印
+    printTemplate() {
+      let LODOP = getLodop();
+      console.log("LODOP>>>>>",LODOP);
+      // console.log("this.ids>>>>>",this.selectionList);
+      // if (this.selectionList.length === 0){
+      //   this.$message.warning("请选择至少一条数据");
+      //   return;
+      // }
+      getStockTemplate({ id: this.materialQRCode.id }).then(res => {
+        console.log('返回的数据', res.data.data);
+        let templateData = res.data.data;
+        // let templateData = "res.data.data";
+        // console.log(templateData);
+        LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
+        LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
+        LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开
+        // // 设置打印整宽且不变形
+        LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
+        // // 设置打印后自动关闭
+        LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
+        // // data就是一段html文本
+        LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
+        // LODOP.PREVIEW(); //预览(预览打印无脚标)
+        LODOP.PRINT(); //直接打印
+
+      });
+    },
+    //查看包条码
+    handleQRCode(row) {
+      // this.title = '查看'
+      // this.view = true;
+      // this.box = true;
+      this.materialQRCode = row;
+
+      let qr = {
+        ids: row.id,
+      };
+      showOrderPackgeCode(qr).then(res => {
+        // this.orderPackageCode = res.data
+        console.log(res.data);
+        this.html=''
+        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+
+      });
+
+      this.dialogVisible = true;
+    },
     //系统备货确定
     callFordelivery(){
       let c = false;
@@ -1129,16 +1308,19 @@ export default {
    async getStockUpParcelsList(page){
       let a = await getParcelListOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
      console.log("包件...",a.data);
-      const data = a.data.data;
-      this.data1 = data.records;
-      this.data1.forEach(i =>{
-        if(!i.stockupStatus){
-          i.stockupStatusName = "待备货";
-          this.isStockUp = true;
-        }else{
-          i.stockupStatusName = "已备货";
-        }
-      })
+     const data = a.data.data;
+     this.data1 = data.records;
+     if(this.data1.length > 0){
+       this.data1.forEach(i =>{
+         if(!i.stockupStatus){
+           i.stockupStatusName = "待备货";
+           this.isStockUp = true;
+         }else{
+           i.stockupStatusName = "已备货";
+         }
+       })
+     }
+
      this.page1.total = a.data.data.total;
      this.loading = false;
      this.selectionClear();
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index c6e70461..17152635 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -282,7 +282,7 @@
               <!-- 操作栏模块 -->
               <el-table-column prop="menu" label="操作" :width="220" align="center">
                 <template #="{ row }">
-                  <el-button type="primary" text icon="el-icon-view" v-if=" row.stockupStatusName== '已备货' " >明细</el-button>
+                  <el-button type="primary" text icon="el-icon-view" v-if=" row.stockupStatusName== '已备货' "  @click="onDetail(row)">明细</el-button>
                   <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
                   <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
                   <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
@@ -341,6 +341,17 @@
           <el-button @click="dialogVisible = false">取 消</el-button>
         </span>
       </el-dialog>
+      <el-dialog title="包条码" :visible.sync="dialogPack" width="780px" v-model="dialogPack">
+        <div >
+          <span>lmy 666</span>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="dialogPack = false">确 定</el-button>
+          <el-button @click="dialogPack = false">取 消</el-button>
+        </span>
+      </el-dialog>
       <el-dialog v-model="dialogHand" title="系统备货">
         <el-form :model="form">
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
@@ -408,6 +419,7 @@ import option from '@/option/distribution/distributionStockup';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getParcelListOwn, getParcelListOwnSelf } from '@/api/distribution/distributionParcelList';
+import { getDisStockList } from '@/api/distribution/disStockListDetail'
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getStockDetail } from '@/api/distribution/distributionStock';
 import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
@@ -418,6 +430,7 @@ export default {
     return {
       html: null, // 页面包条码内容
       dialogVisible: false, //二维码控制
+      dialogPack: false, //包件控制
       height: 0,
       activeName: 'reservation',
       // 弹框标题
@@ -522,7 +535,22 @@ export default {
     },
   },
   methods: {
-    //打印
+    //查询库存包件明细
+    onDetail(row){
+      //
+      this.dialogPack = true;
+      console.log("row>>>",row);
+      //查询信息
+      let po = {
+        stockListId: row.stockListId,
+        reservationId: row.billLadingId,
+      }
+      getDisStockList(po).then( res =>{
+        console.log("res>>>>库存包件码",res.data.data);
+      })
+
+    },
+      //打印
     printTemplate() {
       let LODOP = getLodop();
       console.log("LODOP>>>>>",LODOP);
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index 632f4fc5..140a0cdc 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -83,7 +83,7 @@
         >
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-text>
-            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-text>
+            <el-text type="primary" text icon="el-icon-edit" v-if=" slotProps.scope.row.stockupStatusName != '已备货' " @click="handleEdit(slotProps.scope)">编辑</el-text>
             <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
 <!--            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">打印</el-text>-->
           </template>
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index 0a0d4945..acaa23f0 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -65,7 +65,7 @@
         >
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-text>
-            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-text>
+            <el-text type="primary" text icon="el-icon-edit" v-if=" slotProps.scope.row.stockupStatusName != '已备货' " @click="handleEdit(slotProps.scope)">编辑</el-text>
             <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
 <!--            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">打印</el-text>-->
           </template>