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

---
 src/api/emis/emisTmsPack.js                   |   8 +
 .../emis/emisTmsPack/packageManagement.vue    | 572 ++++++++++++++++++
 2 files changed, 580 insertions(+)
 create mode 100644 src/views/emis/emisTmsPack/packageManagement.vue

diff --git a/src/api/emis/emisTmsPack.js b/src/api/emis/emisTmsPack.js
index 0ac535eb..f99374a5 100644
--- a/src/api/emis/emisTmsPack.js
+++ b/src/api/emis/emisTmsPack.js
@@ -42,3 +42,11 @@ export function delEmisTmsPack(id) {
     method: 'delete'
   })
 }
+
+// 删除TMS合包
+export function getPackNo(id) {
+  return request({
+    url: '/emis/common/getPackNo',
+    method: 'post'
+  })
+}
\ No newline at end of file
diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
new file mode 100644
index 00000000..03b8740a
--- /dev/null
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -0,0 +1,572 @@
+<template>
+  <div class="app-container">
+    <!-- <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> -->
+    <el-form ref="form" size="mini"  :model="queryParams"  label-width="70px">
+      <el-row :gutter="20">
+        <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 label="1">合包号</el-radio>
+              </el-radio-group>
+            </div>
+            <el-input
+              v-model="queryParams.packCode"
+              :placeholder="$t('多个合包号逗号可换行隔开')"
+              clearable
+              type="textarea"
+              rows="2"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="签收时间" prop="dateTimeRange">
+            <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    <!-- </SearchForm> -->
+    </el-form>
+
+
+    <XdTable v-loading="loading"
+           border stripe
+           size="small"
+           :data="emisTmsPackList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="handleQuery"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+           >
+
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  v-hasPermi="['emis:emisTmsPack:query']"
+                  @click="handleQuery"
+                >查询</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['emis:emisTmsPack:add']"
+                >新增合包</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  icon="el-icon-edit"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleAdd"
+                  v-hasPermi="['emis:emisTmsPack:edit']"
+                >修改</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleAdd"
+                  v-hasPermi="['emis:emisTmsPack:remove']"
+                >删除</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['emis:emisTmsPack:export']"
+                >打印合包</el-button>
+              </el-col>
+          </el-row>
+      </div>
+
+      <el-table-column type="selection" width="55" align="center" />
+      <!--
+      <el-table-column label="序号" align="center" min-width="60">
+             <template slot-scope="scope">
+                <span v-text="getIndex(scope.$index)"> </span>
+             </template>
+      </el-table-column>
+
+       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
+        <template slot-scope="scope">
+            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
+         </template>
+      </el-table-column>
+
+      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
+            <template slot-scope="scope">
+              <div v-if="scope.row.settleStatus == 0" style="color:red;">
+                    <span class="el-tag el-tag--info">未结算</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 10" style="color:red;">
+                <span class="el-tag">待确认</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 11" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 20" >
+                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 21" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 40" style="color:red;">
+                <span class="el-tag el-tag--danger">已拒绝</span>
+              </div>
+            </template>
+          </el-table-column>
+      -->
+
+      <el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="100" />
+      <el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100" />
+      <el-table-column :label="$t('操作网点')" align="center" prop="sendStiteCode" min-width="100" />
+      <el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100" />
+      <el-table-column :label="$t('操作员')" align="center" prop="opMan" min-width="100" />
+      <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="packDate" min-width="100" />
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['emis:emisTmsPack:query']"
+          >查看</el-button>
+          <!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['emis:emisTmsPack:edit']"
+          >修改</el-button> -->
+          <!--
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['emis:emisTmsPack:remove']"
+          >删除</el-button> -->
+        </template>
+      </el-table-column>
+    </XdTable>
+
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :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="16">
+            <el-col :span="12">
+              <el-form-item :label="$t('合包号')" prop="packNo">
+                <el-input v-model="coData.packNo" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('组包时间')" prop="createTime">
+                <el-input v-model="coData.createTime" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="$t('国家')" prop="destCountry">
+                <CountryPicker :placeholder="$t('选择国家')" v-model="coData.destCountry" ></CountryPicker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="$t('生成网点')" prop="sendStiteCode">
+                <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.sendStiteCode" ></EmisSiteSimplePicker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="$t('下一网点')" prop="nextSiteCode">
+                <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.nextSiteCode" ></EmisSiteSimplePicker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="$t('是否可拆')" prop="blUnpack">
+                <el-radio-group class="query-label" v-model="coData.blUnpack">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="8">
+            <el-col :span="24">
+              <el-form-item>
+                <span slot="label">
+                  <span style="font-weight:600">{{$t('总票数') + ':'}}</span>
+                  <span style="font-weight:600">{{coData.total || 0}}</span>
+                </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item>
+                <span slot="label">
+                  <span style="font-weight:600">{{$t('总件数') + ':'}}</span>
+                  <span style="font-weight:600">{{coData.total || 0}}</span>
+                </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item>
+                <span slot="label">
+                  <span style="font-weight:600">{{$t('总重量') + ':'}}</span>
+                  <span style="font-weight:600">{{coData.total || 0}}</span>
+                </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item>
+                <span slot="label">
+                  <span style="font-weight:600">{{$t('总体积') + ':'}}</span>
+                  <span style="font-weight:600">{{coData.total || 0}}</span>
+                </span>
+              </el-form-item>
+            </el-col>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <XdTable v-loading="loading"
+        border stripe
+        size="small"
+        :data="emisCoPackDetail"
+        :showSearch.sync="showSearch"
+        :queryParams="queryParams"
+        :total="total"
+        @queryTable="handleQuery"
+        @selection-change="handleSelectionChange"
+        @sort-change="handleSortChange"
+      >
+
+        <div slot="toolbar">
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                size="mini"
+                @click="handleQuery"
+              >删除</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-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                size="mini"
+                @click="handleAdd"
+              >确定</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                size="mini"
+                @click="handleAdd"
+              >取消</el-button>
+            </el-col>
+          </el-row>
+        </div>
+        <el-table-column :label="$t('运单号')" align="center" prop="packNo" min-width="100" />
+        <el-table-column :label="$t('订单号')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('进仓单号')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('扫描状态')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('扫描时间')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('状态')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('当前网点')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('下一网点')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('国家')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('线路')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('产品类型')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('预计到达时间')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('件数')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('实际重量')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('体积')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('体积重量')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('结算重量')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('收件人')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('收件公司')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('取件员')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('取件方式')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('付款方式')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('运费')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('寄件人')" align="center" prop="packStatus" min-width="100" />
+        <el-table-column :label="$t('寄件公司')" align="center" prop="packStatus" min-width="100" />
+      </XdTable>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listEmisTmsPack, getPackNo, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, updateEmisTmsPack } from "@/api/emis/emisTmsPack";
+// 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 { parseTime } from "@/utils/custom";
+
+export default {
+  name: "PackageManagement",
+  components: { CountryPicker, EmisSiteSimplePicker, elDateAdvPicker,emisTmsPackForm },
+  dicts: [
+  ],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // TMS合包表格数据
+      emisTmsPackList: [],
+
+      // 新增/修改弹窗数据
+      coData: {},
+      // 新增/修改包详情数据
+      emisCoPackDetail:[],
+
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 更新网点时间范围
+      daterangeCreateTime: [],
+      // 更新网点时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        packNo: null,
+        packName: null,
+        packDate: null,
+        destCountry: null,
+        destCountryName: null,
+        blUnpack: null,
+        sendStiteCode: null,
+        totalParcelQty: null,
+        totalWaybillQty: null,
+        totalVolume: null,
+        totalWeight: null,
+        packStatus: null,
+        opMan: null,
+        remark: null,
+        delFlag: null,
+      },
+      queryCoParams: {
+
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询TMS合包列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      listEmisTmsPack(this.queryParams).then(response => {
+        this.emisTmsPackList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    onDateSelect(value){
+      console.log("date picker---->", value)
+      this.dateTimeRange=value;
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    async handleAdd() {
+      this.coData = {};
+      let response = await getPackNo();
+      if(!response || response.code != 200){
+        this.$message.error(response && response.msg || "未知错误");
+        return;
+      }
+      this.coData.packNo = response.data;
+      this.coData.createTime = parseTime(new Date());
+      this.coData.destCountry = null;
+      this.coData.destCountryName = null;
+      this.coData.sendStiteCode = null;
+      this.coData.nextSiteCode = null;
+      this.coData.nextStation = null;
+      this.coData.blUnpack = null;
+
+
+      this.currentId=null;
+      this.openForm= true;
+      this.titleForm = "新增合包";
+    },
+    handleShowMoreInput(){
+      this.moreInputVisible = !this.moreInputVisible;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+       this.currentId= row.id;
+       this.openForm = true;
+       this.titleForm = "修改";
+    },
+    handleView(row) {
+       this.id=row.id;
+       this.titleView="查看";
+       this.openView=true;
+    //   this.router.push({ path: '/emis/emisTmsPack/viewDetail', query: { id: row.id }})
+    },
+    handleFormChanged(){
+        this.openForm = false;
+        this.getList();
+    },
+    cancelForm(){
+      this.openForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除').then(function() {
+        return delEmisTmsPack(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+    //   this.download('emis/emisTmsPack/export', {
+    //     ...this.queryParams
+    //   }, `emisTmsPack_${new Date().getTime()}.xlsx`)
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+       var qParam = {...this.queryParams};
+       qParam.pageNum=1;
+       qParam.pageSize=5000;
+
+       listEmisTmsPack(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+        this.downloadLoading = false
+        if (response.code === 200) {
+                const curList = response.rows
+                import('@/vendor/Export2Excel').then(excel => {
+                  const tHeader = ['id','合包号','合包名称','合包时间','目的国家','目的国家名称','是否可拆','发出网点','下一网点','下一站','总件数','总运单数','总体积','总重量','合包状态','扩展数据','操作员','ext1','ext2','ext3','ext4','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
+                  const filterVal = ['id','packNo','packName','packDate','destCountry','destCountryName','blUnpack','sendStiteCode','nextSiteCode','nextStation','totalParcelQty','totalWaybillQty','totalVolume','totalWeight','packStatus','extData','opMan','ext1','ext2','ext3','ext4','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+                  const data = this.formatJson(filterVal, curList, response.rows)
+                  excel.export_json_to_excel({
+                    header: tHeader,
+                    data,
+                    filename: 'TMS合包',
+                    autoWidth: true
+                  })
+                  loadingInstance.close()
+                })
+        }
+      });
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'status') {
+          var statusStr='xxx'
+          if(v[j] == 10){
+              statusStr='xxx'
+          }
+          return statusStr;
+        }
+        return v[j]
+      }))
+    },
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+    /** 时间搜索响应函数 */
+    dateTimeChange(value){
+        this.dateTimeRange=value;
+    },
+  }
+};
+</script>
+
+<style scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+</style>

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 2/2] =?UTF-8?q?=E5=90=88=E5=8C=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=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>