Merge branch 'dev' into pre-production

1 year ago · df3f2e0af1
24 changed files with 5407 additions and 5168 deletions
--- a/src/api/distribution/distrilbutionBillLading.js
+++ b/src/api/distribution/distrilbutionBillLading.js
@ -8,10 +8,11 @@ export const getList = (current, size, params) => {
      ...params,
      current,
      size,
-    }
-  })
-}
-export const getOrderDetail = (current, size, params) => { //订单
+    },
+  });
+};
+export const getOrderDetail = (current, size, params) => {
+  //订单
  return request({
    url: '/api/logpm-distribution/distrilbutionBillStock/billOrderDetail',
    method: 'get',
@ -19,10 +20,11 @@ export const getOrderDetail = (current, size, params) => { //订单
      ...params,
      current,
      size,
-    }
-  })
-}
-export const getPackDetail = (current, size, params) => { //包件
+    },
+  });
+};
+export const getPackDetail = (current, size, params) => {
+  //包件
  return request({
    url: '/api/logpm-distribution/distrilbutionBillStock/billOrderPack',
    method: 'get',
@ -30,10 +32,11 @@ export const getPackDetail = (current, size, params) => { //包件
      ...params,
      current,
      size,
-    }
-  })
-}
-export const getInventoryDetail = (current, size, params) => { //库存品
+    },
+  });
+};
+export const getInventoryDetail = (current, size, params) => {
+  //库存品
  return request({
    url: '/api/logpm-distribution/distributionDeliveryDetails/billOrderInventory',
    method: 'get',
@ -41,9 +44,9 @@ export const getInventoryDetail = (current, size, params) => { //库存品
      ...params,
      current,
      size,
-    }
-  })
-}
+    },
+  });
+};

 export const getListOwn = (current, size, params) => {
  return request({
@ -53,84 +56,85 @@ export const getListOwn = (current, size, params) => {
      ...params,
      current,
      size,
-    }
-  })
-}
+    },
+  });
+};

-export const getListOwnNUm = (params) => {
+export const getListOwnNUm = params => {
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/listNum',
    method: 'get',
    params: {
      ...params,
-    }
-  })
-}
+    },
+  });
+};

-export const getDetail = (id) => {
+export const getDetail = id => {
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/detail',
    method: 'get',
    params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};

-export const getViewDetailOwn = (id) => {
+export const getViewDetailOwn = id => {
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/viewDetailOwn',
    method: 'get',
    params: {
-      id
-    }
-  })
-}
-export const getBillLadingDetail = (ids) => { //签收
+      id,
+    },
+  });
+};
+export const getBillLadingDetail = ids => {
+  //签收
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/updateOwn',
    method: 'post',
    params: {
      ids,
-    }
-  })
-}
+    },
+  });
+};

-export const remove = (ids) => {
+export const remove = ids => {
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/remove',
    method: 'post',
    params: {
      ids,
-    }
-  })
-}
+    },
+  });
+};

