Merge branch 'dev' into pre-production

src/api/distribution/distributionParcelList.js

@@ -8,9 +8,20 @@ export const getList = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
+export const getEditList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionParcelList/pickupPack',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
 export const getListOwn = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/list',
@@ -19,19 +30,18 @@ export const getListOwn = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
-export const getStockDataBase = ( params) => {
+    },
+  });
+};
+export const getStockDataBase = params => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/stockDataBase',
     method: 'get',
     params: {
       ...params,
-
-    }
-  })
-}
+    },
+  });
+};
 export const getpage = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/page',
@@ -40,9 +50,9 @@ export const getpage = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getParcelListOwn = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/parcelListOwn',
@@ -51,9 +61,9 @@ export const getParcelListOwn = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 export const getParcelListOwnSelf = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/parcelListOwnSelf',
@@ -62,62 +72,60 @@ export const getParcelListOwnSelf = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 
-export const getDetail = (id) => {
+export const getDetail = id => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/detail',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
-export const remove = (ids) => {
+export const remove = ids => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/remove',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
+    },
+  });
+};
 
-export const add = (row) => {
+export const add = row => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/submit',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const update = (row) => {
+export const update = row => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/submit',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const updateParcelList = (row) => {
+export const updateParcelList = row => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/update',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const getPackageList = (params) => {
+export const getPackageList = params => {
   return request({
     url: '/api/logpm-distribution/distributionParcelList/list',
     method: 'get',
     params: {
-      ...params
-    }
-  })
-}
-
-
+      ...params,
+    },
+  });
+};

src/api/distribution/distributionReservation.js

@@ -234,7 +234,13 @@ export const getDeliveryZeroOrderDetail = (deliveryId,orderId) => {
     params: { deliveryId,orderId }
   });
 }
-
+export const $_getDeliveryZeroOrderDetail = params => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/getDeliveryZeroOrderDetail',
+    method: 'get',
+    params,
+  });
+};
 /**
  * 查询预约计划零担详情
  * @param ids

src/api/work/work.js

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

src/components/tablecmt/tablecmt.vue

@@ -172,7 +172,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ref, watchEffect, getCurrentInstance, onMounted } from 'vue';
+import { computed, ref, watchEffect, getCurrentInstance, onMounted, defineExpose } from 'vue';
 import type { PropType } from 'vue';
 const { proxy } = getCurrentInstance() as any;
 const selecttable = ref(null);
@@ -187,7 +187,7 @@ onMounted(() => {
   function getWinHight() {
     var windowHight = 0;
     if (document.body.clientHeight && document.documentElement.clientHeight) {
-      windowHight = 
+      windowHight =
         document.body.clientHeight < document.documentElement.clientHeight
           ? document.body.clientHeight
           : document.documentElement.clientHeight;
@@ -198,10 +198,13 @@ onMounted(() => {
     return document.documentElement.clientHeight;
   }
 
-  var bodyContent = document.getElementById('bodys');
+  var bodyContent = document.querySelectorAll('.maboxhi');
   const _height = getWinHight();
+  console.log('bodyContent :>> ', bodyContent);
   // 设置列表的高度
-  bodyContent.style.height = _height - bodyContent.getBoundingClientRect().top - 65 + 'px';
+  bodyContent.forEach(val => {
+    val.style.height = _height - val.getBoundingClientRect().top - 65 + 'px';
+  });
 });
 interface TableColumnType {
   /** 表格列的key */
@@ -533,6 +536,8 @@ function copyContent(content: string) {
     return copyResult;
   }
 }
+
+defineExpose({});
 </script>
 <style lang="scss" scope>
 // :root{

src/page/index/index.vue

@@ -8,7 +8,7 @@
       </div>
       <div class="avue-main">
         <!-- 顶部导航栏 -->
-        <top ref="top" />
+        <top ref="top"  />
         <!-- 顶部标签卡 -->
         <tags />
         <search class="avue-view" v-show="isSearch"></search>
@@ -38,7 +38,7 @@ import search from './search.vue';
 import logo from './logo.vue';
 import top from './top/index.vue';
 import sidebar from './sidebar/index.vue';
