配送商配新增统计

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -327,7 +327,7 @@
                                   ? 'static-class'
                                   : ''
                               "
-                              >{{ props.row[item.prop]!=null ? props.row[item.prop] : '/' }}</span
+                              >{{ props.row[item.prop] != null ? props.row[item.prop] : '/' }}</span
                             >
                           </template>
                         </el-table-column>
@@ -404,15 +404,21 @@
                   </el-table>
                   <div class="el-Cart-button-btn">
                     <div class="el_tool">
-                      已选择:{{dataInfo.length}}条 
+                      已选择:{{ dataInfo.length }}条
-                    
+
                       <div>
                         <span>合计:</span>
-                      <span>订单总件数: <span style="color: #67c23a;">{{Totalnumberoforders}} </span> </span>
+                        <span
-                      <span style=" margin: 0 4px;"></span>
+                          >订单总件数:
-                      <span>在库总件数: <span style="color: #67c23a;"> {{Totalnumberofitemsinstock}}</span></span>
+                          <span style="color: #67c23a">{{ Totalnumberoforders }} </span>
-                    </div>  
+                        </span>
-                    </div>  
+                        <span style="margin: 0 4px"></span>
+                        <span
+                          >在库总件数:
+                          <span style="color: #67c23a"> {{ Totalnumberofitemsinstock }}</span></span
+                        >
+                      </div>
+                    </div>
                     <el-button type="primary" @click="SubmitCommercial"
                       ><el-icon><Select /></el-icon>提交(商配订单)</el-button
                     >
@@ -630,6 +636,18 @@
                     </el-table>
                     <!-- 表格翻页功能 -->
                     <div class="demo-pagination-block TCdemo-pagination-block">
+                      <div class="statistics">
+                        <span> 订单总件数：</span>
+                        <span>
+                          {{ totolOrderNum }}
+                        </span>
+
+                        <span> 在库件数：</span>
+                        <span>
+                          {{ inStockNum }}
+                        </span>
+                      </div>
+
                       <el-pagination
                         v-model:current-page="currentPage"
                         v-model:page-size="pageSize"
@@ -857,8 +875,8 @@ const numTab = ref([
   },
 ]);
 const num = ref(null); //计步器
-const Totalnumberoforders=ref(0);//订单总件数
+const Totalnumberoforders = ref(0); //订单总件数
-const Totalnumberofitemsinstock =ref(0);//在库件数
+const Totalnumberofitemsinstock = ref(0); //在库件数
 const kind = ref(true); //标签切换
 const currentPage = ref(1); // 默认页码
 const pageSize = ref(20); // 默认每一页几条
@@ -919,6 +937,27 @@ const soInpuState = ref(false); //搜索框状态表示当前没有搜索
 const statisticsList = ref([]); //需要统计的字段
 const inputValue = ref('number'); //零担输入的值
 const dataInfoID = ref(); //点击删除保存当前ID
+
+/** 在库件数 */
+const inStockNum = ref(0);
+
+/** 订单总件数 */
+const totolOrderNum = computed(() => {
+  const _arr = [...new Set(dataTmp.value), ...dataInfo.value];
+
+  let _total = 0;
+
+  let _handQuantity = 0;
+
+  for (const iterator of _arr) {
+    _total += iterator.totalNumber;
+    _handQuantity += iterator.handQuantity;
+  }
+
+  inStockNum.value = _handQuantity;
+  return _total;
+});
+
 // 司机选择信息
 // 车辆选项
 // 备货人员
@@ -1237,7 +1276,7 @@ const menuData = ref([
     statistics: true, //开启统计
   },
   {
-    prop: 'handQuantity',  
+    prop: 'handQuantity',
     label: '在库件数',
     type: 1,
     values: '',
@@ -1747,7 +1786,7 @@ onMounted(() => {
       DataSubmit.value.stockup.stockupDate = res.data.data.stockupInfo.stockupDate; //备货时间
       DataSubmit.value.taskTime = res.data.data.taskTime; //配送日期
       editLoading.value = false; //所有信息获取完成关闭弹窗
-      tooSUM()
+      tooSUM();
     });
   }
 });
@@ -1883,14 +1922,14 @@ const selectChange = (selection, row) => {
     }
   }
 };
-function tooSUM(){
+function tooSUM() {
-  Totalnumberoforders.value=0
+  Totalnumberoforders.value = 0;
-  Totalnumberofitemsinstock.value=0
+  Totalnumberofitemsinstock.value = 0;
-  dataInfo.value.forEach(item=>{
+  dataInfo.value.forEach(item => {
-    Totalnumberoforders.value+= item.totalNumber,
+    (Totalnumberoforders.value += item.totalNumber),
-    Totalnumberofitemsinstock.value+=item.handQuantity
+      (Totalnumberofitemsinstock.value += item.handQuantity);
-  })
+  });
-};
+}
 // 弹窗确认表单信息展示
 const submit = () => {
   // 当前为编辑状态
@@ -1932,7 +1971,7 @@ const submit = () => {
   // 展示的信息
   dataInfo.value = removeDuplicates(dataInfo.value);
   // 计算总数
-  tooSUM()
+  tooSUM();
   // 临时存储
   dataTmp.value = removeDuplicates(dataTmp.value);
   AddLalog.value = false; //关闭弹窗
@@ -2042,7 +2081,6 @@ const SearchFu = () => {
 
 // 删除触发事件
 const DeleteEvent = val => {
-  
   if (route.query.id) {
     // 判断是否为编辑
     let data = {
@@ -2101,7 +2139,7 @@ const DeleteEvent = val => {
       });
     }
   }
-  tooSUM()
+  tooSUM();
 };
 // 编辑触发事件
 const EditEvent = val => {
@@ -2207,7 +2245,7 @@ const PackageFn = () => {
 
 // 查看包件事件
 const ViewEvent = val => {
-  wrapData.value=[]
+  wrapData.value = [];
   loading.value = true; //开启加载效果
   PackageFrom.value = {}; //清空订单搜索参数
   parameter.value = {}; //清空包件搜索
@@ -2737,7 +2775,7 @@ const SubmitCommercial = () => {
       editLoading.value = false; //关闭提交加载
       console.log(res, '修改之后提交的返回值');
       $store.commit('DEL_TAG_CURRENT'); //关闭当前页面
-      router.push('/distribution/inventory/distrilbutionBillLadingList');
+      router.back();
     });
   } else {
     // 新增信息
@@ -2747,7 +2785,7 @@ const SubmitCommercial = () => {
       //   提交之后进行跳转
       editLoading.value = false; //关闭提交加载
       $store.commit('DEL_TAG_CURRENT'); //关闭当前页面
-      router.push('/distribution/inventory/distrilbutionBillLadingList');
+      router.back();
     });
   }
 
@@ -3315,11 +3353,11 @@ const SubmitCommercial = () => {
     justify-content: flex-start !important;
   }
 }
-.el_tool{
+.el_tool {
-    display: flex;
+  display: flex;
-    justify-content: space-between;
+  justify-content: space-between;
-    align-items: center;
+  align-items: center;
-    min-width: 300px;
+  min-width: 300px;
-    font-size: 14px;
+  font-size: 14px;
 }
 </style>