-export const add = (row) => {
+export const add = row => {
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/submit',
    method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};

-export const addAssign = (row) => {
+export const addAssign = row => {
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/saveAssign',
    method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};

-export const getDetailStockupOwn = (id) => {
+export const getDetailStockupOwn = id => {
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/detailOwn',
    method: 'get',
    params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 export const getDetailReservationOwn = (current, size, params) => {
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/detailReservationOwn',
@ -139,10 +143,11 @@ export const getDetailReservationOwn = (current, size, params) => {
      ...params,
      current,
      size,
-    }
-  })
-}
-export const getDetailOrderOwn = (current, size, params) => { //订单
+    },
+  });
+};
+export const getDetailOrderOwn = (current, size, params) => {
+  //订单
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/detailOrderOwn',
    method: 'get',
@ -150,10 +155,11 @@ export const getDetailOrderOwn = (current, size, params) => { //订单
      ...params,
      current,
      size,
-    }
-  })
-}
-export const getDetailInventoryOwn = (current, size, params) => { //库存品
+    },
+  });
+};
+export const getDetailInventoryOwn = (current, size, params) => {
+  //库存品
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/inventoryOwn',
    method: 'get',
@ -161,19 +167,19 @@ export const getDetailInventoryOwn = (current, size, params) => { //库存品
      ...params,
      current,
      size,
-    }
-  })
-}
-export const update = (row) => {
+    },
+  });
+};
+export const update = row => {
  return request({
    url: '/api/logpm-distribution/distrilbutionBillLading/submit',
    method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 /**
 * 获取零担订单详情数据
- * @param {*} params 
+ * @param {*} params
 */
 export const zeroMaterial = params => {
  return request({
@ -182,3 +188,14 @@ export const zeroMaterial = params => {
    params,
  });
 };
+/**
+ * 维护零担在库数量
+ * @param {*} params
+ */
+export const zeroUpdateMaterial = data => {
+  return request({
+    url: '/api/logpm-distribution/distributionParcelList/zeroUpdateMaterial',
+    method: 'put',
+    data,
+  });
+};
--- a/src/api/work/work.js
+++ b/src/api/work/work.js
@ -90,7 +90,7 @@ export const getMyWarehouseList = data => {

 export const getMyCurrentWarehouse = data => {
  return request({
-    url: '/api/logpm-basicdata/warehouse/client/getMyCurrentWarehouse',
+    url: '/api/logpm-basicdata/warehouse/getCurrentWarehouse',
    method: 'get',
    data,
  });
@ -98,7 +98,6 @@ export const getMyCurrentWarehouse = data => {



-
 export const preserveCurrentWarehouse = data => {
  return request({
    url: '/api/logpm-basicdata/warehouse/preserveCurrentWarehouse',
--- a/src/css/normalize.css
+++ b/src/css/normalize.css
@ -27,7 +27,16 @@ section,
 summary {
  display: block;
 }
-
+.print-control {
+  z-index: 99999999999;
+  position: fixed;
+  top: 3%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 100%;
+  height: 5%;
+  background-color: #fff;
+}
 /**
 * Correct `inline-block` display not defined in IE 8/9.
 *
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@ -8,18 +8,17 @@
      </div>
      <div class="avue-main">
        <!-- 顶部导航栏 -->
-        <top ref="top"  />
+        <top ref="top" />
        <!-- 顶部标签卡 -->
        <tags />
        <search class="avue-view" v-show="isSearch"></search>
        <!-- 主体视图层 -->
        <div id="avue-view" v-show="!isSearch" v-if="isRefresh">
          <router-view #="{ Component }">
-
            <!-- <keep-alive :include="$store.getters.tagsKeep" :max="20">    -->
-            <keep-alive  :max="20">
+            <!-- <keep-alive :max="20"> -->
              <component :is="Component" />
-            </keep-alive>
+            <!-- </keep-alive> -->
          </router-view>
        </div>
      </div>
@ -53,7 +52,6 @@ export default {
  provide() {
    return {
      index: this,
-     
    };
  },
  computed: {
@ -72,19 +70,18 @@ export default {
        (this.$route.meta || {}).menu === false || (this.$route.query || {}).menu === 'false'
      );
    },
-    
  },
-  data(){
-    return{
-       TabName:null,
-    }
+  data() {
+    return {
+      TabName: null,
+    };
  },
  created() {
-    getMyCurrentWarehouse().then(res=>{
-      console.log(res,'初始化请求参数');
-      console.log(res.data.name,'仓库名称');
+    getMyCurrentWarehouse().then(res => {
+      console.log(res, '初始化请求参数');
+      console.log(res.data.name, '仓库名称');
      localStorage.setItem('WarehouseName', res.data.name);
-     })
+    });
  },
  mounted() {
    if (this.userInfo.tenant_id == '000000') {
@ -102,7 +99,6 @@ export default {
  },
  props: [],
  methods: {
-
    //打开菜单
    openMenu(item = {}) {
      this.$store.dispatch('GetMenu', item.id).then(data => {
@ -140,4 +136,17 @@ export default {
 .el-card__body {
  padding: 10px !important;
 }
+// .font-day{
+
+// }
+.el-popup-parent--hidden font:first-of-type {
+  z-index: 99999999999;
+  position: fixed;
+  top: 3%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 100%;
+  height: 5%;
+  background-color: #fff;
+}
 </style>
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@ -121,25 +121,23 @@ export default {
  },
  mounted() {
    getMyWarehouseList().then(res => {
-      console.log(res.data.data, 'getMyWarehouseList');
-      let arr = [{ name: this.dataName?this.dataName:'', id: '0' }];
+      let arr = [{ name: this.dataName ? this.dataName : '', id: '0' }];
      this.datalist = arr.concat(res.data.data);
    });
    this.checkwarehousevalue = Number(localStorage.getItem('checkwarehousevalue'));
-
  },
  filters: {},

  created() {
-    this.dataName=null
+    this.dataName = null;
    let warehouseName = localStorage.getItem('WarehouseName');
    let modifiedName = warehouseName.replace(/"/g, '');
    if (modifiedName == 'undefined') {
      this.dataName = '';
-      console.log('当前暂时没有参数',this.dataName);
+      console.log('当前暂时没有参数', this.dataName);
    } else {
      this.dataName = modifiedName;
-      console.log(this.dataName,'当前参数存在值');
+      console.log(this.dataName, '当前参数存在值');
    }
  },
  computed: {
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@ -758,7 +758,6 @@ export default [
        name: '转库存品',
        meta: {
          i18n: 'dict',
-          
        },
        props: route => ({
          name: route.query.name,
@ -778,8 +777,7 @@ export default [
        name: '查询订单详情',
        meta: {
          i18n: 'dict',
-          keepAlive: true
-
+          keepAlive: true,
        },
        props: route => ({
          name: route.query.name,
@ -1049,6 +1047,18 @@ export default [
      },
    ],
  },
+  {
+    path: '/distribution/signfor//devtmp',
+    component: Layout,
+    redirect: '/distribution/signfor//devtmp',
+    children: [
+      {
+        path: '/distribution/signfor//devtmp',
+        name: '签收明细重构',
+        component: () => import('@/views/distribution/signfor//devtmp.vue'),
+      },
+    ],
+  },
  // {
  //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
  //   component: Layout,
--- a/src/utils/LodopFuncs.js
+++ b/src/utils/LodopFuncs.js
@ -98,9 +98,11 @@ export function getLodop(oOBJECT, oEMBED) {
    var strLodopUpdate = strFontTag + "需要升级!点击这里<a href='install_lodop32.exe' target='_self'>执行升级</a>";
    var strLodop64Install = strFontTag + "未安装!点击这里<a href='install_lodop64.exe' target='_self'>执行安装</a>";
    var strLodop64Update = strFontTag + "需要升级!点击这里<a href='install_lodop64.exe' target='_self'>执行升级</a>";
-    var strCLodopInstallA = "<br><font color='#FF00FF'>Web打印服务CLodop未安装启动，点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>下载执行安装</a>";
+    var strCLodopInstallA =
+      "<font color='#FF00FF'>Web打印服务CLodop未安装启动，点击这里<a href='http://47.108.51.143:9000/logpm/other/CLodop_Setup_for_Win32NT.exe' target='_self'>下载执行安装, <b color='#FF00FF'> 打印机驱动地址</b>：<a href='http://47.108.51.143:9000/logpm/other/Deli_2020.4_M-2.zip' target='_self'>点击下载<a></a>";
    var strCLodopInstallB = "<br>（若此前已安装过，可<a href='CLodop.protocol:setup' target='_self'>点这里直接再次启动</a>）";
-    var strCLodopUpdate = "<br><font color='#FF00FF'>Web打印服务CLodop需升级!点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>执行升级</a>";
+    var strCLodopUpdate =
+      "<br><font color='#FF00FF'>Web打印服务CLodop需升级!点击这里<a href='http://47.108.51.143:9000/logpm/other/CLodop_Setup_for_Win32NT.exe' target='_self'>执行升级</a>";
    var strLodop7FontTag = "<br><font color='#FF00FF'>Web打印服务Lodop7";
    var strLodop7HrefX86 = "点击这里<a href='Lodop7_Linux_X86_64.tar.gz' target='_self'>下载安装</a>(下载后解压，点击lodop文件开始执行)";
    var strLodop7HrefARM = "点击这里<a href='Lodop7_Linux_ARM64.tar.gz'  target='_self'>下载安装</a>(下载后解压，点击lodop文件开始执行)";
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@ -175,11 +175,11 @@
      <el-dialog title="客户导入" append-to-body v-model="excelBox" width="555px">
        <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
          <template #excelTemplate>
-            <el-button type="primary" @click="handleTemplate">
-              <a href="http://192.168.10.100:9000/htlogpm/upload/20231024/ac94acebf315f1f3625e8633800e290c.xlsx" download="客户模板.xlsx">
-                点击下载<i class="el-icon-download el-icon--right"></i>
-              </a>
-            </el-button>
+            <a href="http://47.108.51.143:9000/logpm/other/%E5%AE%A2%E6%88%B7%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx" download="客户模板.xlsx">
+              <el-button type="primary">
+                  点击下载<i class="el-icon-download el-icon--right"></i>
+              </el-button>
+            </a>

          </template>
        </avue-form>
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@ -1505,7 +1505,7 @@ export default {
        //   return item
        // });
      });
-      getDictionaryBiz('stockup_status').then(res => {
+      getDictionaryBiz('order_stockup_status').then(res => {
        this.$functions.checkcColumnList('stockupStatusName', this.columnList).checkarr =
          res.data.data.map(item => {
            item.value = item.dictKey;
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@ -968,7 +968,7 @@ export default {
  },
  computed: {
    ...mapGetters(['permission']),
-  
+
    permissionList() {
      return {
        addBtn: this.validData(this.permission.basicdataBrandCategory_add, false),
@ -1310,7 +1310,7 @@ export default {
            return item;
          });
      });
-      getDictionaryBiz('stockup_status').then(res => {
+      getDictionaryBiz('order_stockup_status').then(res => {
        this.$functions.checkcColumnList('stockupStatusName', this.columnList).checkarr =
          res.data.data.map(item => {
            item.value = item.dictKey;
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@ -680,6 +680,16 @@ export default {
          fixed: false,
          sortable: true,
        },
+        {
+          prop: 'stockupStatusName',
+          label: '备货状态',
+          type: 3,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
        {
          prop: 'orderReceiveStatusName',
          label: '入库状态',
@ -1376,6 +1386,14 @@ export default {
            return item;
          });
      });
+      getDictionaryBiz('order_stockup_status').then(res => {
+        this.$functions.checkcColumnList('stockupStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
+            item.value = item.dictKey;
+            item.label = item.dictValue;
+            return item;
+          });
+      });
    },
    searchHide() {
      this.search = !this.search;
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@ -1667,7 +1667,7 @@ export default {
        //   return item
        // });
      });
-      getDictionaryBiz('stockup_status').then(res => {
+      getDictionaryBiz('order_stockup_status').then(res => {
        this.$functions.checkcColumnList('stockupStatusName', this.columnList).checkarr =
          res.data.data.map(item => {
            item.value = item.dictKey;
--- a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
@ -1407,7 +1407,7 @@ export default {
        //   return item
        // });
      });
-      getDictionaryBiz('stockup_status').then(res => {
+      getDictionaryBiz('order_stockup_status').then(res => {
        this.$functions.checkcColumnList('stockupStatusName', this.columnList).checkarr =
          res.data.data.map(item => {
            item.value = item.dictKey;
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@ -379,6 +379,7 @@
      </div>
    </div>

+    <!-- 添加库存品 -->
    <el-dialog v-model="dialogFormVisible" title="添加库存品" style="width: 80%">
      <el-table
        ref="table"
@ -444,6 +445,7 @@
      </template>
    </el-dialog>

+    <!-- 添加订单 -->
    <el-dialog v-model="dialogFormOrderVisible" title="添加订单" style="width: 80%">
      <tablecmt
        ref="multipleTable"
@ -488,7 +490,7 @@

    <!-- 零担订单信息修改 -->
    <el-dialog v-model="dialogFormZeroOrderVisible" title="零担订单信息" center style="width: 50%">
-      <template v-if="zeroOrderFormList">
+      <!-- <template v-if="zeroOrderFormList">
        <div style="display: flex; align-items: center; text-align: center">
          <div style="width: 120px; display: flex">名称</div>
          <div style="display: flex">数量</div>
@ -501,72 +503,66 @@
        >
          <el-input-number :min="0" :max="item.maxNum" v-model="item.quantity" />
        </el-form-item>
-      </template>
+      </template> -->
+
+      <el-table :data="zeroOrderFormList" border style="width: 100%">
+        <el-table-column fixed prop="firsts" label="名称" />
+        <el-table-column prop="quantity" label="数量" />
+        <el-table-column prop="libraryQuantity" label="在库数量" />
+        <el-table-column prop="deliveryQuantity" label="冻结数量" />
+        <!-- <el-table-column prop="deliveryQuantity" label="出库数量" /> -->
+        <el-table-column label="可用数量">
+          <template #default="props">
+            <span> {{ props.row.libraryQuantity - props.row.deliveryQuantity }}</span>
+          </template>
+        </el-table-column>
+        <!-- 在库=冻结-出库 -->
+
+        <el-table-column fixed="right" label="数量操作">
+          <template #default="scope">
+            <el-input-number
+              size="small"
+              v-model="scope.row._quantity"
+              :min="0"
+              :max="scope.row.maxNum"
+            />
+          </template>
+        </el-table-column>
+      </el-table>

      <div style="text-align: center">
-        <el-button type="primary" @click="handleRowZeroOrder">确定</el-button>
        <el-button @click="dialogFormZeroOrderVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleRowZeroOrder">录入数量</el-button>
      </div>
    </el-dialog>

-    <!-- 零担订单信息修改 -->
+    <!-- 零担订单在库信息修改 -->
    <el-dialog v-model="zeroOrderVisible" title="零担品类信息" center width="50%">
-      <el-row :gutter="24" class="rows">
-        <el-col :xl="4" :lg="7" :md="8" :sm="24">
-          <h3>
-            <!-- <span>在库总数：{{ this.obj.handQuantity }}</span> -->
-          </h3>
-        </el-col>
-      </el-row>
+      <div Class="iszer">
+        <el-table :data="zeroOrderData" border style="width: 100%">
+          <el-table-column fixed prop="firsts" label="名称" />
+          <el-table-column prop="quantity" label="数量" />
+          <el-table-column prop="libraryQuantity" label="在库数量" />
+          <el-table-column prop="deliveryQuantity" label="冻结数量" />

-      <template v-if="zeroOrderData != null && zeroOrderData.length !== 0">
-        <div v-for="(item, index) in zeroOrderData" :key="index">
-          <el-row :gutter="24" class="rows">
-            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-              <span>名称：{{ item.firsts }}</span>
-            </el-col>
-            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-              <span>总数量：{{ item.quantity }} </span>
-            </el-col>
-            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-              <span>在库数量：{{ item.handQuantity }} </span>
-            </el-col>
-            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-              <span>冻结数量：{{ item.deliveryQuantity }} </span>
-            </el-col>
-            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-              <span>出库数量：{{ item.outboundQuantity }} </span>
-            </el-col>
-            <el-col :xl="4" :lg="7" :md="8" :sm="24">
-              <span
-                >可用数量：{{
-                  item.handQuantity - item.deliveryQuantity - item.outboundQuantity
-                }}</span
-              >
-            </el-col>
-          </el-row>
-          <el-input-number
-            v-if="this.isrReservationEntry"
-            v-model="item.reservationNum"
-            min="0"
-            :max="item.zeroOrderMax"
-            placeholder="请输入预约数量"
-          ></el-input-number>
-          <el-input-number
-            v-else
-            v-model="item.number"
-            min="0"
-            :max="item.quantity"
-            placeholder="请输入预约数量"
-          ></el-input-number>
+          <el-table-column fixed="right" label="数量操作">
+            <template #default="scope">
+              <el-input-number
+                size="small"
+                v-model="scope.row.tiQuantity"
+                :min="0"
+                :max="scope.row.maxNum"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="text-align: center">
+          <el-button icon="el-icon-circle-close" @click="zeroOrderVisible = false">返 回</el-button>
+          <el-button icon="el-icon-check" color="#172e60" type="success" @click="onSubmitZeroOrder"
+            >维护在库数量</el-button
+          >
        </div>
-      </template>
-      <el-form-item style="margin-left: 37%; margin-top: 5px">
-        <el-button type="primary" icon="el-icon-check" @click="onSubmitZeroOrder"
-          >提交(零担订单)
-        </el-button>
-        <el-button icon="el-icon-circle-close" @click="zeroOrderVisible = false">返 回</el-button>
-      </el-form-item>
+      </div>
    </el-dialog>

    <!-- 选择包件 -->
@ -621,6 +617,7 @@ import {
  update,
  remove,
  zeroMaterial,
+  zeroUpdateMaterial,
 } from '@/api/distribution/distrilbutionBillLading';
 import { getListOwn, getList, getEditList } from '@/api/distribution/distributionParcelList';
 import option from '@/option/distribution/distrilbutionBillLading';
@ -1841,7 +1838,7 @@ export default {
      },
      // 零担在库录入弹窗开启
      zeroOrderVisible: false,
-      zeroOrderData: [],
+      zeroOrderData: [{}],
    };
  },
  mounted() {
@ -2590,6 +2587,7 @@ export default {
                //   submitFormData.parcelLisList.push(item);
                // });
              });
+              submitFormData.parcelLisList.forEach(val => (val.quantity = val._quantity));
            } else {
              submitFormData.zeroType = '1';
            }
@ -2990,23 +2988,27 @@ export default {
      const { code, data } = res.data;
      if (code === 200) {
        this.zeroOrderFormList = data.map(val => {
-          const zeroOrder = {
-            // 记录传入行的id
-            stockArticleId: val.stockArticleId,
-            // 物料id
-            id: val.id,
-            // 物料最大限数
-            maxNum: val.quantity,
-            // 物料件数
-            quantity: val.quantity,
-            // 物料名称
-            firsts: val.firsts,
-          };
+          // zeroOrder = {
+          //   stockArticleId: val.stockArticleId,
+          //   // 物料id
+          //   id: val.id,
+          //   // 物料最大限数
+          //   maxNum: val.quantity,
+          //   // 物料件数
+          //   quantity: val.quantity,
+          //   // 物料名称
+          //   firsts: val.firsts,
+          // };
+          const zeroOrder = val;
+          // 记录传入行的id
+          zeroOrder.stockArticleId = val.stockArticleId;
+          // 物料最大限数
+          zeroOrder.maxNum = val.libraryQuantity - val.deliveryQuantity;
          // 新增时, 检测是否齐套
          if (row.completeSetName !== '是' && Number(this.$route.query.type) === 3)
-            zeroOrder.quantity = null;
+            zeroOrder._quantity = null;
          else if (val.deliveryQuantity && Number(this.$route.query.type) === 2) {
-            zeroOrder.quantity = val.deliveryQuantity;
+            zeroOrder._quantity = val.deliveryQuantity;
          }
          return zeroOrder;
        });
@ -3026,15 +3028,69 @@ export default {
    /**
     * 显示维护在库零担数量
     */
-    handleStockZeroOrder() {
+    async handleStockZeroOrder(row) {
+      // 请求零担数据详情
+      const res = await zeroMaterial({
+        stockArticleId: row.id,
+        reservationId: this.$route.query.id,
+      });
+      console.log('res :>> ', res);
+      const { code, data } = res.data;
+      if (code === 200) {
+        this.zeroOrderData = data.map(val => {
+          // zeroOrder = {
+          //   stockArticleId: val.stockArticleId,
+          //   // 物料id
+          //   id: val.id,
+          //   // 物料最大限数
+          //   maxNum: val.quantity,
+          //   // 物料件数
+          //   quantity: val.quantity,
+          //   // 物料名称
+          //   firsts: val.firsts,
+          // };
+          const zeroOrder = val;
+          // 记录传入行的id
+          zeroOrder.stockArticleId = val.stockArticleId;
+          // 物料最大限数
+          zeroOrder.maxNum = val.quantity;
+          // 新增时, 检测是否齐套
+          zeroOrder.tiQuantity = val.libraryQuantity;
+          return zeroOrder;
+        });
+        console.log('this.zeroOrderFormList :>> ', this.zeroOrderFormList);
+      }
+      // 开启零担蒙层弹窗
      this.zeroOrderVisible = true;
-      console.log('this.zeroOrderVisible :>> ', this.zeroOrderVisible);
-      console.log('111 :>> ', 111);
    },
    /**
     * 在库零担维护提交
     */
-    onSubmitZeroOrder() {},
+    async onSubmitZeroOrder() {
+      try {
+        if (this.zeroOrderData.length === 0) {
+          return (this.zeroOrderVisible = false);
+        }
+        const submitData = {
+          stockArticleId: this.zeroOrderData[0].stockArticleId,
+          distributionParcelListZeroVO: [],
+        };
+        submitData.distributionParcelListZeroVO = this.zeroOrderData.map(val => {
+          val.TiQuantity = val.tiQuantity;
+          return val;
+        });
+        
+        const res = await zeroUpdateMaterial(submitData);
+        const { code } = res.data;
+        if (code === 200) {
+          this.$message.success(res.data.msg);
+        }
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.zeroOrderVisible = false;
+      }
+    },
  },
 };
 </script>
--- a/src/views/distribution/signfor/devtmp.vue
+++ b/src/views/distribution/signfor/devtmp.vue
@ -0,0 +1,7 @@
+<template>
+ 
+</template>
+
+<script setup></script>
+
+<style lang="scss" scoped></style>
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@ -401,7 +401,7 @@ export default {
          head: false,
        },
        {
-          prop: 'signingStatusAll',
+          prop: 'sijiSigningStatus',
          label: '司机签收状态',
          type: 2,
          values: '',
@ -412,7 +412,7 @@ export default {
          head: false,
        },
        {
-          prop: 'signingStatusAll',
+          prop: 'wenyuanSigningStatus',
          label: '文员复核状态',
          type: 2,
          values: '',
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@ -1401,6 +1401,30 @@ export default {
            search: true,
            width: '100px',
          },
+          {
+            label: '包件类型',
+            prop: 'trainNumber',
+            search: true,
+            width: '100px',
+          },
+          {
+            label: '计划数量',
+            prop: 'reservationNum',
+            search: true,
+            width: '100px',
+          },
+          {
+            label: '装车数量',
+            prop: 'loadingNub',
+            search: true,
+            width: '100px',
+          },
+          {
+            label: '签收数量',
+            prop: 'signingNub',
+            search: true,
+            width: '100px',
+          },
          {
            label: '一级品类',
            prop: 'firsts',
--- a/src/views/distribution/stockup/distributionStockupDetails.vue
+++ b/src/views/distribution/stockup/distributionStockupDetails.vue
@ -104,7 +104,7 @@
          </el-tab-pane>
          <el-tab-pane label="库存品" name="enter">

-            <el-text type="primary" text icon="el-icon-view"  @click="handleBatchDetail('2')">批量打印</el-text>
+            <el-button type="primary" icon="el-icon-view"  @click="handleBatchDetail('2')">批量打印</el-button>

          <tablecmt
          :columnList="columnListarrs.columnInventory"
@ -142,7 +142,7 @@
      </el-row>
      <el-dialog title="包条码" :visible.sync="dialogPack" width="1050px" v-model="dialogPack">

-        <el-text type="primary" icon="el-icon-view"  @click="handleBatchDetail('1')">批量打印</el-text>
+        <el-button type="primary" icon="el-icon-view"  @click="handleBatchDetail('1')">批量打印</el-button>

        <tablecmt
          :columnList="columnListarrs.columnInventoryBatch"
@ -964,6 +964,11 @@ export default {
        this.$message.warning("至少选择一条数据！！")
        return ;
      }
+
+      const _flag = this.selectionList.every(val => !(val.stockupStatusName === '待备货'))
+
+      if (_flag) return this.$message.warning('有待备货数据, 无法打印')
+
      if(type== '1'){
        //包条码批量
        let checkcode=[]
@ -981,7 +986,7 @@ export default {
          this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
        })
      }else if(type== '2'){
-//包条码批量
+        //包条码批量
        let myMap = [];
        this.selectionList.map(item=>{
         if(!!item.stocklist){
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@ -483,16 +483,16 @@ export default {
          fixed: false,
          sortable: true,
        },*/
-        // {
-        //   prop: 'loaderName',
-        //   label: '装卸班组',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
+        {
+          prop: 'pallet',
+          label: '所在托盘',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
        {
          prop: 'fixTime',
          label: '确认完成备货时间',
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@ -475,16 +475,16 @@ export default {
        //   fixed: false,
        //   sortable: true,
        // },
-        // {
-        //   prop: 'loaderName',
-        //   label: '装卸班组',
-        //   type: 2,
-        //   values: '',
-        //   width: '130',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
+        {
+          prop: 'pallet',
+          label: '所在托盘',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
        {
          prop: 'fixTime',
          label: '确认完成备货时间',
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@ -473,16 +473,16 @@ export default {
        //   fixed: false,
        //   sortable: true,
        // },
-        /*{
-          prop: 'loaderName',
-          label: '装卸班组',
+        {
+          prop: 'pallet',
+          label: '所在托盘',
          type: 2,
          values: '',
          width: '130',
          checkarr: [],
          fixed: false,
          sortable: true,
-        },*/
+        },
        {
          prop: 'fixTime',
          label: '确认完成备货时间',
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
--- a/src/views/distribution/turndelivery/deliveryDiscussYB.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscussYB.vue
--- a/src/views/distribution/turndelivery/devtmp.vue
+++ b/src/views/distribution/turndelivery/devtmp.vue