增加合包列表的展示

src/views/emis/emisTmsPack/packageManagement.vue

@@ -288,6 +288,7 @@
             :height="(slotProps.contentHeight-200)+'px'"
             border stripe
             size="small"
+            ref="table"
             :data="emisTmsPackList"
             :showSearch.sync="showSearch"
             :queryParams="queryParams"
@@ -977,18 +978,34 @@ export default {
           break;
       }
     },
-    async expandChange(row){
-      // row.packNo
-      this.emisTmsDonePackList=[];
-      let resList = await listEmisTmsPackDtl({packNo: row.packNo});
-      if(!resList || resList.code != 200){
-        this.$message.error(resList && resList.msg || "未知错误");
+    expandChange(row, expandedRows){
+      if(expandedRows.length==0){// 没有扩展的行
+        this.currentExpandedRow = null;
         return;
       }
-      // this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
-      // this.tempCoPackInfo = resData;
-      for(let p = 0; p < resList.rows.length;p++){
-        this.emisTmsDonePackList.push(resList.rows[p].waybillDetail);
+      if(this.currentExpandedRow && expandedRows.length == 1 && expandedRows[0].packNo == this.currentExpandedRow.packNo){// 已经查询过了
+        return;
+      }
+      this.loading = true;
+      this.currentExpandedRow = row;
+      this.emisTmsDonePackList=[];
+      listEmisTmsPackDtl({packNo: row.packNo}).then(resList => {
+        if(!resList || resList.code != 200){
+          this.$message.error(resList && resList.msg || "未知错误");
+          return;
+        }
+        for(let p = 0; p < resList.rows.length;p++){
+          this.emisTmsDonePackList.push(resList.rows[p].waybillDetail);
+        }
+        this.doneTotal = resList.total;
+        this.loading = false;
+      });
+      if(expandedRows.length > 1){
+        for(let i = 0; i < expandedRows.length; i++){
+          if(row.packNo != expandedRows[i].packNo){
+            this.$refs.table.$refs.table.$refs.elTable.toggleRowExpansion(expandedRows[i], false);
+          }
+        }
       }
     },
     donothing(){

src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue

@@ -285,6 +285,9 @@
             </el-table-column>
           </XdTable>
         </el-tab-pane>
+        <el-tab-pane label="合包列表" name="fourth">
+          <packListView ref="packListView" :propParams="queryParams" :slotProps="slotProps"></packListView>
+        </el-tab-pane>
         <el-tab-pane label="批次列表" name="third">
           <XdTable v-loading="loading"
             :height="(slotProps.contentHeight-200)+'px'"
@@ -846,9 +849,11 @@ import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import { parseTime, dateToStr } from "@/utils/custom";
 import { formatSearchStr } from '@/utils/index'
 
+import PackListView from '@/views/emis/emisTmsSiteBatch/packListView';
+
 export default {
   name: "CenterGenBatchMgnt",
-  components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
+  components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView},
   dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status'],
   data() {
     return {
@@ -1018,6 +1023,9 @@ export default {
           this.waitPackList=[];
           this.getList();
           break;
+        case 'fourth':
+          this.waitPackList=[];
+          this.$refs.packListView.getList();
         default:
           break;
       }
@@ -1712,6 +1720,23 @@ export default {
           }
           this.emisCoPackDetail.push(this.waitPackList[p]);
         }
+      }else if(this.activeName=="fourth"){
+        // let firstItemCountry = this.waitPackList.length > 0 ? this.waitPackList[0].receiveCountry : '';
+        // // 将选中的“待组批次”的运单 置为 追加的运单号
+        // for(let p = 0; p < this.waitPackList.length;p++){
+        //   if(this.waitPackList[p].receiveCountry != firstItemCountry){
+        //     this.$message.error("存在了不同的目的国家！");
+        //     this.emisCoPackDetail=[];
+        //     return ;
+        //   }
+        //   this.emisCoPackDetail.push(this.waitPackList[p]);
+        // }
+        let res = this.$refs.packListView.getPackBillList();
+        if(res.code == -1){
+          this.$message.error(res.message);
+          return;
+        }
+        this.emisCoPackDetail = [...res.list];
       }
       this.tempExistCoPackWayBillList = [];// 清空临时保存的已有运单号
       this.tempCoPackInfo={};

src/views/emis/emisTmsSiteBatch/packListView.vue

@@ -0,0 +1,367 @@
+<template>
+    <div slot="pageContent">
+        <XdTable v-loading="loading"
+            :height="(slotProps.contentHeight-200)+'px'"
+            border stripe
+            ref="table"
+            size="small"
+            :data="emisTmsPackList"
+            showSearch.sync="false"
+            :queryParams="queryParams"
+            :total="total"
+            :showRightButton="false"
+            @queryTable="getList"
+            @selection-change="handleSelectionChange"
+            @expand-change="expandChange"
+            :row-class-name="disabledRow"
+        >
+            <el-table-column type="selection" width="55" align="center">
+            </el-table-column>
+            <el-table-column type="expand">
+              <template slot-scope="scope">
+                <XdTable v-loading="loadingDone"
+                  height="200px"
+                  style="margin-left: 5%;width:90%;"
+                  border stripe
+                  size="small"
+                  :data="emisTmsDonePackList"
+                  showSearch.sync="false"
+                  :queryParams="queryDoneParams"
+                  :total="doneTotal"
+                  :showRightButton="false"
+                  @queryTable="handleQueryDone"
+                  @selection-change="handleDoneSelectionChange"
+                >
+                  <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
+                  <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
+                  <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
+                  <el-table-column :label="$t('扫描状态')" align="center" prop="waybillStatus" width="100" >
+                    <template slot-scope="scope">
+                      <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
+                  <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
+                  <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
+                  <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
+                  <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
+                    <template slot-scope="scope">
+                      <span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
+                  <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
+                  <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
+                  <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
+                  <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
+                  <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150" />
+                  <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
+                  <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
+                    <template slot-scope="scope">
+                      <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
+                    <template slot-scope="scope">
+                      <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
+                  <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
+                  <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.sendCompany }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.remark }}</span>
+                    </template>
+                  </el-table-column>
+                </XdTable>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
+            <el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('操作网点')" align="center" prop="createSiteName" min-width="100" />
+            <el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.blUnpack == "1" ? "是" : "否" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('操作员')" align="center" prop="createByName" min-width="150" />
+            <el-table-column :label="$t('票数')" align="center" prop="totalWaybillQty" min-width="100" />
+            <el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" min-width="100" />
+            <el-table-column :label="$t('实际重量')" align="center" prop="totalWeight" min-width="100" />
+            <el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="100" />
+            <el-table-column :label="$t('创建时间')" align="center" prop="packDate" min-width="170" />
+        </XdTable>
+    </div>
+</template>
+
+<script>
+import { listEmisTmsPack, getPackNo, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, updateEmisTmsPack } from "@/api/emis/emisTmsPack";
+import { listEmisTmsPackDtl, delEmisTmsPackDtl, addEmisTmsPackDtl } from "@/api/emis/emisTmsPackDtl";
+import { parseTime, dateToStr } from "@/utils/custom";
+import { formatSearchStr } from '@/utils/index'
+import { PageSizes } from "pdf-lib";
+
+export default {
+  name: "PackListView",
+  props:{
+    propParams: {},
+    slotProps: {}
+  },
+  dicts: [],
+  data() {
+    return {
+      loading: false,
+      loadingDone: false,
+      total: 0,
+      doneTotal: 0,
+
+      // TMS合包表格数据
+      emisTmsPackList: [],
+
+      canSelectList: [],// 被选中的合包列表
+
+      queryParams:{},
+
+      selection:[],// 选中的合包
+
+      // 合包明细
+      emisTmsDonePackList:{},
+
+      currentExpandedRow: null,
+
+      // 查询参数
+      queryDoneParams: {
+        pageNum: 1,
+        pageSize: 20,
+        packNo: null,
+        params:{}
+      },
+
+    };
+  },
+  created() {
+    // this.initData();
+  },
+  watch: {
+    "propParams": {
+      handler (newValue, oldValue) {
+        this.queryParams = newValue;
+        // this.initData();
+      },
+      deep: true
+    }
+  },
+  methods: {
+    disabledRow({ row }) {
+      if (row.blUnpack == "1") {
+        return 'disabled-row';
+      }
+      return '';
+    },
+    // 选择表格数据
+    handleSelectionChange(selection){
+      // let destCountry = "";
+      this.canSelectList = [];
+      for(let i = 0; i < selection.length; i++){
+        if(selection[i].blUnpack == "0"){
+          // 去掉此逻辑，因为合包中的目的国家可能为空，从“去组批次”的逻辑里进行判断
+          // if(!destCountry){
+          //   destCountry = selection[i].destCountry;
+          // }else if(destCountry != selection[i].destCountry){
+          //   this.canSelectList = [];
+          //   this.$message.error("选择数据中存在不同的目的国家");
+          // }
+          this.canSelectList.push(selection[i]);
+        }
+      }
+    },
+    async getPackBillList(){
+      let billList = [];
+      let destCountry = "";
+      for(let i = 0; i < this.canSelectList.length; i++ ){
+        let resList = await listEmisTmsPackDtl({packNo: this.canSelectList[i].packNo});
+        if(!resList || resList.code != 200){
+          return{
+            code: -1,
+            message: resList && resList.msg || "未知错误",
+            list: []
+          };
+        }
+        for(let p = 0; p < resList.rows.length;p++){
+          if(resList.rows[p].main_bill_code){
+            if(!destCountry){
+              destCountry = resList.rows[p].destCountry;
+            }else if(destCountry != resList.rows[p].destCountry){
+              return {
+                code: -1,
+                message: "选择数据中存在不同的目的国家",
+                list: []
+              };
+            }
+            billList.push(resList.rows[p].waybillDetail);
+          }
+        }
+      }
+      return {
+        code: 0,
+        message:"",
+        list: billList
+      }
+    },
+    // 打开表格扩展
+    expandChange(row, expandedRows){
+      if(expandedRows.length==0){// 没有扩展的行
+        this.currentExpandedRow = null;
+        return;
+      }
+      if(this.currentExpandedRow && expandedRows.length == 1 && expandedRows[0].packNo == this.currentExpandedRow.packNo){// 已经查询过了
+        return;
+      }
+      this.loading = true;
+      this.currentExpandedRow = row;
+      this.emisTmsDonePackList=[];
+      listEmisTmsPackDtl({packNo: row.packNo}).then(resList => {
+        if(!resList || resList.code != 200){
+          this.$message.error(resList && resList.msg || "未知错误");
+          return;
+        }
+        for(let p = 0; p < resList.rows.length;p++){
+          this.emisTmsDonePackList.push(resList.rows[p].waybillDetail);
+        }
+        this.doneTotal = resList.total;
+        this.loading = false;
+      });
+      if(expandedRows.length > 1){
+        for(let i = 0; i < expandedRows.length; i++){
+          if(row.packNo != expandedRows[i].packNo){
+            this.$refs.table.$refs.table.$refs.elTable.toggleRowExpansion(expandedRows[i], false);
+          }
+        }
+      }
+      
+    },
+    // 查询合包明细表
+    async handleQueryDone(){
+      this.single = true;
+      this.multiple = true;
+      this.loadingDone = true;
+      
+      let resList = await listEmisTmsPackDtl(this.queryDoneParams);
+      this.loadingDone = false;
+      if(!resList || resList.code != 200){
+        this.$message.error(resList && resList.msg || "未知错误");
+        return;
+      }
+      //this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
+      this.doneTotal = resList.total;
+      this.emisTmsDonePackList = [];
+      for(let p = 0; p < resList.rows.length;p++){
+        let obj = {...resList.rows[p].waybillDetail};
+        obj.packNo = resList.rows[p].packNo;
+        this.emisTmsDonePackList.push(obj);
+      }
+      this.doneTotal = resList.total;
+    },
+    handleDoneSelectionChange(){
+
+    },
+    /** 查询TMS合包列表 */
+    getList() {
+      this.loading = true;
+      this.single = true;
+      this.multiple = true;
+      // this.queryParams.params = {};
+      if(this.queryParams.packNo){
+        let qBillCode=formatSearchStr(this.queryParams.packNo);
+        let billArr = qBillCode.split(",");
+        let newBillCodeStr="";
+        billArr.forEach(item=>{
+            if(item.startsWith("T")){
+              let mainBillCode=item.substr(0,14);
+              newBillCodeStr=newBillCodeStr+mainBillCode+",";
+            }else if(item == ""){
+            
+            }else{
+              newBillCodeStr=newBillCodeStr+item+",";
+            }
+        });
+        if(this.queryParams.queryOrderType == "1"){
+          this.queryParams.packNo=newBillCodeStr;
+          this.queryParams.billCode=null;
+        }else{
+          // 处理子单号
+          this.queryParams.billCode=newBillCodeStr;
+          this.queryParams.packNo=null;
+        }
+      }
+      
+      this.emisTmsPackList = [];
+      if (null != this.dateTimeRange && '' != this.dateTimeRange) {
+        this.queryParams.params["beginSendDate"] = dateToStr(new Date(this.dateTimeRange[0]));
+        this.queryParams.params["endSendDate"] = dateToStr(new Date(this.dateTimeRange[1]));
+      }
+      this.queryParams.destCountry = this.queryParams.receiveCountry;
+      listEmisTmsPack(this.queryParams).then(response => {
+        this.emisTmsPackList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    
+  }
+};
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss">
+
+.margin-top{
+  margin-top: 20px;
+}
+
+.el-descriptions-item__label.is-bordered-label {
+    min-width: 80px;
+}
+
+.printMeClass {
+  font-family: SimHei;
+  label {
+    font-weight: normal;
+  }
+}
+
+.el-table .disabled-row .cell .el-checkbox__inner {
+  display: none; /* 隐藏checkbox */
+}
+.el-table .disabled-row .cell::after {
+  content: '';
+  display: block;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(255, 255, 255, 0.6); /* 添加一个遮盖层 */
+}
+</style>