From 181d13a37047b7ff18282ed8adc7e29e1ccac001 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 22 May 2024 07:46:37 +0800
Subject: [PATCH] md

---
 .../emis/emisTmsPack/emisTmsPackForm.vue      | 157 +++++--
 src/views/emis/emisTmsPack/index.vue          | 435 ++++++++----------
 .../emisTmsPackDtl/emisTmsPackDtlForm.vue     | 125 +++--
 src/views/emis/emisTmsPackDtl/index.vue       | 375 +++++++--------
 .../emis/emisWaybill/emisWaybillRecord.vue    |  29 +-
 5 files changed, 568 insertions(+), 553 deletions(-)

diff --git a/src/views/emis/emisTmsPack/emisTmsPackForm.vue b/src/views/emis/emisTmsPack/emisTmsPackForm.vue
index 88db2ae0..c3acaa94 100644
--- a/src/views/emis/emisTmsPack/emisTmsPackForm.vue
+++ b/src/views/emis/emisTmsPack/emisTmsPackForm.vue
@@ -1,10 +1,10 @@
 <template>
   <div >
-    <el-row :gutter="0">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+         <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
           <el-col :span="24">
-            <el-form-item label="合包号" prop="packCode">
-              <el-input v-model="form.packCode" placeholder="请输入合包号" />
+            <el-form-item label="合包号" prop="packNo">
+              <el-input v-model="form.packNo" placeholder="请输入合包号" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -18,13 +18,53 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="创建站点代码" prop="createSiteCode">
-              <el-input v-model="form.createSiteCode" placeholder="请输入创建站点代码" />
+            <el-form-item label="目的国家" prop="destCountry">
+              <el-input v-model="form.destCountry" placeholder="请输入目的国家" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="修改站点代码" prop="modifySiteCode">
-              <el-input v-model="form.modifySiteCode" placeholder="请输入修改站点代码" />
+            <el-form-item label="目的国家名称" prop="destCountryName">
+              <el-input v-model="form.destCountryName" placeholder="请输入目的国家名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否可拆" prop="blUnpack">
+              <el-input v-model="form.blUnpack" placeholder="请输入是否可拆" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="发出网点" prop="sendStiteCode">
+              <el-input v-model="form.sendStiteCode" placeholder="请输入发出网点" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="总件数" prop="totalParcelQty">
+              <el-input v-model="form.totalParcelQty" placeholder="请输入总件数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="总运单数" prop="totalWaybillQty">
+              <el-input v-model="form.totalWaybillQty" placeholder="请输入总运单数" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="总体积" prop="totalVolume">
+              <el-input v-model="form.totalVolume" placeholder="请输入总体积" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="总重量" prop="totalWeight">
+              <el-input v-model="form.totalWeight" placeholder="请输入总重量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="合包状态" prop="packStatus">
+              <el-input v-model="form.packStatus" placeholder="请输入合包状态" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="操作员" prop="opMan">
+              <el-input v-model="form.opMan" placeholder="请输入操作员" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -32,7 +72,13 @@
               <el-input v-model="form.remark" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="删除标志（0代表存在" prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
+            </el-form-item>
+          </el-col>
 
+        <!--
          <el-form-item label="上级字典">
               <treeselect
                 ref="tree"
@@ -44,15 +90,14 @@
                 placeholder="选择上级"
               />
         </el-form-item>
-
-
-        </el-form>
-      </el-row>
+        -->
+        </el-row>
+      </el-form>
       <div style="text-align: center;margin-bottom: 10px;">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    
+
   </div>
 </template>
 
