From 52524ce232d53129cc45b65961f08a23bcdcf44b Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Tue, 28 May 2024 17:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=8C=85=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E5=BA=A6=EF=BC=9A50%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XdTable/index.vue              |   1 -
 .../emis/emisTmsPack/packageManagement.vue    | 183 +++++++++++++++++-
 2 files changed, 176 insertions(+), 8 deletions(-)

diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index f2aee6be..19f372d9 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -409,7 +409,6 @@ export default {
     this.initStorage()
     this.updateTable()
     this.initSort();
-
     this.tableDom=this.getInstance().$el;
 
   },
diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index 03b8740a..4943a82e 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -6,7 +6,7 @@
         <el-col :span="8">
           <el-form-item label="" prop="queryType">
             <div slot="label">
-              <el-radio-group class="query-label" v-model="queryParams.params.queryType">
+              <el-radio-group class="query-label" v-model="queryParams.queryType">
                 <el-radio label="1">合包号</el-radio>
               </el-radio-group>
             </div>
@@ -249,10 +249,11 @@
       <XdTable v-loading="loading"
         border stripe
         size="small"
+        id="emisCoPackDetail"
         :data="emisCoPackDetail"
         :showSearch.sync="showSearch"
         :queryParams="queryParams"
-        :total="total"
+        :total="emisCoPackDetail.length"
         @queryTable="handleQuery"
         @selection-change="handleSelectionChange"
         @sort-change="handleSortChange"
@@ -274,7 +275,7 @@
                 plain
                 icon="el-icon-plus"
                 size="mini"
-                @click="handleAdd"
+                @click="handleAddWayBill"
               >追加</el-button>
             </el-col>
             <el-col :span="1.5">
@@ -322,27 +323,143 @@
         <el-table-column :label="$t('寄件公司')" align="center" prop="packStatus" min-width="100" />
       </XdTable>
     </el-dialog>