-
+import { getMyCurrentWarehouse } from '@/api/work/work';
 export default {
   mixins: [index],
   components: {
@@ -53,6 +53,7 @@ export default {
   provide() {
     return {
       index: this,
+     
     };
   },
   computed: {
@@ -73,6 +74,18 @@ export default {
     },
     
   },
+  data(){
+    return{
+       TabName:null,
+    }
+  },
+  created() {
+    getMyCurrentWarehouse().then(res=>{
+      console.log(res,'初始化请求参数');
+      console.log(res.data.name,'仓库名称');
+      localStorage.setItem('WarehouseName', res.data.name);
+     })
+  },
   mounted() {
     if (this.userInfo.tenant_id == '000000') {
       let obj = JSON.parse(JSON.stringify(this.setting));
@@ -89,6 +102,7 @@ export default {
   },
   props: [],
   methods: {
+
     //打开菜单
     openMenu(item = {}) {
       this.$store.dispatch('GetMenu', item.id).then(data => {
@@ -122,8 +136,8 @@ export default {
 };
 </script>
 
-<style lang='scss'>
-.el-card__body{
-  padding:10px !important;
+<style lang="scss">
+.el-card__body {
+  padding: 10px !important;
 }
 </style>

src/page/index/top/index.vue

@@ -29,9 +29,12 @@
       <div class="top-bar__item" v-if="setting.debug">
         <top-logs></top-logs>
       </div>
+      <!-- 仓库名称  -->
+
       <div class="top-bar__item">
-        <view>{{ datalist[checkwarehousevalue]?.name||'' }}</view>
+        <view>{{ datalist[checkwarehousevalue]?.name || '' }}</view>
       </div>
+
       <div class="top-user">
         <img class="top-bar__img" :src="userInfo.avatar" />
         <el-dropdown>
@@ -112,20 +115,33 @@ export default {
       isshow: false,
       datalist: [],
       warehousevalue: '',
-      checkwarehousevalue:0,
+      checkwarehousevalue: 0,
+      dataName: null,
     };
   },
   mounted() {
     getMyWarehouseList().then(res => {
-          console.log(res.data.data, 'getMyWarehouseList');
-          let arr = [{ name: '全部', id: '0' }];
-          this.datalist = arr.concat(res.data.data);
-        });
-    this.checkwarehousevalue=Number(localStorage.getItem('checkwarehousevalue'))
-    console.log(this.checkwarehousevalue)
+      console.log(res.data.data, 'getMyWarehouseList');
+      let arr = [{ name: this.dataName?this.dataName:'', id: '0' }];
+      this.datalist = arr.concat(res.data.data);
+    });
+    this.checkwarehousevalue = Number(localStorage.getItem('checkwarehousevalue'));
+
   },
   filters: {},
-  created() {},
+
+  created() {
+    this.dataName=null
+    let warehouseName = localStorage.getItem('WarehouseName');
+    let modifiedName = warehouseName.replace(/"/g, '');
+    if (modifiedName == 'undefined') {
+      this.dataName = '';
+      console.log('当前暂时没有参数',this.dataName);
+    } else {
+      this.dataName = modifiedName;
+      console.log(this.dataName,'当前参数存在值');
+    }
+  },
   computed: {
     ...mapGetters([
       'setting',
@@ -152,7 +168,7 @@ export default {
         let res = await getclearWarehouseCache({});
         if (res.data.code == 200) {
           this.$message({ message: '切换成功', type: 'success' });
-          localStorage.setItem('checkwarehousevalue',this.warehousevalue)
+          localStorage.setItem('checkwarehousevalue', this.warehousevalue);
           this.$router.push({
             path: '/',
           });
@@ -166,7 +182,7 @@ export default {
         let res = await preserveCurrentWarehouse(this.datalist[this.warehousevalue]);
         if (res.data.code == 200) {
           this.$message({ message: '切换成功', type: 'success' });
-          localStorage.setItem('checkwarehousevalue',this.warehousevalue)
+          localStorage.setItem('checkwarehousevalue', this.warehousevalue);
           this.$router.push({
             path: '/',
           });

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -208,7 +208,7 @@
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="物品明细" prop="certificateType">
-              <el-tabs type="border-card" style="width: 100%">
+              <el-tabs type="border-card" @tab-click="handleChlickTab" style="width: 100%">
                 <el-tab-pane label="定制品">
                   <el-button
                     type="primary"
@@ -234,8 +234,18 @@
                         type="primary"
                         text
                         icon="el-icon-delete"
-                        @click="handleZeroOrder(slotProps.scope.row)"
-                        >操作</el-text
+                        @click.stop="handleZeroOrder(slotProps.scope.row)"
+                        >录入预约数量</el-text
+                      >
+                      <el-text
+                        v-if="
+                          slotProps.scope.row.isZero === '1' && Number(this.$route.query.type) !== 2
+                        "
+                        type="primary"
+                        text
+                        icon="el-icon-delete"
+                        @click.stop="handleStockZeroOrder(slotProps.scope.row)"
+                        >维护在库数量</el-text
                       >
                       <el-text
                         type="primary"
@@ -368,6 +378,7 @@
         </div>
       </div>
     </div>
+
     <el-dialog v-model="dialogFormVisible" title="添加库存品" style="width: 80%">
       <el-table
         ref="table"
@@ -455,8 +466,8 @@
         <el-pagination
           align="right"
           background
-          @size-change="sizeChangeStock"
-          @current-change="currentChangeStock"
+          @size-change="sizeChangeOrder"
+          @current-change="currentChangeOrder"
           :current-page="pageOrder.currentPage"
           :page-sizes="[30, 50, 80, 120]"
           :page-size="pageOrder.pageSize"
@@ -476,7 +487,7 @@
     </el-dialog>
 
     <!-- 零担订单信息修改 -->
-    <el-dialog v-model="dialogFormZeroOrderVisible" title="修改订单信息" center style="width: 50%">
+    <el-dialog v-model="dialogFormZeroOrderVisible" title="零担订单信息" center style="width: 50%">
       <template v-if="zeroOrderFormList">
         <div style="display: flex; align-items: center; text-align: center">
           <div style="width: 120px; display: flex">名称</div>
@@ -498,44 +509,108 @@
       </div>
     </el-dialog>
 
-    <!-- 选择包件 -->
-    <el-dialog v-model="dialogChooseOrderVisible" title="选择包件" center style="width: 80%">
-      <tablecmt
-        ref="orderChooseTable"
-        :columnList="order.columnOrderList"
-        :tableData="order.orderDetails"
-        :loading="order.orderChooseLoading"
-        @inputTxt="orderInputSc"
-        @timeCheck="orderTimesc"
-        @btnCheck="btnsc"
-        @selectCheck="orderSelectSc"
-        @selection="orderSelectChange"
-      >
-      </tablecmt>
-      <div class="avue-crud__pagination" style="width: 100%">
-        <!-- 分页模块 -->
-        <el-pagination
-          align="right"
-          background
-          @size-change="sizeChangeOrderChoose"
-          @current-change="currentChangeOrderChoose"
-          :current-page="order.currentPage"
-          :page-sizes="[30, 50, 80, 120]"
-          :page-size="order.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="order.total"
-        >
-        </el-pagination>
-      </div>
+    <!-- 零担订单信息修改 -->
+    <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>
 
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogChooseOrderVisible = false">取消</el-button>
-          <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-          <el-button type="primary" @click="handleChooseOrderConfirm('1')"> 确定 </el-button>
-        </span>
+      <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>
+        </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>
     </el-dialog>
+
+    <!-- 选择包件 -->
+    <!-- 此v-if解决关闭后选择不回显的问题 -->
+    <template v-if="dialogChooseOrderVisible">
+      <el-dialog v-model="dialogChooseOrderVisible" title="选择包件" center style="width: 80%">
+        <tablecmt
+          ref="orderChooseTable"
+          :columnList="order.columnOrderList"
+          :tableData="order.orderDetails"
+          :checkselect="order.selectList"
+          :loading="order.orderChooseLoading"
+          @inputTxt="orderInputSc"
+          @timeCheck="orderTimesc"
+          @btnCheck="btnsc"
+          @selectCheck="orderSelectSc"
+          @selection="orderSelectChange"
+        >
+        </tablecmt>
+        <div class="avue-crud__pagination" style="width: 100%">
+          <!-- 分页模块 -->
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChangeOrderChoose"
+            @current-change="currentChangeOrderChoose"
+            :current-page="order.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="order.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="order.total"
+          >
+          </el-pagination>
+        </div>
+
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="dialogChooseOrderVisible = false">取消</el-button>
+            <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+            <el-button type="primary" @click="handleChooseOrderConfirm()"> 确定 </el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </template>
   </basic-container>
 </template>
 
@@ -547,7 +622,7 @@ import {
   remove,
   zeroMaterial,
 } from '@/api/distribution/distrilbutionBillLading';
-import { getListOwn, getList } from '@/api/distribution/distributionParcelList';
+import { getListOwn, getList, getEditList } from '@/api/distribution/distributionParcelList';
 import option from '@/option/distribution/distrilbutionBillLading';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -556,6 +631,7 @@ import { getListStockList } from '@/api/distribution/distributionStockList';
 import { getListOne } from '@/api/distribution/distributionStockArticle';
 import dayjs from 'dayjs';
 import { detail } from '@/api/flow/flow';
+import { nextTick, ref } from 'vue';
 
 export default {
   data() {
@@ -1517,7 +1593,7 @@ export default {
           label: '操作',
           type: 6,
           values: '',
-          width: '150',
+          width: '200',
           checkarr: [],
           fixed: 'right',
           hide: true,
@@ -1615,39 +1691,6 @@ export default {
             sortable: true,
             head: false,
           },
-          {
-            label: '主键',
-            prop: 'id',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            label: '租户号',
-            prop: 'tenantId',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            label: '创建人',
-            prop: 'createUser',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
           {
             label: '创建时间',
             prop: 'createTime',
@@ -1659,61 +1702,6 @@ export default {
             sortable: true,
             head: false,
           },
-          {
-            label: '更新人',
-            prop: 'updateUser',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            label: '更新时间',
-            prop: 'updateTime',
-            type: 4,
-            values: '',
-            width: '180',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            label: '状态',
-            prop: 'status',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            label: '是否已删除',
-            prop: 'isDeleted',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
-          {
-            label: '创建部门',
-            prop: 'createDept',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
           {
             label: '仓库',
             prop: 'warehouse',
@@ -1813,17 +1801,6 @@ export default {
             sortable: true,
             head: false,
           },
-          {
-            label: '转库存品数量',
-            prop: 'inventoryQuantity',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
           {
             label: '车次号',
             prop: 'trainNumber',
@@ -1835,17 +1812,6 @@ export default {
             sortable: true,
             head: false,
           },
-          {
-            label: '在库订单ID',
-            prop: 'stockArticleId',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-            head: false,
-          },
         ],
         // 列表数据
         orderDetails: [],
@@ -1860,7 +1826,22 @@ export default {
         total: 0,
         // 复选框选中数据
         selectList: [],
+        /**
+         * 修改 -- 原有数据
+         */
+        originalList: [],
+        /**
+         * 修改 -- 删除的数据
+         */
+        delList: [],
+        /**
+         * 修改 -- 新增的数据
+         */
+        newList: [],
       },
+      // 零担在库录入弹窗开启
+      zeroOrderVisible: false,
+      zeroOrderData: [],
     };
   },
   mounted() {
@@ -2056,16 +2037,22 @@ export default {
       if (!index) {
         delete this.query[row.prop];
       }
-      this.onLoadOrder(this.pageOrder);
+      this.pageOrder.currentPage = 1;
+      this.onLoadOrder(this.pageOrder, this.pageOrder);
     },
     inputsc(index, row) {
       this.query[row.prop] = index;
-      this.onLoadOrder(this.pageOrder);
+      this.pageOrder.currentPage = 1;
+      this.onLoadOrder(this.pageOrder, this.query);
     },
     orderInputSc(index, row) {
       console.log('123 :>> ', 123);
       this.order.query[row.prop] = index;
-      this.onLoadOrderChoose();
+      const _type = this.$route.query.type;
+      // 编辑状态
+      if (Number(_type) === 2) {
+        this.onLoadEditChoose();
+      } else this.onLoadOrderChoose();
     },
     orderSelectSc(index, row) {
       console.log('index :>> ', index);
@@ -2083,8 +2070,13 @@ export default {
       if (!index) {
         delete this.query[row.prop];
       }
-      this.onLoadOrderChoose();
+      const _type = this.$route.query.type;
+      // 编辑状态
+      if (Number(_type) === 2) {
+        this.onLoadEditChoose();
+      } else this.onLoadOrderChoose();
     },
+
     //查询提货详情信息
     getDetailOen() {
       this.orderAdd = true;
@@ -2253,34 +2245,43 @@ export default {
       }
     },
     // 选择包件
-    handleChooseOrder(row) {
+    async handleChooseOrder(row) {
       console.log('row :>> ', row);
-
-      console.log('111 :>> ', 111);
-      this.dialogChooseOrderVisible = true;
+      // 页面类型
+      const _type = this.$route.query.type;
       this.orderChooseId = row.id;
-      this.onLoadOrderChoose();
+      // 编辑状态
+      if (Number(_type) === 2) {
+        await this.onLoadEditChoose({}, row);
+      } else await this.onLoadOrderChoose();
+      this.dialogChooseOrderVisible = true;
     },
     // 每页数量改变
     sizeChangeOrderChoose(size) {
       this.order.pageSize = size;
-      // console.log('size :>> ', size);
-      // console.log(' this.order.pageSize :>> ', this.order.pageSize);
-      this.onLoadOrderChoose();
+      ('');
+      const _type = this.$route.query.type;
+      // 编辑状态
+      if (Number(_type) === 2) {
+        this.onLoadEditChoose();
+      } else this.onLoadOrderChoose();
     },
     // 页码改变
     currentChangeOrderChoose(current) {
       // console.log('current :>> ', current);
       this.order.currentPage = current;
-      this.onLoadOrderChoose();
-    },
-    // 请求包件数据
-    onLoadOrderChoose(params = {}) {
-      console.log('1111 :>> ', 1111);
+      const _type = this.$route.query.type;
+      // 编辑状态
+      if (Number(_type) === 2) {
+        this.onLoadEditChoose();
+      } else this.onLoadOrderChoose();
+    },
+    // 请求包件数据 -- 新增
+    async onLoadOrderChoose(params = {}) {
       this.order.orderChooseLoading = true;
       this.order.query.stockArticleId = this.orderChooseId;
       this.order.query.conditions = '1';
-      getList(this.order.currentPage, this.order.pageSize, {
+      await getList(this.order.currentPage, this.order.pageSize, {
         ...params,
         ...this.order.query,
       }).then(res => {
@@ -2289,8 +2290,43 @@ export default {
         this.order.total = data.total;
         this.order.orderDetails = data.records;
         this.order.orderChooseLoading = false;
+        this.order.selectList = [];
         this.selectionClear();
       });
+      return null;
+    },
+    /**
+     * 请求包件数据 -- 修改
+     */
+    async onLoadEditChoose(params = {}, row) {
+      this.order.orderChooseLoading = true;
+      this.order.query.stockArticleId = this.orderChooseId;
+      this.order.query.reservationId = this.$route.query.id;
+      this.order.query.conditions = '1';
+      await getEditList(this.order.currentPage, this.order.pageSize, {
+        ...params,
+        ...this.order.query,
+      }).then(res => {
+        console.log('res :>> ', res);
+        const data = res.data.data;
+        this.order.total = data.total;
+        this.order.orderDetails = data.records;
+
+        // 被选中的包件的id list
+        row.originalIdList = [];
+
+        // 回显
+        this.order.selectList = this.order.orderDetails.filter(val => {
+          console.log('val :>> ', val);
+          if (val.choice) row.originalIdList.push(val.id);
+          return val.choice;
+        });
+        // 深拷贝数据
+        console.log('this.order.selectList :>> ', this.order.selectList);
+        row.originalList = JSON.parse(JSON.stringify(this.order.selectList));
+        this.order.orderChooseLoading = false;
+      });
+      return null;
     },
     /**
      * 确认选择包件
@@ -2308,6 +2344,7 @@ export default {
           return {
             parceListId: val.id,
             stockArticleId: val.stockArticleId,
+            packetBarCode: val.orderPackageCode,
           };
         });
       this.dialogChooseOrderVisible = false;
@@ -2459,7 +2496,6 @@ export default {
       }
     },
     async handleSubmit() {
-      console.log('123 :>> ', 123);
       const zeroOrderList = this.dataList.filter(val => val.isZero === '1');
       // 当有零担订单物料数量没操作时
       const wrongZeroOrder = zeroOrderList.find(val => !val.ParcelLisList);
@@ -2471,17 +2507,20 @@ export default {
           message: `订单自编号为${wrongZeroOrder.orderCode}的物料数量未编辑`,
         });
       }
-      if (zeroOrderList) {
-        // 双层循环查看每一个物料数量是否被填写
-        const isSubmit = zeroOrderList.every(item => {
-          return item.ParcelLisList.every(val => val.quantity);
-        });
-        if (!isSubmit)
-          return this.$message({
-            type: 'error',
-            message: '有零担物料未填写',
+      if (this.$route.query.type !== '2') {
+        if (zeroOrderList) {
+          // 双层循环查看每一个物料数量是否被填写
+          const isSubmit = zeroOrderList.every(item => {
+            return item.ParcelLisList.every(val => val.quantity);
           });
+          if (!isSubmit)
+            return this.$message({
+              type: 'error',
+              message: '有零担物料未填写',
+            });
+        }
       }
+
       this.$refs.form.validate(async valid => {
         if (valid) {
           if (!this.form.id) {
@@ -2575,6 +2614,8 @@ export default {
               this.$router.push(this.tagWel);
             });
           } else {
+            console.log('111 :>> ', 111);
+            // return
             let fei = new Map();
             this.bianLier(this.costListName, this.clientType, this.costList, fei);
             this.form.fei = Object.fromEntries(fei);
@@ -2632,24 +2673,47 @@ export default {
             } else {
               up.zeroType = '1';
             }
+            // 新增列表
             let _billPackageEntityList = [];
+            // 删除列表
+            let _unBillPackageEntityList = [];
             // submitFormData.billPackageEntityList
             this.dataList.forEach(val => {
-              console.log('val :>> ', val);
-              if (val.billPackageEntityList && val.billPackageEntityList.length !== 0)
-                _billPackageEntityList = [..._billPackageEntityList, ...val.billPackageEntityList];
+              if (val.originalIdList) {
+                val.billPackageEntityList.forEach(item => {
+                  // 新增
+                  if (!val.originalIdList.includes(item.parceListId)) {
+                    _billPackageEntityList.push(item);
+                  }
+                });
+                // 删除
+                val.originalList.forEach(item => {
+                  const _flag = val.billPackageEntityList.findIndex(
+                    value => value.parceListId === item.id
+                  );
+                  if (_flag === -1) {
+                    _unBillPackageEntityList.push({
+                      parceListId: item.id,
+                      stockArticleId: item.stockArticleId,
+                      packetBarCode: item.orderPackageCode,
+                    });
+                  }
+                });
+              }
             });
-            submitFormData.billPackageEntityList = _billPackageEntityList;
+
+            up.billPackageEntityList = _billPackageEntityList;
+            up.unBillPackageEntityList = _unBillPackageEntityList;
+
             update(up).then(() => {
-              // this.box = false;
-              // this.onLoad(this.page);
-              this.$message({
-                type: 'success',
-                message: '操作成功!',
-              });
-              this.$store.commit('DEL_TAG_CURRENT');
-              this.$router.push(this.tagWel);
+              // this.$message({
+              //   type: 'success',
+              //   message: '操作成功!',
+              // });
+              // this.$store.commit('DEL_TAG_CURRENT');
+              // this.$router.push(this.tagWel);
             });
+            return;
           }
         }
       });
@@ -2810,6 +2874,7 @@ export default {
       this.selectionList = [];
       // this.$refs.table.clearSelection();
     },
+    // 库存品新增 -- 页码改变
     currentChangeStock(currentPage) {
       this.pageStock.currentPage = currentPage;
       this.onLoadList(this.pageStock);
@@ -2818,6 +2883,15 @@ export default {
       this.pageStock.pageSize = pageSize;
       this.onLoadList(this.pageStock);
     },
+    // 定制品新增 -- 页码改变
+    currentChangeOrder(currentPage) {
+      this.pageOrder.currentPage = currentPage;
+      this.onLoadOrder(this.pageOrder);
+    },
+    sizeChangeOrder(pageSize) {
+      this.pageOrder.pageSize = pageSize;
+      this.onLoadOrder(this.pageOrder);
+    },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
@@ -2848,6 +2922,7 @@ export default {
     },
     //库存品
     onLoadList(page, params = {}) {
+      console.log('111 :>> ', 111);
       this.loading = true;
       let a = {};
       if (this.$route.query.type == '1') {
@@ -2855,8 +2930,10 @@ export default {
       } else if (this.$route.query.type === '2') {
         a = this.dataList[0];
       } else if (this.$route.query.type == '3') {
-        a = this.dataOrder[0];
+        a = this.dataList[0];
       }
+      console.log('a :>> ', a);
+      console.log(' this.dataOrder :>> ', this.dataOrder);
       // let a = this.dataList[0];
       if (!!a.mallId) {
         params.marketId = a.mallId;
@@ -2872,6 +2949,10 @@ export default {
           this.selectionClear();
         });
       } else {
+        this.$message({
+          type: 'warning',
+          message: '无法获取商场信息',
+        });
         this.loading = false;
         this.pageStock.total = 0;
       }
@@ -2880,7 +2961,7 @@ export default {
     onLoadOwn(page, params = {}) {
       this.loading = true;
       this.query.stockArticleIds = this.$route.query.id;
-      getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getListOwn(page.currentPage, page.pageSize, { ...params, ...this.query }).then(res => {
         const dataList = res.data.data;
         this.page.total = dataList.total;
         this.dataList = dataList.records;
@@ -2890,6 +2971,8 @@ export default {
     },
     // 开启修改零担弹框
     async handleZeroOrder(row) {
+      console.log('this.zeroOrderVisible :>> ', this.zeroOrderVisible);
+
       const handleParcelLisList = this.dataList.find(val => val.id === row.id).ParcelLisList;
       // 当此次为二次修改时, 不进行请求
       if (handleParcelLisList) {
@@ -2898,8 +2981,6 @@ export default {
         return;
       }
 
-      console.log('row :>> ', row);
-
       // 请求零担数据详情
       const res = await zeroMaterial({
         stockArticleId: row.id,
@@ -2942,6 +3023,18 @@ export default {
       // 关闭零担蒙层弹框
       this.dialogFormZeroOrderVisible = false;
     },
+    /**
+     * 显示维护在库零担数量
+     */
+    handleStockZeroOrder() {
+      this.zeroOrderVisible = true;
+      console.log('this.zeroOrderVisible :>> ', this.zeroOrderVisible);
+      console.log('111 :>> ', 111);
+    },
+    /**
+     * 在库零担维护提交
+     */
+    onSubmitZeroOrder() {},
   },
 };
 </script>

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -82,14 +82,17 @@
       <!--        </el-form>-->
       <!--      </el-row>-->
       <div class='el-zy-top'>
-      <el-row :gutter="24" class="rows">
-        <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <span>司机待签收数：{{ statistics.driverNub }}</span>
-        </el-col>
-        <el-col :xl="10" :lg="7" :md="8" :sm="24">
-          <span>文员待审核数：{{ statistics.clerkNub }}</span>
-        </el-col>
-      </el-row>
+
+          <div class="order-info">
+          <ul>
+            <li>
+              <img src="../../../../public/img/bg/Delivery.png" /> <span>司机待签收数：{{ statistics.driverNub }}</span>
+            </li>
+            <li>
+              <img src="../../../../public/img/bg/package.png" />    <span>文员待审核数：{{ statistics.clerkNub }}</span>
+            </li>
+          </ul>
+        </div>
 
       <el-row >
         <div class="avue-crud__header">
@@ -1610,4 +1613,40 @@ export default {
     align-items: flex-end
   }
 }
+.order-info {
+  margin-right: 3%;
+  ul {
+    list-style: none;
+    display: flex;
+    padding: 0;
+
+    li {
+      color: #172e60;
+      position: relative;
+      padding: 0 20px;
+      display: flex;
+      align-items: center;
+      font-weight: 500;
+      img {
+        margin-right: 4px;
+      }
+    }
+    li::after {
+      content: '';
+      display: block;
+      width: 0.10417vw;
+      height: 18px;
+      background-color: #dddbdb;
+      position: absolute;
+      top: 2px;
+      left: 0px;
+    }
+  }
+  li:first-child::after {
+    content: none;
+  }
+  li:first-child {
+    padding-left: 0;
+  }
+}
 </style>

src/views/distribution/turndelivery/devtmp.vue

@@ -274,7 +274,6 @@
                   <!-- 表格列开始 -->
                   <el-table
                     :data="dataInfo"
-                    :row-key="name"
                     border
                     :height="TabHeight + 'px'"
                     style="width: 100%"
@@ -329,7 +328,7 @@
                         </el-table-column>
                       </template>
 
-                      <template v-if="item.type === 3">
+                      <template v-if="item.type === 3 || item.isZero == '1'">
                         <el-table-column
                           v-if="item.head"
                           fixed="right"
@@ -337,7 +336,7 @@
                           width="280"
                           align="center "
                         >
-                          <template #default="scope">
+                          <template #default="props">
                             <div :class="ElBtnClass">
                               <el-button
                                 :link="ElButtonS[0].link"
@@ -345,26 +344,38 @@
                                 :auto-insert-space="ElButtonS[0].space"
                                 :size="ElButtonS[0].size"
                                 :icon="ElButtonS[0].icon"
-                                @click="DeleteEvent(scope.row)"
-                                >删除</el-button
+                                @click="ViewEvent(props.row)"
+                                >查看包件</el-button
                               >
-                              <!-- <el-button
-                              :link="ElButtonS[1].link"
-                              :class="ElButtonS[1].class"
-                              :auto-insert-space="ElButtonS[1].space"
-                              :size="ElButtonS[1].size"
-                              :icon="ElButtonS[1].icon"
-                              @click="EditEvent(scope.row)"
-                              >编辑</el-button
-                            > -->
                               <el-button
+                                v-if="props.row.isZero == '1'"
+                                :link="ElButtonS[1].link"
+                                :class="ElButtonS[1].class"
+                                :auto-insert-space="ElButtonS[1].space"
+                                :size="ElButtonS[1].size"
+                                :icon="ElButtonS[1].icon"
+                                @click="Entering(props.row)"
+                                >在库录入</el-button
+                              >
+                              <el-button
+                                v-if="props.row.isZero == '1'"
                                 :link="ElButtonS[2].link"
                                 :class="ElButtonS[2].class"
                                 :auto-insert-space="ElButtonS[2].space"
                                 :size="ElButtonS[2].size"
                                 :icon="ElButtonS[2].icon"
-                                @click="ViewEvent(scope.row)"
-                                >查看</el-button
+                                @click="QuantityEntry(props.row)"
+                                >数量录入</el-button
+                              >
+
+                              <el-button
+                                :link="ElButtonS[4].link"
+                                :class="ElButtonS[4].class"
+                                :auto-insert-space="ElButtonS[4].space"
+                                :size="ElButtonS[4].size"
+                                :icon="ElButtonS[4].icon"
+                                @click="DeleteEvent(props.row)"
+                                >删除</el-button
                               >
                             </div>
                           </template>
@@ -681,8 +692,10 @@
     </el-tabs>
     <!-- 弹窗组件 -->
     <div class="addlalog addlalogS">
-      <el-dialog v-model="SjTc" title="司机信息配置">
-        <el-table :data="DvInfoData" border style="width: 100%">
+      <!-- <el-dialog v-model="SjTc" title="司机信息配置"> -->
+      <el-dialog v-model="comprehensive" title="零担品类信息">
+        <!-- 司机信息弹窗  -->
+        <el-table v-if="SjTc" :data="DvInfoData" border style="width: 100%">
           <el-table-column prop="driverName" label="司机信息" />
           <el-table-column prop="vehicleNub" label="车辆信息" />
           <el-table-column label="操作">
@@ -691,17 +704,61 @@
             </template>
           </el-table-column>
         </el-table>
+
+        <!-- EnteringLibrary在库录入 -->
+        <div Class="iszer">
+          <!-- <span style="font-weight: bold; display: block; padding-bottom: 10px"
+            >在库总数:{{ dataInfo[dataId].handQuantity }}</span
+          > -->
+          <el-table v-if="EnteringLibrary" :data="isZeroTable" border style="width: 100%">
+            <el-table-column fixed prop="firsts" label="名称" />
+            <el-table-column prop="quantity" label="数量" />
+            <el-table-column prop="handQuantity" label="在库数量" />
+            <el-table-column prop="deliveryQuantity" label="冻结数量" />
+            <el-table-column prop="outboundQuantity" label="出库数量" />
+            <el-table-column label="可用数量">
+              <template #default="props">
+                <span>
+                  {{
+                    props.row.handQuantity - props.row.deliveryQuantity - props.row.outboundQuantity
+                  }}</span
+                >
+              </template>
+            </el-table-column>
+            <!-- 在库=冻结-出库 -->
+
+            <el-table-column fixed="right" label="数量操作">
+              <template #default="scope">
+                <el-input-number
+                  size="small"
+                  v-model="scope.row.number"
+                  :min="0"
+                  :max="scope.row.quantity"
+                  @change="isZeroNumber(scope.row)"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="isZel-btn">
+            <el-button v-if="!QuantityEntryStatus" color="#172e60" type="success" @click="ModifyLCL"
+              >修改(零担订单)</el-button
+            >
+            <el-button color="#172e60" type="success" @click="SubmitLoad">提交(零担订单)</el-button>
+          </div>
+        </div>
       </el-dialog>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, computed, watch, watchEffect } from 'vue';
+import { ref, reactive, onMounted, computed, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import {
   $_selectStockArticleInfoList,
   $_getPackageListByStockArticleId,
+  getZeroOrderDetail,
+  $_getDeliveryZeroOrderDetail,
 } from '@/api/distribution/distributionStockArticle'; //API
 import { getVehicleList } from '@/api/basicdata/basicdataVehicle'; //车辆信息
 import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; //司机信息
@@ -717,6 +774,7 @@ import {
 } from '@/api/distribution/distributionDeliveryList'; //数据回显
 import { getDictionaryBiz } from '@/api/system/dict'; //外协来源
 import type { FormProps } from 'element-plus';
+import { updateEntryNum, entryNum } from '@/api/distribution/distributionParcelNumber';
 const route = useRoute();
 const router = useRouter();
 // 选项卡
@@ -730,6 +788,7 @@ const numTab = ref([
     name: '1',
   },
 ]);
+const num = ref(null); //计步器
 const kind = ref(true); //标签切换
 const currentPage = ref(1); // 默认页码
 const pageSize = ref(20); // 默认每一页几条
@@ -775,6 +834,12 @@ const RouteId = ref(null); //编辑页面的ID参数
 const labelPosition = ref<FormProps['labelPosition']>('right');
 const SoInfoData = ref(); //搜索框
 const parameter = ref({}); //搜索框参数
+const wrapTemp = ref([]); //包件选中项暂存
+const EnteringLibrary = ref(true); //在库录入按钮
+const QuantityEntryS = ref(false); //数量录入按钮
+const isZeroTable = ref([]); //零担表格
+const comprehensive = ref(false); //司机,零担弹窗
+const QuantityEntryStatus = ref(false); //零担数量录入状态
 // 司机选择信息
 // 车辆选项
 // 备货人员
@@ -819,7 +884,8 @@ const StockInfo = ref({
 });
 
 const selectable = (row, index) => {
-  if (row.orderPackageReservationStatusName == '已预约') {
+  // row.orderPackageReservationStatusName == '已预约' ||
+  if (row.checked) {
     return false; //禁用状态
   } else {
     return true; //非禁用状态
@@ -975,12 +1041,27 @@ const ElButtonS = ref([
   // 3.size    按钮尺寸默认小尺寸('large'| 'default'| 'small')
   // 4.icon    按钮图标
   // 5.table   按钮名称
+
   {
-    class: 'el-btn-danger',
+    class: 'el-btn-view',
     space: true,
     size: 'small',
-    icon: 'el-icon-delete',
-    table: '删除',
+    icon: 'el-icon-view',
+    table: '查看',
+  },
+  {
+    class: 'el-btn-view',
+    space: true,
+    size: 'small',
+    icon: 'el-icon-view',
+    table: '在库录入',
+  },
+  {
+    class: 'el-btn-view',
+    space: true,
+    size: 'small',
+    icon: 'DataLine',
+    table: '数量录入',
   },
   {
     class: 'el-btn-success',
@@ -990,11 +1071,11 @@ const ElButtonS = ref([
     table: '编辑',
   },
   {
-    class: 'el-btn-view',
+    class: 'el-btn-danger',
     space: true,
     size: 'small',
-    icon: 'el-icon-view',
-    table: '查看',
+    icon: 'el-icon-delete',
+    table: '删除',
   },
 ]);
 // 菜单配置
@@ -1288,7 +1369,7 @@ const menuData = ref([
     label: '操作',
     type: 3,
     values: '',
-    width: '280',
+    width: '680',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1534,22 +1615,23 @@ async function OrderSelection(id, DataParameter) {
     genre: 1, //固定参数
     current: currentPage.value, //页码
     size: pageSize.value, //每一页条数
-    ...DataParameter,
+    ...DataParameter, //搜索参数
   }).then(res => {
     loading.value = false; //关闭加载效果
     data.value = res.data.data.records;
     // 根据选择的已经有的去匹配已经选择的数据勾选
-    console.log(kind.value, 'kind.value');
-
     let setIn = setTimeout(() => {
       dataInfo.value.forEach(val => {
-        tableRefs.value[id].toggleRowSelection(
-          data.value[data.value.findIndex(item => item.id === val.id)],
-          true
-        );
+        const index = data.value.findIndex(item => item.id === val.id);
+        if (index > -1) {
+          const item = data.value[index];
+          item.checked = true;
+          tableRefs.value[id].toggleRowSelection(item);
+        }
       });
-      clearTimeout(setIn); //清除定时器
-    }, 0);
+      clearTimeout(setIn); // 清除定时器
+    }, 1);
+
     //选中已经在订单列表中的数据
     // toggleSelection(false, dataId, data.value);
     console.log(
@@ -1571,7 +1653,9 @@ function dataTabInfo() {
 }
 // 点击新增获取在库订单信息
 const AddInfo = () => {
-  //   dataTmp.value = []; //清空暂存数据
+  dataTmp.value = [];
+  console.log('提交前的参数', dataInfo.value);
+  console.log('提交前前临时存储', dataTmp.value);
   AddLalog.value = true; //展开表单弹窗
   wrapLoading.value = false; //关闭包件弹窗信息
   dataTabInfo(); //请求数据
@@ -1605,41 +1689,80 @@ const selectAll = val => {
 };
 // 弹窗表格单个选中触发事件
 const selectChange = (selection, row) => {
-  // 1.selection 选中的数组
-  // 2.row 选中的当前行
-  //   数据编辑包件信息操作
-  selection.forEach(item => {
-    dataTmp.value.push(item);
-    dataTmp.value = [...new Set(dataTmp.value)];
-  });
-  console.log(dataTmp.value, '存储好的值');
+  //   把选择的数据放到临时存储里面
+  //   编辑状态
   if (RouteId.value) {
-    console.log(selection, 'selection信息');
-    let tmp = selection;
-    tmp = dataTmp.value;
-    dataTmp.value = tmp;
-    console.log(dataTmp.value, '存储好的值');
-
+    console.log(dataTmp, '当前选中的包件信息');
+    //   wrapLoading为真表示此时弹窗内容是包件信息
     if (wrapLoading.value) {
-      let packageListInfo = [];
-      packageListInfo = dataTmp.value;
-      console.log(dataId.value, 'dataId.value');
-      console.log(dataInfo.value[dataId.value], 'dataInfo.value[dataId.value]');
-      dataInfo.value[dataId.value].packageListInfo = dataTmp.value;
+      let packageListInfo = []; //定义参数名保存选中的订单
+      //   packageListInfo = dataTmp.value;//把临时存储的值赋值给需要提交的字段
+      dataTmp.value = selection; //当前选中的值给临时存储起来
+      //   dataTmp.value = dataInfo.value;
       console.log(dataInfo.value, '包件信息选中');
-      dataTmp.value = dataInfo.value;
+      console.log(dataId.value, '当前选中的订单ID下标');
+      console.log(dataInfo.value[dataId.value], '当前操作的订单');
     } else {
-      console.log('在库订单信息');
+      console.log('当前为在库订单信息');
+      //   dataTmp.value = selection; //选中信息暂存起来
+      selection.forEach(item => {
+        item.checked = true; //表示当前已经被选中了
+        dataTmp.value.push(item);
+      });
     }
+  } else {
+    // 新增状态
+    selection.forEach(item => {
+      item.checked = true; //表示当前已经被选中了
+      dataTmp.value.push(item);
+    });
   }
+};
 
-  //   wrapLoading为真表示此时弹窗内容是包件信息
-  //  新增包件信息修改
+// 弹窗确认表单信息展示
+const submit = () => {
+  // 当前为编辑状态
+  if (RouteId.value) {
+    if (!wrapLoading.value) {
+      dataTmp.value.forEach(item => {
+        dataInfo.value.push(item);
+      });
+      console.log(dataInfo.value, '要展示的值');
+      console.log('触发1');
+    } else {
+      // 编辑的时候需要带上这个参数存放订单下面的包件信息
+      let packageListInfo = [];
+      console.log('触发2');
+      dataInfo.value[dataId.value].packageListInfo = dataTmp.value; //把存在的值给当前订单下面
+      //   dataInfo.value[dataId.value].packageListInfo = wrapData.value;
+      wrapTemp.value[dataId.value] = dataTmp.value;
+      console.log(wrapTemp.value, '包件订单被缓存');
+      console.log(dataInfo.value[dataId.value].packageListInfo, '被添加到当前订单下面');
+      console.log(dataInfo.value, '所有订单信息');
+    }
+  } else {
+    // 新增订单
+    //选中好的订单提交到要展示的表格
+    dataTmp.value.forEach(item => {
+      dataInfo.value.push(item);
+    });
 
-  console.log(dataTmp.value, '暂存数据');
-  console.log(selection, '当前选中的信息');
+    console.log('提交后的参数', dataInfo.value);
+    console.log('提交后的临时存储', dataTmp.value);
+  }
+  // 展示的信息
+  dataInfo.value = removeDuplicates(dataInfo.value);
+  // 临时存储
+  dataTmp.value = removeDuplicates(dataTmp.value);
+  AddLalog.value = false; //关闭弹窗
 };
 
+// 订单数据去重
+function removeDuplicates(arr) {
+  const ids = arr.map(obj => obj.id);
+  return arr.filter((item, index) => ids.indexOf(item.id) === index);
+}
+
 // 删除触发事件
 const DeleteEvent = val => {
   // 接收点击删除当前行数据
@@ -1721,27 +1844,21 @@ const ViewEvent = val => {
       console.log(res, '订单包件信息');
       if (res.data.code == 200) {
         wrapData.value = res.data.data.data.packageList;
-
-        console.log(res, 'res,修改下的包件信息');
-        console.log(res.data.data.data, 'res.data.data.data.packageList');
-        if (res.data.data.data.packageListIds) {
-          if (kind.value) {
-            toggleSelection({
-              val: false,
-              data: res.data.data.data.packageListIds.split(','),
-              index: 0,
-            }); //编辑的时候选中已有的数据
-          } else {
-            toggleSelection({
-              val: false,
-              data: res.data.data.data.packageListIds.split(','),
-              index: 1,
-            }); //编辑的时候选中已有的数据
-          }
+        let IdTmp = []; //订单ID暂存
+        dataInfo.value[dataId.value].packageListInfo = wrapTemp.value[dataId.value];
+        //查看当前订单下面包件是缓存值,如果有就读取缓存值,否则就是第一次加载,使用API返回值
+        if (dataInfo.value[dataId.value].packageListInfo) {
+          dataInfo.value[dataId.value].packageListInfo.forEach(item => {
+            IdTmp.push(item.id);
+          });
         }
+        toggleSelection({
+          val: false,
+          data: IdTmp.length ? IdTmp : res.data.data.data.packageListIds.split(','),
+          index: kind.value ? 0 : 1,
+        }); //编辑的时候选中已有的数据
       }
       // AddLalog.value = false; //关闭弹窗
-      editLoading.value = false; //关闭加载效果
       console.log(wrapData.value, '包件表格信息');
       console.log(res);
     });
@@ -1759,19 +1876,73 @@ const ViewEvent = val => {
         toggleSelection({ index: 1 }); //外协下面包件全选
       }
       console.log(tableRefs, 'tableRefs');
-
       console.log(res.data.data.records, '查看下面的包件');
     });
     // 新增 查看订单流程
     console.log('当前为新增状态');
     console.log(val, val.id, '查看包件事件');
     //临时存储下标用于查询包件对应的下标
-
     console.log(dataId.value, 'dataId.value下标');
     console.log(wrapDataInfo.value[dataId.value], '当前订单下面的包件信息');
     console.log(wrapDataInfo, '订单');
-    editLoading.value = false; //关闭加载效果
   }
+  editLoading.value = false; //关闭加载效果
+};
+
+// 在库录入
+const Entering = val => {
+  dataId.value = findIndexById(val.id); //记录当前点击的订单
+  comprehensive.value = true; //开启弹窗
+  EnteringLibrary.value = true; //显示零担
+  QuantityEntryStatus.value = false; //关闭零担录入
+  console.log('在库录入', val);
+
+  getZeroOrderDetail(val.id).then(res => {
+    console.log(res, '在库录入返回信息');
+    isZeroTable.value = res.data.data;
+  });
+};
+// 数量录入
+const QuantityEntry = val => {
+  dataId.value = findIndexById(val.id); //记录当前点击的订单
+  comprehensive.value = true; //开启弹窗
+  QuantityEntryStatus.value = true; //此时开启零担录入
+  EnteringLibrary.value = true; //显示零担
+  getZeroOrderDetail(val.id).then(res => {
+    console.log(res, '数量录入返回信息');
+    isZeroTable.value = res.data.data;
+  });
+};
+// 修改零担数量
+const ModifyLCL = () => {
+  updateEntryNum(isZeroTable.value).then(res => {
+    console.log(res, '修改零担');
+    console.log(isZeroTable.value, '修改零担的值');
+  });
+  comprehensive.value = false; //开启弹窗
+  QuantityEntryStatus.value = false; //此时开启零担录入
+  EnteringLibrary.value = false; //显示零担
+};
+// 零担提交
+const SubmitLoad = () => {
+  // 新增订单
+  // QuantityEntryStatus为真表示此时此刻操作的是数量录入提交
+  if (QuantityEntryStatus.value) {
+    dataInfo.value[dataId.value].parcelListVOS = isZeroTable.value;
+    console.log(dataInfo.value[dataId.value], '当前零担信息');
+  }
+  entryNum(isZeroTable.value).then(res => {
+    console.log(res, '提交零担');
+    console.log(isZeroTable.value, '提交零担的值');
+  });
+  comprehensive.value = false; //关闭弹窗
+  EnteringLibrary.value = false; //关闭零担
+  QuantityEntryStatus.value = false; //此时开启零担录入
+};
+// 零担数量操作
+const isZeroNumber = val => {
+  console.log(val, '当前操作数据');
+  val.number = val.number;
 };
 // 刷新功能触发事件
 const refresh = () => {
@@ -2002,6 +2173,7 @@ const merge = (val, kindS) => {
   if (val == 'submit') {
     return;
   }
+  comprehensive.value = true; //开启弹窗
   SjTc.value = true;
 };
 
@@ -2034,26 +2206,7 @@ const moveUpVehictle = row => {
   DataSubmit.value.masterDriverName = DvInfoData.value[0].driverName; //主司机
   DataSubmit.value.masterVehicleNub = DvInfoData.value[0].vehicleNub; //主车牌
 };
-// 弹窗确认表单信息展示
-const submit = () => {
-  // 当前为编辑状态
-  if (RouteId.value) {
-    if (!wrapLoading.value) {
-      dataInfo.value = dataTmp.value; //选中好的订单提交到要展示的表格
-      console.log(data.value, '准备好的值');
-    } else {
-      // 编辑的时候需要带上这个参数存放订单下面的包件信息
-      let packageListInfo = [];
-      dataInfo.value[dataId.value].packageListInfo = wrapData.value;
 
-      console.log(dataInfo.value[dataId.value].packageListInfo, '被添加到当前订单下面');
-    }
-  } else {
-    // 新增订单
-    dataInfo.value = dataTmp.value; //选中好的订单提交到要展示的表格
-  }
-  AddLalog.value = false; //关闭弹窗
-};
 // 最后提交订单
 const SubmitCommercial = () => {
   //   kind为假就说明目前是在外协页面
@@ -2067,9 +2220,15 @@ const SubmitCommercial = () => {
   if (!state.value) {
     return;
   }
+  // 如果订单下面没有选择包件就默认给每个订单包件下面添加packageListInfo字段为空数组
+  dataInfo.value.forEach(item => {
+    if (!item.packageListInfo) {
+      item.packageListInfo = [];
+    }
+  });
   DataSubmit.value.stockArticle = dataInfo.value; //订单列表
   // 提交
-  //   编辑修改
+  // 编辑修改
   if (RouteId.value) {
     if (!kind.value) {
       delete DataSubmit.value.allocationInfo; //如果为外协删掉此参数
@@ -2297,9 +2456,11 @@ const SubmitCommercial = () => {
       }
     }
   }
+
   // 新增数据弹窗组件样式
   :deep(.addlalog) {
     // 弹窗
+
     .el-dialog__header {
       border-bottom: 1px solid #172e607d;
       margin-right: 0;
@@ -2313,6 +2474,7 @@ const SubmitCommercial = () => {
         transition: transform 1s;
       }
     }
+
     .el-dialog__header button:hover {
       i {
         transform: rotate(360deg);
@@ -2611,4 +2773,17 @@ const SubmitCommercial = () => {
     margin-top: 18px;
   }
 }
+.iszer {
+  :deep(.cell) {
+    display: flex;
+    padding: 0;
+    align-items: center;
+    justify-content: center;
+  }
+  .isZel-btn {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 26px;
+  }
+}
 </style>

vite.config.js

@@ -20,8 +20,8 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.75:8777',
           // tjj
-          target: 'http://192.168.10.29:13000',
-          // target: 'http://test.api.huitongys.com',
+          // target: 'http://192.168.10.29:13000',
+          target: 'http://test.api.huitongys.com',
           // target: 'http://h5uapi.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),