@@ -62,7 +107,9 @@ import { listEmisTmsPack, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, update
 export default {
   name: "emisTmsPackForm",
   props:{
-    id:undefined
+    id:{
+        type:Number
+    }
   },
   components: {  },
   dicts: [
@@ -97,15 +144,17 @@ export default {
 
   methods: {
     initData() {
-        this.reset();
-        if(this.id !=undefined) {
+
+        if(this.id !=null) {
           this.loading = true;
           getEmisTmsPack(this.id).then(response => {
             this.form = response.data;
             this.loading = false;
           });
+        }else{
+            this.reset();
         }
-        this.getTreeselect();
+        // this.getTreeselect();
     },
     // 取消按钮
     cancel() {
@@ -116,17 +165,35 @@ export default {
     reset() {
       this.form = {
         id: null,
-        packCode: null,
+        packNo: null,
         packName: null,
         packDate: null,
-        createSiteCode: null,
-        modifySiteCode: null,
+        destCountry: null,
+        destCountryName: null,
+        blUnpack: null,
+        sendStiteCode: null,
+        nextStiteCode: null,
+        nextStation: null,
+        totalParcelQty: null,
+        totalWaybillQty: null,
+        totalVolume: null,
+        totalWeight: null,
+        packStatus: null,
+        extData: null,
+        opMan: null,
+        ext1: null,
+        ext2: null,
+        ext3: null,
+        ext4: null,
+        remark: null,
+        tenantId: null,
         delFlag: null,
         createBy: null,
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        createSite: null,
+        updateSite: null
       };
       this.resetForm("form");
     },
@@ -148,32 +215,32 @@ export default {
         }
       });
     },
-      /** 转换菜单数据结构 */
-     normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.id,
-        label: node.idName,
-        children: node.children
-      };
-    },
-     /** 查询菜单下拉树结构 */
-    getTreeselect() {
-      const queryParams = {}
-      listEmisTmsPack(queryParams).then(response => {
-        this.emisTmsPackOptions = [];
-        const rootItem = { idId: 0, emisTmsPackName: '-', children: [] };
-        rootItem.children = this.handleTree(response.data, "id");
-        this.emisTmsPackOptions.push(rootItem);
+    //   /** 转换菜单数据结构 */
+    //  normalizer(node) {
+    //   if (node.children && !node.children.length) {
+    //     delete node.children;
+    //   }
+    //   return {
+    //     id: node.id,
+    //     label: node.idName,
+    //     children: node.children
+    //   };
+    // },
+    //  /** 查询菜单下拉树结构 */
+    // getTreeselect() {
+    //   const queryParams = {}
+    //   listEmisTmsPack(queryParams).then(response => {
+    //     this.emisTmsPackOptions = [];
+    //     const rootItem = { idId: 0, emisTmsPackName: '-', children: [] };
+    //     rootItem.children = this.handleTree(response.data, "id");
+    //     this.emisTmsPackOptions.push(rootItem);
 
-        if(this.parentId != undefined) {
-          this.form.parentId = this.parentId;
-        }
+    //     if(this.parentId != undefined) {
+    //       this.form.parentId = this.parentId;
+    //     }
 
-      });
-    },
+    //   });
+    // },
   }
 };
 </script>
diff --git a/src/views/emis/emisTmsPack/index.vue b/src/views/emis/emisTmsPack/index.vue
index b0d2f9e5..f0ea009c 100644
--- a/src/views/emis/emisTmsPack/index.vue
+++ b/src/views/emis/emisTmsPack/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
-      <el-form-item label="" prop="packCode">
+      <el-form-item label="" prop="packNo">
         <el-input
-          v-model="queryParams.packCode"
-          placeholder="合包号"
+          v-model="queryParams.packNo"
+          :placeholder="$t('合包号')"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -13,7 +13,7 @@
       <el-form-item label="" prop="packName">
         <el-input
           v-model="queryParams.packName"
-          placeholder="合包名称"
+          :placeholder="$t('合包名称')"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -21,23 +21,87 @@
       <el-form-item label="" prop="packDate">
         <el-input
           v-model="queryParams.packDate"
-          placeholder="合包时间"
+          :placeholder="$t('合包时间')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="createSiteCode">
+      <el-form-item label="" prop="destCountry">
         <el-input
-          v-model="queryParams.createSiteCode"
-          placeholder="创建站点代码"
+          v-model="queryParams.destCountry"
+          :placeholder="$t('目的国家')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="modifySiteCode">
+      <el-form-item label="" prop="destCountryName">
         <el-input
-          v-model="queryParams.modifySiteCode"
-          placeholder="修改站点代码"
+          v-model="queryParams.destCountryName"
+          :placeholder="$t('目的国家名称')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="blUnpack">
+        <el-input
+          v-model="queryParams.blUnpack"
+          :placeholder="$t('是否可拆')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="sendStiteCode">
+        <el-input
+          v-model="queryParams.sendStiteCode"
+          :placeholder="$t('发出网点')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="totalParcelQty">
+        <el-input
+          v-model="queryParams.totalParcelQty"
+          :placeholder="$t('总件数')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="totalWaybillQty">
+        <el-input
+          v-model="queryParams.totalWaybillQty"
+          :placeholder="$t('总运单数')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="totalVolume">
+        <el-input
+          v-model="queryParams.totalVolume"
+          :placeholder="$t('总体积')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="totalWeight">
+        <el-input
+          v-model="queryParams.totalWeight"
+          :placeholder="$t('总重量')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="packStatus">
+        <el-input
+          v-model="queryParams.packStatus"
+          :placeholder="$t('合包状态')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="opMan">
+        <el-input
+          v-model="queryParams.opMan"
+          :placeholder="$t('操作员')"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -45,79 +109,97 @@
       <el-form-item label="" prop="remark">
         <el-input
           v-model="queryParams.remark"
-          placeholder="备注"
+          :placeholder="$t('备注')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      <el-form-item label="" prop="delFlag">
+        <el-input
+          v-model="queryParams.delFlag"
+          :placeholder="$t('删除标志（0代表存在')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-    </el-form>
+    </SearchForm>
 
-    <el-row :gutter="10" class="mb8">
-      <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="handleUpdate"
-          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="handleDelete"
-          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="handleExport"
-          v-hasPermi="['emis:emisTmsPack:export']"
-        >导出</el-button>
-      </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
-    <el-table v-loading="loading" :data="emisTmsPackList" @selection-change="handleSelectionChange">
+    <XdTable v-loading="loading"
+           border stripe
+           size="small"
+           :data="emisTmsPackList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @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
+                  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="handleUpdate"
+                  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="handleDelete"
+                  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="handleExport"
+                  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" min-width="80">
+      <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>
@@ -141,13 +223,22 @@
           </el-table-column>
       -->
 
-      <el-table-column label="合包号" align="center" prop="packCode" min-width="100" />
-      <el-table-column label="合包名称" align="center" prop="packName" min-width="100" />
-      <el-table-column label="合包时间" align="center" prop="packDate" min-width="100" />
-      <el-table-column label="创建站点代码" align="center" prop="createSiteCode" min-width="100" />
-      <el-table-column label="修改站点代码" align="center" prop="modifySiteCode" min-width="100" />
-      <el-table-column label="备注" align="center" prop="remark" min-width="100" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="100" />
+      <el-table-column :label="$t('合包名称')" align="center" prop="packName" min-width="100" />
+      <el-table-column :label="$t('合包时间')" align="center" prop="packDate" min-width="100" />
+      <el-table-column :label="$t('目的国家')" align="center" prop="destCountry" min-width="100" />
+      <el-table-column :label="$t('目的国家名称')" align="center" prop="destCountryName" min-width="100" />
+      <el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100" />
+      <el-table-column :label="$t('发出网点')" align="center" prop="sendStiteCode" min-width="100" />
+      <el-table-column :label="$t('总件数')" align="center" prop="totalParcelQty" min-width="100" />
+      <el-table-column :label="$t('总运单数')" align="center" prop="totalWaybillQty" min-width="100" />
+      <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
+      <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
+      <el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100" />
+      <el-table-column :label="$t('操作员')" align="center" prop="opMan" min-width="100" />
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -156,7 +247,7 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['emis:emisTmsPack:edit']"
           >修改</el-button>
-          <!-- 
+          <!--
           <el-button
             size="mini"
             type="text"
@@ -166,77 +257,18 @@
           >删除</el-button> -->
         </template>
       </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page-sizes="[20,50,100,300,500,1000,2000,5000]"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-size="queryParams.pageSize"
-      @pagination="getList"
-    />
+    </XdTable>
 
-    <!-- 添加或修改TMS合包对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
-      <el-row :gutter="0">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-col :span="24">
-            <el-form-item label="合包号" prop="packCode">
-              <el-input v-model="form.packCode" placeholder="请输入合包号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="合包名称" prop="packName">
-              <el-input v-model="form.packName" placeholder="请输入合包名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="合包时间" prop="packDate">
-              <el-input v-model="form.packDate" placeholder="请输入合包时间" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="创建站点代码" prop="createSiteCode">
-              <el-input v-model="form.createSiteCode" placeholder="请输入创建站点代码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="修改站点代码" prop="modifySiteCode">
-              <el-input v-model="form.modifySiteCode" placeholder="请输入修改站点代码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-
-         <!-- 
-         <el-col :span="24" v-show="moreInputVisible" >  </el-col>
-         <el-col :span="24">
-             <el-divider content-position="right"  @click="handleShowMoreInput" >更多信息[+]</el-divider>
-         </el-col> 
-         -->
-
-        </el-form>
-      </el-row>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" append-to-body>
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisTmsPackForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsPackForm>
     </el-dialog>
 
 
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  append-to-body>
+    <!--
+    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
         <emisTmsPackView :id="id" ></EmisTmsPackView>
     </el-dialog>
+    -->
 
   </div>
 </template>
@@ -244,12 +276,12 @@
 <script>
 import { listEmisTmsPack, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, updateEmisTmsPack } from "@/api/emis/emisTmsPack";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-import emisTmsPackView from '@/views/emis/emisTmsPack/emisTmsPackView';
+// import emisTmsPackView from '@/views/emis/emisTmsPack/emisTmsPackView';
 import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
 
 export default {
   name: "emisTmsPack",
-  components: { elDateSimplePicker,emisTmsPackView,emisTmsPackForm },
+  components: { elDateSimplePicker,emisTmsPackForm },
   dicts: [
   ],
   data() {
@@ -270,47 +302,39 @@ export default {
       total: 0,
       // TMS合包表格数据
       emisTmsPackList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
 
+      currentId:null,
       openForm: false,
       titleForm: "",
 
-      titleEmisTmsPack: "",
-      openEmisTmsPack: false,
-
-      // 显示编辑框更多
-      moreInputVisible: false,
-
       // 弹出展示层
       id:null,
       titleView:"",
       openView: false,
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeCreateTime: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        packCode: null,
+        packNo: null,
         packName: null,
         packDate: null,
-        createSiteCode: null,
-        modifySiteCode: null,
-        remark: 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,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
-        ],
-      }
     };
   },
   created() {
@@ -335,29 +359,7 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        packCode: null,
-        packName: null,
-        packDate: null,
-        createSiteCode: null,
-        modifySiteCode: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null
-      };
-      this.resetForm("form");
-    },
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -374,37 +376,26 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.reset();
-      this.open = true;
-      this.title = "新增";
-
-    // 子组件打开模式
-    //   if(row != undefined){
-    //     this.currentParentId = row.id
-    //   }
-    //   this.openEmisTmsPack = true;
-    //   this.titleEmisTmsPack = "新增";
+      this.currentId=null;
+      this.openForm= true;
+      this.titleForm = "新增";
     },
     handleShowMoreInput(){
       this.moreInputVisible = !this.moreInputVisible;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getEmisTmsPack(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改";
-      });
-
-       // 子组件打开模式
-    //    this.currentId= row.id || this.ids;
-    //    this.openEmisTmsPack = true;
-    //    this.titleEmisTmsPack = "修改";
-
+       this.currentId= row.id;
+       this.openForm = true;
+       this.titleForm = "修改";
     },
     handleView(row) {
        this.id=row.id;
@@ -412,26 +403,6 @@ export default {
        this.openView=true;
     //   this.router.push({ path: '/emis/emisTmsPack/viewDetail', query: { id: row.id }})
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateEmisTmsPack(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addEmisTmsPack(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
     handleFormChanged(){
         this.openForm = false;
         this.getList();
@@ -466,8 +437,8 @@ export default {
         if (response.code === 200) {
                 const curList = response.rows
                 import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','合包号','合包名称','合包时间','创建站点代码','修改站点代码','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','备注',];
-                  const filterVal = ['id','packCode','packName','packDate','createSiteCode','modifySiteCode','delFlag','createBy','createTime','updateBy','updateTime','remark',];
+                  const tHeader = ['id','合包号','合包名称','合包时间','目的国家','目的国家名称','是否可拆','发出网点','下一网点','下一站','总件数','总运单数','总体积','总重量','合包状态','扩展数据','操作员','ext1','ext2','ext3','ext4','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
+                  const filterVal = ['id','packNo','packName','packDate','destCountry','destCountryName','blUnpack','sendStiteCode','nextStiteCode','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,
diff --git a/src/views/emis/emisTmsPackDtl/emisTmsPackDtlForm.vue b/src/views/emis/emisTmsPackDtl/emisTmsPackDtlForm.vue
index fd8edf08..ed5232e7 100644
--- a/src/views/emis/emisTmsPackDtl/emisTmsPackDtlForm.vue
+++ b/src/views/emis/emisTmsPackDtl/emisTmsPackDtlForm.vue
@@ -1,15 +1,10 @@
 <template>
   <div >
-    <el-row :gutter="0">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+         <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
           <el-col :span="24">
-            <el-form-item label="合包id" prop="packId">
-              <el-input v-model="form.packId" placeholder="请输入合包id" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="运单id" prop="waybillId">
-              <el-input v-model="form.waybillId" placeholder="请输入运单id" />
+            <el-form-item label="合包号" prop="packNo">
+              <el-input v-model="form.packNo" placeholder="请输入合包号" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -17,12 +12,43 @@
               <el-input v-model="form.billCode" placeholder="请输入运单号" />
             </el-form-item>
           </el-col>
+        <el-col :span="24">
+            <el-form-item label="扫描时间" prop="scanDate">
+              <el-date-picker clearable
+                v-model="form.scanDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择扫描时间">
+              </el-date-picker>
+            </el-form-item>
+        </el-col>
+          <el-col :span="24">
+            <el-form-item label="扫描状态" prop="scanStatus">
+              <el-input v-model="form.scanStatus" placeholder="请输入扫描状态" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态" prop="packStatus">
+              <el-input v-model="form.packStatus" placeholder="请输入状态" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="扫描员" prop="scanMan">
+              <el-input v-model="form.scanMan" placeholder="请输入扫描员" />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="删除标志（0代表存在" prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
+            </el-form-item>
+          </el-col>
 
+        <!--
          <el-form-item label="上级字典">
               <treeselect
                 ref="tree"
@@ -34,15 +60,14 @@
                 placeholder="选择上级"
               />
         </el-form-item>
-
-
-        </el-form>
-      </el-row>
+        -->
+        </el-row>
+      </el-form>
       <div style="text-align: center;margin-bottom: 10px;">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    
+
   </div>
 </template>
 
@@ -52,7 +77,9 @@ import { listEmisTmsPackDtl, getEmisTmsPackDtl, delEmisTmsPackDtl, addEmisTmsPac
 export default {
   name: "emisTmsPackDtlForm",
   props:{
-    id:undefined
+    id:{
+        type:Number
+    }
   },
   components: {  },
   dicts: [
@@ -87,15 +114,17 @@ export default {
 
   methods: {
     initData() {
-        this.reset();
-        if(this.id !=undefined) {
+
+        if(this.id !=null) {
           this.loading = true;
           getEmisTmsPackDtl(this.id).then(response => {
             this.form = response.data;
             this.loading = false;
           });
+        }else{
+            this.reset();
         }
-        this.getTreeselect();
+        // this.getTreeselect();
     },
     // 取消按钮
     cancel() {
@@ -106,15 +135,21 @@ export default {
     reset() {
       this.form = {
         id: null,
-        packId: null,
-        waybillId: null,
+        packNo: null,
         billCode: null,
+        scanDate: null,
+        scanStatus: null,
+        packStatus: null,
+        scanMan: null,
+        remark: null,
+        tenantId: null,
         delFlag: null,
         createBy: null,
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        createSite: null,
+        updateSite: null
       };
       this.resetForm("form");
     },
@@ -136,32 +171,32 @@ export default {
         }
       });
     },
-      /** 转换菜单数据结构 */
-     normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.id,
-        label: node.idName,
-        children: node.children
-      };
-    },
-     /** 查询菜单下拉树结构 */
-    getTreeselect() {
-      const queryParams = {}
-      listEmisTmsPackDtl(queryParams).then(response => {
-        this.emisTmsPackDtlOptions = [];
-        const rootItem = { idId: 0, emisTmsPackDtlName: '-', children: [] };
-        rootItem.children = this.handleTree(response.data, "id");
-        this.emisTmsPackDtlOptions.push(rootItem);
+    //   /** 转换菜单数据结构 */
+    //  normalizer(node) {
+    //   if (node.children && !node.children.length) {
+    //     delete node.children;
+    //   }
+    //   return {
+    //     id: node.id,
+    //     label: node.idName,
+    //     children: node.children
+    //   };
+    // },
+    //  /** 查询菜单下拉树结构 */
+    // getTreeselect() {
+    //   const queryParams = {}
+    //   listEmisTmsPackDtl(queryParams).then(response => {
+    //     this.emisTmsPackDtlOptions = [];
+    //     const rootItem = { idId: 0, emisTmsPackDtlName: '-', children: [] };
+    //     rootItem.children = this.handleTree(response.data, "id");
+    //     this.emisTmsPackDtlOptions.push(rootItem);
 
-        if(this.parentId != undefined) {
-          this.form.parentId = this.parentId;
-        }
+    //     if(this.parentId != undefined) {
+    //       this.form.parentId = this.parentId;
+    //     }
 
-      });
-    },
+    //   });
+    // },
   }
 };
 </script>
diff --git a/src/views/emis/emisTmsPackDtl/index.vue b/src/views/emis/emisTmsPackDtl/index.vue
index 8aadd37c..8ef122ff 100644
--- a/src/views/emis/emisTmsPackDtl/index.vue
+++ b/src/views/emis/emisTmsPackDtl/index.vue
@@ -1,19 +1,11 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
-      <el-form-item label="" prop="packId">
+      <el-form-item label="" prop="packNo">
         <el-input
-          v-model="queryParams.packId"
-          placeholder="合包id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="waybillId">
-        <el-input
-          v-model="queryParams.waybillId"
-          placeholder="运单id"
+          v-model="queryParams.packNo"
+          :placeholder="$t('合包号')"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -21,7 +13,39 @@
       <el-form-item label="" prop="billCode">
         <el-input
           v-model="queryParams.billCode"
-          placeholder="运单号"
+          :placeholder="$t('运单号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="scanDate">
+        <el-date-picker clearable
+          v-model="queryParams.scanDate"
+          type="date"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :placeholder="$t('扫描时间')">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="scanStatus">
+        <el-input
+          v-model="queryParams.scanStatus"
+          :placeholder="$t('扫描状态')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="packStatus">
+        <el-input
+          v-model="queryParams.packStatus"
+          :placeholder="$t('状态')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="scanMan">
+        <el-input
+          v-model="queryParams.scanMan"
+          :placeholder="$t('扫描员')"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -29,79 +53,97 @@
       <el-form-item label="" prop="remark">
         <el-input
           v-model="queryParams.remark"
-          placeholder="备注"
+          :placeholder="$t('备注')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      <el-form-item label="" prop="delFlag">
+        <el-input
+          v-model="queryParams.delFlag"
+          :placeholder="$t('删除标志（0代表存在')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-    </el-form>
+    </SearchForm>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['emis:emisTmsPackDtl:add']"
-        >新增</el-button>
-      </el-col>
-      <!-- 
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['emis:emisTmsPackDtl:edit']"
-        >修改</el-button>
-      </el-col> -->
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['emis:emisTmsPackDtl:remove']"
-        >删除</el-button>
-      </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['emis:emisTmsPackDtl:export']"
-        >导出</el-button>
-      </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
-    <el-table v-loading="loading" :data="emisTmsPackDtlList" @selection-change="handleSelectionChange">
+    <XdTable v-loading="loading"
+           border stripe
+           size="small"
+           :data="emisTmsPackDtlList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @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
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['emis:emisTmsPackDtl:add']"
+                >新增</el-button>
+              </el-col>
+              <!--
+              <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  icon="el-icon-edit"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleUpdate"
+                  v-hasPermi="['emis:emisTmsPackDtl:edit']"
+                >修改</el-button>
+              </el-col> -->
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                  v-hasPermi="['emis:emisTmsPackDtl:remove']"
+                >删除</el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisTmsPackDtl: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" min-width="80">
+      <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>
@@ -125,11 +167,15 @@
           </el-table-column>
       -->
 
-      <el-table-column label="合包id" align="center" prop="packId" min-width="100" />
-      <el-table-column label="运单id" align="center" prop="waybillId" min-width="100" />
-      <el-table-column label="运单号" align="center" prop="billCode" min-width="100" />
-      <el-table-column label="备注" align="center" prop="remark" min-width="100" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="100" />
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
+      <el-table-column :label="$t('扫描时间')" align="center" prop="scanDate" min-width="100" />
+      <el-table-column :label="$t('扫描状态')" align="center" prop="scanStatus" min-width="100" />
+      <el-table-column :label="$t('状态')" align="center" prop="packStatus" min-width="100" />
+      <el-table-column :label="$t('扫描员')" align="center" prop="scanMan" min-width="100" />
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -138,7 +184,7 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['emis:emisTmsPackDtl:edit']"
           >修改</el-button>
-          <!-- 
+          <!--
           <el-button
             size="mini"
             type="text"
@@ -148,67 +194,18 @@
           >删除</el-button> -->
         </template>
       </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page-sizes="[20,50,100,300,500,1000,2000,5000]"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-size="queryParams.pageSize"
-      @pagination="getList"
-    />
+    </XdTable>
 
-    <!-- 添加或修改TMS合包明细对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body>
-      <el-row :gutter="0">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-col :span="24">
-            <el-form-item label="合包id" prop="packId">
-              <el-input v-model="form.packId" placeholder="请输入合包id" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="运单id" prop="waybillId">
-              <el-input v-model="form.waybillId" placeholder="请输入运单id" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="运单号" prop="billCode">
-              <el-input v-model="form.billCode" placeholder="请输入运单号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-
-         <!-- 
-         <el-col :span="24" v-show="moreInputVisible" >  </el-col>
-         <el-col :span="24">
-             <el-divider content-position="right"  @click="handleShowMoreInput" >更多信息[+]</el-divider>
-         </el-col> 
-         -->
-
-        </el-form>
-      </el-row>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" append-to-body>
+    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisTmsPackDtlForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsPackDtlForm>
     </el-dialog>
 
 
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  append-to-body>
+    <!--
+    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
         <emisTmsPackDtlView :id="id" ></EmisTmsPackDtlView>
     </el-dialog>
+    -->
 
   </div>
 </template>
@@ -216,12 +213,12 @@
 <script>
 import { listEmisTmsPackDtl, getEmisTmsPackDtl, delEmisTmsPackDtl, addEmisTmsPackDtl, updateEmisTmsPackDtl } from "@/api/emis/emisTmsPackDtl";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-import emisTmsPackDtlView from '@/views/emis/emisTmsPackDtl/emisTmsPackDtlView';
+// import emisTmsPackDtlView from '@/views/emis/emisTmsPackDtl/emisTmsPackDtlView';
 import emisTmsPackDtlForm from '@/views/emis/emisTmsPackDtl/emisTmsPackDtlForm';
 
 export default {
   name: "emisTmsPackDtl",
-  components: { elDateSimplePicker,emisTmsPackDtlView,emisTmsPackDtlForm },
+  components: { elDateSimplePicker,emisTmsPackDtlForm },
   dicts: [
   ],
   data() {
@@ -242,45 +239,34 @@ export default {
       total: 0,
       // TMS合包明细表格数据
       emisTmsPackDtlList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
 
+      currentId:null,
       openForm: false,
       titleForm: "",
 
-      titleEmisTmsPackDtl: "",
-      openEmisTmsPackDtl: false,
-
-      // 显示编辑框更多
-      moreInputVisible: false,
-
       // 弹出展示层
       id:null,
       titleView:"",
       openView: false,
-      // 备注时间范围
+      // 更新网点时间范围
+      daterangeScanDate: [],
+      // 更新网点时间范围
       daterangeCreateTime: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        packId: null,
-        waybillId: null,
+        packNo: null,
         billCode: null,
-        remark: null
+        scanDate: null,
+        scanStatus: null,
+        packStatus: null,
+        scanMan: null,
+        remark: null,
+        delFlag: null,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
-        ],
-      }
     };
   },
   created() {
@@ -291,6 +277,10 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.params = {};
+      if (null != this.daterangeScanDate && '' != this.daterangeScanDate) {
+        this.queryParams.params["beginScanDate"] = this.daterangeScanDate[0];
+        this.queryParams.params["endScanDate"] = this.daterangeScanDate[1];
+      }
       if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
         this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
         this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
@@ -305,27 +295,7 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        packId: null,
-        waybillId: null,
-        billCode: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null
-      };
-      this.resetForm("form");
-    },
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -342,37 +312,26 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.reset();
-      this.open = true;
-      this.title = "新增";
-
-    // 子组件打开模式
-    //   if(row != undefined){
-    //     this.currentParentId = row.id
-    //   }
-    //   this.openEmisTmsPackDtl = true;
-    //   this.titleEmisTmsPackDtl = "新增";
+      this.currentId=null;
+      this.openForm= true;
+      this.titleForm = "新增";
     },
     handleShowMoreInput(){
       this.moreInputVisible = !this.moreInputVisible;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getEmisTmsPackDtl(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改";
-      });
-
-       // 子组件打开模式
-    //    this.currentId= row.id || this.ids;
-    //    this.openEmisTmsPackDtl = true;
-    //    this.titleEmisTmsPackDtl = "修改";
-
+       this.currentId= row.id;
+       this.openForm = true;
+       this.titleForm = "修改";
     },
     handleView(row) {
        this.id=row.id;
@@ -380,26 +339,6 @@ export default {
        this.openView=true;
     //   this.router.push({ path: '/emis/emisTmsPackDtl/viewDetail', query: { id: row.id }})
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateEmisTmsPackDtl(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addEmisTmsPackDtl(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
     handleFormChanged(){
         this.openForm = false;
         this.getList();
@@ -434,8 +373,8 @@ export default {
         if (response.code === 200) {
                 const curList = response.rows
                 import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','合包id','运单id','运单号','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','备注',];
-                  const filterVal = ['id','packId','waybillId','billCode','delFlag','createBy','createTime','updateBy','updateTime','remark',];
+                  const tHeader = ['id','合包号','运单号','扫描时间','扫描状态','状态','扫描员','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
+                  const filterVal = ['id','packNo','billCode','scanDate','scanStatus','packStatus','scanMan','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
                   const data = this.formatJson(filterVal, curList, response.rows)
                   excel.export_json_to_excel({
                     header: tHeader,
diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
index 5b5bd62a..2bfd3560 100644
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue
@@ -417,7 +417,7 @@
                             </el-table-column>
                             <el-table-column prop="cargoQty" label="件数" align="center" width="60">
                               <template slot-scope="scope">
-                                <el-input  v-model="scope.row.cargoQty" @blur="(val)=>handleCargoQtyChange(val,scope.row)" @keyup.enter.native="(val)=>handleCargoQtyChange(val,scope.row)"  size="mini" placeholder=""></el-input>
+                                <el-input v-model="scope.row.cargoQty" @blur="(val)=>handleCargoQtyChange(val,scope.row)" @keyup.enter.native="(val)=>handleCargoQtyChange(val,scope.row)"  size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
 
@@ -1010,13 +1010,13 @@ computed:{
       },
       deep: true
     },
-    // "form.volumeWeight":{
-    //   handler (newValue, oldValue) {
-    //     this.reCalcSettlementWeight();
-    //   },
-    //   immediate: false,
-    //   deep: true
-    // },
+    "form.volumeWeight":{
+      handler (newValue, oldValue) {
+        this.reCalcSettlementWeight();
+      },
+      immediate: false,
+      deep: true
+    },
     "form.billWeight":{
       handler (newValue, oldValue) {
         this.reCalcSettlementWeight();
@@ -1526,13 +1526,14 @@ methods: {
 
     let totalVolume=0.0;
     if(row!=null){
-      let volume=parseFloat(row.length)*parseFloat(row.width)*parseFloat(row.height);
-      row.volume=parseFloat((volume/1000000).toFixed(5))*parseFloat(row.cargoQty);
+      let volume=parseFloat(row.length)*parseFloat(row.width)*parseFloat(row.height)*parseFloat(row.cargoQty);
+      row.volume=parseFloat((volume/1000000).toFixed(5));
     }
 
     this.form.cargoList.forEach(item=>{
         totalVolume=totalVolume+item.volume;
     });
+
     this.form.totalVolume = parseFloat(totalVolume.toFixed(5));
 
   },
@@ -1737,9 +1738,11 @@ methods: {
       this.form.cargoList=[];
     }
   },
-  handleCargoQtyChange(){
+  handleCargoQtyChange(val,row){
+    console.log(row);
+
     this.handleInitGenGoods();
-    this.handleCalcVolume();
+    this.handleCalcVolume(row);
   },
   deleteGoodsItem(row,index){
     this.$confirm('确定删除?', '提示', {
@@ -1751,7 +1754,7 @@ methods: {
       // this.form.cargoList=newList;
       console.log(index);
       this.form.cargoList.splice(index,1)
-      this.handleCalcVolume();
+      this.handleCalcVolume(row);
     }).catch(() => {
     })
   },