+
+
+    <el-dialog :title="titleWayBill" :visible.sync="openWayBillForm" width="70%"  :destroy-on-close="true" v-dialogDrag append-to-body>
+      <el-form ref="formCo" size="mini"  :model="queryCoParams"  label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="" prop="billCode">
+              <div slot="label">
+                <el-radio-group class="query-label" v-model="wayBillData.params.queryOrderType">
+                  <el-radio label="1">运单号</el-radio>
+                  <el-radio label="0">订单号</el-radio>
+                </el-radio-group>
+              </div>
+              <el-input
+                v-model="wayBillData.billCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                type="textarea"
+                rows="2"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('目的国家')" prop="destCountry">
+              <CountryPicker :placeholder="$t('选择国家')" v-model="wayBillData.destCountry" ></CountryPicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="线路" prop="lineCode">
+              <TransLinePicker v-model="wayBillData.lineCode" :countryCode="wayBillData.destCountry"></TransLinePicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="产品" prop="productType">
+              <TransProductPicker placeholder="全部" v-model="wayBillData.productType" :transLineCode="wayBillData.lineCode" ></TransProductPicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="" prop="billCode">
+              <div slot="label">
+                <el-radio-group class="query-label" v-model="wayBillData.params.dataTimeType">
+                  <el-radio label="1">下单时间</el-radio>
+                  <el-radio label="0">录单时间</el-radio>
+                </el-radio-group>
+              </div>
+              <elDateAdvPicker clearable v-model="wayBillData.dateTimeRange" @dateTimeChange="onWayBillDateSelect" ></elDateAdvPicker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <XdTable v-loading="loading2"
+        border stripe
+        size="small"
+        id="emisWayBillList"
+        :data="emisWayBillList"
+        :showSearch.sync="showSearch"
+        :queryParams="queryParams"
+        :total="wayBillotal"
+        @sort-change="handleSortChange"
+        max-height="300px"
+      >
+
+        <div slot="toolbar">
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                size="mini"
+                @click="handleQueryWayBill"
+              >查询</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+              >追加</el-button>
+            </el-col>
+          </el-row>
+        </div>
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
+        <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
+        <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
+        <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100" />
+        <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
+        <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteCode" min-width="100" />
+        <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteCode" min-width="100" />
+        <el-table-column :label="$t('国家')" align="center" prop="destinationCounty" min-width="100" />
+        <el-table-column :label="$t('线路')" align="center" prop="transLineType" min-width="100" />
+        <el-table-column :label="$t('产品类型')" align="center" prop="productType" min-width="100" />
+        <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" />
+        <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="100" />
+        <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100" />
+        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="100" />
+        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
+        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
+        <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
+        <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="100" />
+        <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100" />
+        <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+      </XdTable>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listEmisTmsPack, getPackNo, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, updateEmisTmsPack } from "@/api/emis/emisTmsPack";
+import { listEmisWaybill } from "@/api/emis/emisWaybill";
 // import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import { parseTime } from "@/utils/custom";
 
 export default {
   name: "PackageManagement",
-  components: { CountryPicker, EmisSiteSimplePicker, elDateAdvPicker,emisTmsPackForm },
+  components: { CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
   dicts: [
   ],
   data() {
     return {
       // 遮罩层
       loading: true,
+      loading2: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -363,10 +480,21 @@ export default {
       // 新增/修改包详情数据
       emisCoPackDetail:[],
 
+      // 追加的运单查询数据
+      wayBillData: {
+        params:{}
+      },
+      // 追加的运单数据
+      emisWayBillList:[],
+      wayBillotal:0,
+
       currentId:null,
       openForm: false,
       titleForm: "",
 
+      titleWayBill:null,
+      openWayBillForm:false,
+
       // 弹出展示层
       id:null,
       titleView:"",
@@ -407,7 +535,7 @@ export default {
     /** 查询TMS合包列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
+      // this.queryParams.params = {};
       if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
         this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
         this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
@@ -418,12 +546,40 @@ export default {
         this.loading = false;
       });
     },
-
+    handleQueryWayBill(){
+      this.loading2 = true;
+      if (null != this.wayBillData.dateTimeRange && '' != this.wayBillData.dateTimeRange) {
+        if(this.wayBillData.dataTimeType == '1'){
+          // 下单时间
+          this.wayBillData.params.beginOrderDate = this.wayBillData.dateTimeRange[0];
+          this.wayBillData.params.endOrderDate = this.wayBillData.dateTimeRange[1];
+        }else if(this.wayBillData.dataTimeType == '0'){
+          // 录单时间
+          this.wayBillData.params.beginCreateTime = this.wayBillData.dateTimeRange[0];
+          this.wayBillData.params.endCreateTime = this.wayBillData.dateTimeRange[1];
+        }
+      }
+      this.wayBillData.params.isNeedPack = 1;
+      listEmisWaybill(this.wayBillData).then(response => {
+        this.loading2 = false;
+        if(response.code != 200){
+          this.$message.error(response.msg);
+          return;
+        }
+        this.emisWayBillList = response.rows;
+        // this.emisCoPackDetail = response.rows;
+        console.log(this)
+        this.wayBillotal = response.total;
+      })
+    },
     onDateSelect(value){
       console.log("date picker---->", value)
       this.dateTimeRange=value;
     },
-
+    onWayBillDateSelect(value){
+      console.log("date picker---->", value)
+      this.wayBillData.dateTimeRange=value;
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -468,6 +624,11 @@ export default {
       this.openForm= true;
       this.titleForm = "新增合包";
     },
+    handleAddWayBill(){
+      // this.currentId=null;
+      this.openWayBillForm= true;
+      this.titleWayBill = "运单列表";
+    },
     handleShowMoreInput(){
       this.moreInputVisible = !this.moreInputVisible;
     },
@@ -569,4 +730,12 @@ export default {
     color: #0955ee;
     cursor: pointer;
   }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
 </style>