新增表格勾选统计

src/components/tablecmt/tablecmt.vue

@@ -170,6 +170,14 @@
         </template>
       </el-table-column>
     </el-table>
+    <!-- 勾选合计行 -->
+    <div class="selection-total-row" v-if="shownm">
+      <span>勾选合计:</span>
+      <span v-for="item in selectCount">
+        <span style="margin: 0 5px">{{ item.label + ':' }}</span>
+        <el-text type="success">{{ item.value }}</el-text>
+      </span>
+    </div>
   </div>
 </template>
 
@@ -321,6 +329,9 @@ let props = defineProps({
     default: null,
   },
 });
+/** 勾选数据统计 */
+const selectCount = ref([]);
+
 // row, column, rowIndex, columnIndex
 let selectarr = ref([]);
 /** 设置每行颜色 */
@@ -465,8 +476,17 @@ function timechange(value, column: TableColumnType) {
   emit('timeCheck', value, column);
 }
 const handleSelectionChange = (param: TableDataType[]) => {
-  // console.log(param)
+  // 重置数据
+  selectCount.value.forEach(item => {
+    item.value = 0;
+  });
+
   selectarr.value = param;
+  selectarr.value.forEach(val => {
+    selectCount.value.forEach(
+      item => (item.value += computeNumber(item.value, '+', val[item.prop]).result)
+    );
+  });
   emit('selection', param);
 };
 function inputclear(value, column: TableColumnType) {
@@ -480,20 +500,26 @@ function timeclear(value, column: TableColumnType) {
 }
 function handleDelete(index: number, row: TableDataType) {}
 const getSummaries = (param: any) => {
+  selectCount.value = [];
   const { columns, data } = param;
   let newarr = [];
   let tji = 0;
-  columns.map((item, index) => {
+  columns.forEach((item, index) => {
     if (index == 0) {
       newarr[index] = '总计';
       return;
     }
     tji = 0;
     if (props.columnList[index]?.isshowSummary) {
-      data.map(ite => {
+      for (let ite of data) {
         tji = computeNumber(tji, '+', Number(ite[props.columnList[index]?.prop] || 0)).result;
-      });
+      }
       newarr[index] = tji;
+      selectCount.value.push({
+        label: props.columnList[index]?.label,
+        value: 0,
+        prop: props.columnList[index]?.prop,
+      });
       // shownm.value=true
     } else {
       newarr[index] = null;
@@ -592,6 +618,11 @@ defineExpose({ handleCheckSelect });
   --el-table-row-hover-bg-color: #d3832a;
 }
 
+// 勾选合计行
+.selection-total-row {
+  margin: 10px 0 5px;
+  font-size: 14px;
+}
 // .el-table .warning-row {
 //   --el-table-tr-bg-color: var(--el-color-warning-light-9);
 // }
@@ -600,10 +631,8 @@ defineExpose({ handleCheckSelect });
 // }
 .maboxhi {
   width: 100%;
-  // min-height: 950px;
-  // height: 841px;
-  // flex:1;
-  // min-height: 100%;
+  display: flex;
+  flex-direction: column;
 }
 .on {
   overflow: hidden;

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -1468,10 +1468,10 @@ export default {
   align-items: flex-end;
   justify-content: flex-end;
 }
-:deep(.maboxhi) {
-  height: 100% !important;
-}
-.el_tabBK {
-  height: 70%;
-}
+// :deep(.maboxhi) {
+//   height: 100% !important;
+// }
+// .el_tabBK {
+//   // height: 70%;
+// }
 </style>

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -162,9 +162,6 @@
           </tablecmt>
         </div>
 
-        <!-- 勾选合计 -->
-        <div></div>
-        
         <div class="el-fx-btn">
           <div class="el_fontsize" style="font-size: 14px">
             勾选数量: {{ selectionList.length }}
@@ -866,7 +863,7 @@ export default {
       const elNode = this.$refs.tableNode.$el;
       // getWinHeight
       console.log('getWinHeight() :>> ', getWinHeight());
-      setNodeHeight(elNode, getWinHeight() - elNode.getBoundingClientRect().top - 80 + 'px');
+      setNodeHeight(elNode, getWinHeight() - elNode.getBoundingClientRect().top - 60 + 'px');
     },
 
     //tabs切换

src/views/distribution/reservation/reservation.vue

@@ -228,14 +228,6 @@
                   </el-text>
                 </template>
               </tablecmt>
-
-              <div style="zoom: 0.9; margin-top: 10px">
-                <span> 勾选合计: </span>
-
-                <span>
-                  预约包件数: <el-text type="success">{{ totalObj.checkReservationNum }}</el-text>
-                </span>
-              </div>
             </div>
           </div>
         </el-tab-pane>
@@ -341,7 +333,6 @@ import {
   patchPrintList,
   reservationExport,
 } from '@/api/distribution/distributionReservation';
-import option from '@/option/distribution/distributionReservation';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { addAssign, getListUser } from '@/api/distribution/distributionStockup';
@@ -828,8 +819,6 @@ export default {
       cancel: {},
       // 选择行
       selectionList: [],
-      // 表单配置
-      option: option,
       // 表单列表
       data: [],
       /** 全部数据 */
@@ -858,11 +847,6 @@ export default {
       orderStatus: 'all',
       unconfirmedList: null,
       confirmedList: null,
-      /** 合计 */
-      totalObj: {
-        /** 被选中的预约包件数 */
-        checkReservationNum: 0,
-      },
     };
   },
   watch: {
@@ -1462,14 +1446,6 @@ export default {
     },
     selectionChange(list) {
       this.selectionList = list;
-      // 重置统计数据
-      for (let key in this.totalObj) {
-        this.totalObj[key] = 0;
-      }
-      // 计算合计
-      this.selectionList.forEach(val => {
-        this.totalObj.checkReservationNum += val.reservationNum;
-      });
     },
     selectionClear() {
       this.selectionList = [];

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -157,7 +157,13 @@
         >
           <template #default="slotProps">
             <template
-              v-if="slotProps.scope.column.label === '配送件数' || '装车件数' || '签收数'|| '未签收数'|| '未装车件数'"
+              v-if="
+                slotProps.scope.column.label === '配送件数' ||
+                '装车件数' ||
+                '签收数' ||
+                '未签收数' ||
+                '未装车件数'
+              "
             >
               <el-text @click="InformationViewing(slotProps.scope)">
                 <!-- {{slotProps.scope.row.reservationNum}} -->
@@ -168,9 +174,9 @@
                     ? slotProps.scope.row.loadedNumber
                     : slotProps.scope.column.label === '签收件数'
                     ? slotProps.scope.row.receivedQuantity
-                    :slotProps.scope.column.label === '未签收件数'
+                    : slotProps.scope.column.label === '未签收件数'
                     ? slotProps.scope.row.unreceivedQuantity
-                    :slotProps.scope.column.label === '未装车件数'
+                    : slotProps.scope.column.label === '未装车件数'
                     ? slotProps.scope.row.unloadedNumber
                     : ''
                 }}
@@ -507,22 +513,16 @@
     <!--        </template>-->
   </el-dialog>
 
-
-
-  <el-dialog
-          :title="numberTitle"
-          v-model="numberDetailDialogVisible"
-          width="70%"
-          >
+  <el-dialog :title="numberTitle" v-model="numberDetailDialogVisible" width="70%">
     <tablecmt
-            :columnList="numberDetailColumnList"
-            :tableData="numberDetailData"
-            :loading="loading"
-            @inputTxt="inputsc"
-            @timeCheck="timesc"
-            @btnCheck="btnsc"
-            @selectCheck="selectsc"
-            @selection="selectionsc"
+      :columnList="numberDetailColumnList"
+      :tableData="numberDetailData"
+      :loading="loading"
+      @inputTxt="inputsc"
+      @timeCheck="timesc"
+      @btnCheck="btnsc"
+      @selectCheck="selectsc"
+      @selection="selectionsc"
     >
     </tablecmt>
 
@@ -532,18 +532,19 @@
 </template>
 
 <script>
-  import {
-    getList,
-    getDetail,
-    add,
-    update,
-    remove,
-    getPage,
-    getstatistics,
-    loadingAbnormalPackageListDetail,
-    loadingAbnormalPackageListAuditing,
-    getSignforExport, numberDetail
-  } from '@/api/distribution/distributionSignfor';
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getPage,
+  getstatistics,
+  loadingAbnormalPackageListDetail,
+  loadingAbnormalPackageListAuditing,
+  getSignforExport,
+  numberDetail,
+} from '@/api/distribution/distributionSignfor';
 import { update as updatesign } from '@/api/distribution/distributionSignfor';
 import option from '@/option/distribution/distributionSignfor';
 import { mapGetters } from 'vuex';
@@ -568,8 +569,8 @@ export default {
       dialogVisibleC: false,
       dialogVisibleD: false,
       dialogVisibleE: false,
-      numberDetailDialogVisible:false,
-      numberTitle:'',
+      numberDetailDialogVisible: false,
+      numberTitle: '',
       TcForm: {}, //弹窗表单
       // 上门照
       DoorstepPhoto: [],
@@ -857,6 +858,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {
@@ -867,6 +869,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -877,6 +880,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -887,6 +891,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -896,6 +901,7 @@ export default {
           values: '',
           width: '130',
           checkarr: [],
+          isshowSummary: true,
           fixed: false,
           sortable: true,
         },
@@ -1138,7 +1144,7 @@ export default {
         },
         // 更多列的配置...
       ],
-      numberDetailData:[],
+      numberDetailData: [],
       // 表单配置
       signoption: {
         height: 'auto',
@@ -1800,31 +1806,30 @@ export default {
           type = 1;
           console.log('查看配送件数');
           break;
-          case '装车件数':
-            type = 2;
-            this.numberTitle = '装车详情列表';
-            break;
-          case '未装车件数':
-            type = 3;
-            this.numberTitle = '未装车详情列表';
+        case '装车件数':
+          type = 2;
+          this.numberTitle = '装车详情列表';
+          break;
+        case '未装车件数':
+          type = 3;
+          this.numberTitle = '未装车详情列表';
           break;
-          case '签收件数':
-            type = 4;
-            this.numberTitle = '签收详情列表';
+        case '签收件数':
+          type = 4;
+          this.numberTitle = '签收详情列表';
           break;
-          case '未签收件数':
-            type = 5;
-            this.numberTitle = '未签收详情列表';
+        case '未签收件数':
+          type = 5;
+          this.numberTitle = '未签收详情列表';
           break;
       }
 
-      numberDetail(row.row.id,type).then(res=>{
+      numberDetail(row.row.id, type).then(res => {
         this.numberDetailDialogVisible = true;
         const data = res.data.data;
         this.numberDetailData = data;
-        console.log('res--------->',res);
-      })
-
+        console.log('res--------->', res);
+      });
     },
     handlePictureCardPreview(uploadFile) {
       console.log(uploadFile);
@@ -2461,7 +2466,6 @@ export default {
   flex-direction: column;
 }
 .el-fy {
-  flex: 1;
   display: flex;
   align-items: flex-end;
 }

src/views/warehouse/warehouseWaybill.vue

@@ -68,7 +68,7 @@
           </template>
         </tablecmt>
       </el-row>
-      <el-row class='el-fy'>
+      <el-row class="el-fy">
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
@@ -589,6 +589,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -599,6 +600,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -610,6 +612,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {
@@ -621,6 +624,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {
@@ -654,6 +658,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {
@@ -1401,8 +1406,7 @@ export default {
   flex-direction: column;
 }
 .el-fy {
-  flex: 1;
   display: flex;
-align-items: flex-end;
+  align-items: flex-end;
 }
 </style>

vite.config.js

@@ -24,8 +24,8 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.10.25:13000',
-          // target: 'http://192.168.10.25:2888',
-        // target: 'http://192.168.6.122:8777',
+          // target: 'http://192.168.10.57:13000',
+          // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.6.116:8777',
           // tjj
           // sst