From 260b78e7b92302578a9877d5e50cc7368978b553 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 27 Mar 2026 11:12:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../signatureRecordQuery.vue                  | 295 +++++++++---------
 1 file changed, 152 insertions(+), 143 deletions(-)

diff --git a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
index 669e327c..83659881 100644
--- a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
@@ -1,14 +1,14 @@
 <template>
   <XdPageContainer class="app-container">
       <SearchForm   slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="getList" @reset="resetQuery">
-          <el-form-item label="" prop="billCode">
-            <div slot="label">
-              <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
-                <el-radio label="1">运单号</el-radio>
-                <el-radio label="0">订单号</el-radio>
-              </el-radio-group>
-            </div>
-            <!-- <el-input
+      <el-form-item label="" prop="billCode">
+        <div slot="label">
+          <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
+            <el-radio label="1">运单号</el-radio>
+            <el-radio label="0">订单号</el-radio>
+          </el-radio-group>
+        </div>
+        <!-- <el-input
               v-model="queryParams.billCode"
               :placeholder="$t('多个流水号逗号或换行隔开')"
               clearable
@@ -21,40 +21,40 @@
                 clearable
                 :rows="2"
               />
-          </el-form-item>
-        <!-- </el-col> -->
-        <!-- <el-col :span="16"> -->
-          <el-form-item label="签收时间" prop="dateTimeRange">
+      </el-form-item>
+      <!-- </el-col> -->
+      <!-- <el-col :span="16"> -->
+      <el-form-item label="签收时间" prop="dateTimeRange">
             <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
-          </el-form-item>
-        <!-- </el-col> -->
-        <!-- <el-col :span="8"> -->
-          <el-form-item :label="$t('签收网点')" prop="signSiteCode" label-width="70px">
+      </el-form-item>
+      <!-- </el-col> -->
+      <!-- <el-col :span="8"> -->
+      <el-form-item :label="$t('签收网点')" prop="signSiteCode" label-width="70px">
             <EmisSiteSimplePicker v-model="queryParams.signSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
-          </el-form-item>
-        <!-- </el-col> -->
-        <!-- <el-col :span="8"> -->
-          <el-form-item :label="$t('签收图片')" prop="isUploadPic">
-            <el-select v-model="queryParams.params.isUploadPic" clearable :placeholder="$t('全部')" value="0">
-              <el-option :label="$t('未上传')" value="0"></el-option>
-              <el-option :label="$t('已上传')" value="1"></el-option>
-            </el-select>
-          </el-form-item>
-        <!-- </el-col> -->
-        <!-- <el-col :span="8"> -->
-          <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
+      </el-form-item>
+      <!-- </el-col> -->
+      <!-- <el-col :span="8"> -->
+      <el-form-item :label="$t('签收图片')" prop="isUploadPic">
+        <el-select v-model="queryParams.params.isUploadPic" clearable :placeholder="$t('全部')" value="0">
+          <el-option :label="$t('未上传')" value="0"></el-option>
+          <el-option :label="$t('已上传')" value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <!-- </el-col> -->
+      <!-- <el-col :span="8"> -->
+      <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
             <EmisUserSimplePicker v-model="queryParams.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
-          </el-form-item>
-        <!-- </el-col> -->
+      </el-form-item>
+      <!-- </el-col> -->
 
-        <!-- <el-col :span="8"> -->
-          <el-form-item :label="$t('收件国家')" prop="country" label-width="70px">
+      <!-- <el-col :span="8"> -->
+      <el-form-item :label="$t('收件国家')" prop="country" label-width="70px">
             <CountryPicker v-model="queryParams.country"  @onChange="onCountrySelect"  ></CountryPicker>
-          </el-form-item>
-        <!-- </el-col> -->
+      </el-form-item>
+      <!-- </el-col> -->
 
 
-      </SearchForm>
+    </SearchForm>
 
 
     <xd-table
@@ -62,7 +62,7 @@
          slot="pageContent"
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
-
+          ref="refTable"
           v-loading="loading"
            border
            size="mini"
@@ -78,15 +78,15 @@
            >
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
+          <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
                   size="mini"
                   @click="handleExport"
                 >导出</el-button>
-              </el-col>
-          </el-row>
+          </el-col>
+        </el-row>
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
@@ -109,26 +109,26 @@
       </el-table-column>
 
       <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="170" >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.waybillDetail.sendDate) }}</span>
-          </template>
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.waybillDetail.sendDate) }}</span>
+        </template>
       </el-table-column>
       <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="150" >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.waybillDetail.estimateDate) }}</span>
-          </template>
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.waybillDetail.estimateDate) }}</span>
+        </template>
       </el-table-column>
-      <el-table-column :label="$t('线路')" align="center" prop="" min-width="100">
+      <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.waybillDetail.transLineTypeName }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
-          <template slot-scope="scope">
+        <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
-          </template>
-        </el-table-column>
-      <el-table-column :label="$t('产品类型')" align="center" prop="" min-width="100">
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.waybillDetail.productTypeName }}</span>
         </template>
@@ -162,8 +162,8 @@
       <el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" />
       <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="150">
         <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.waybillDetail.customerName }}</span>
-          </template>
+          <span class="ellipsis">{{ scope.row.waybillDetail.customerName }}</span>
+        </template>
       </el-table-column>
       <el-table-column :label="$t('数据产生来源')" align="center" prop="dataFrom" min-width="150">
         <template slot-scope="scope">
@@ -320,22 +320,7 @@ export default {
     /** 查询扫描记录列表 */
     getList() {
       this.loading = true;
-      console.log("---->this.queryParams,", this.queryParams);
-      let queryParams = Object.assign({},this.queryParams);
-      if (null != this.dateTimeRange && '' != this.dateTimeRange) {
-        queryParams.params.beginScanDate = dateToStr(new Date(this.dateTimeRange[0]));
-        queryParams.params.endScanDate = dateToStr(new Date(this.dateTimeRange[1]));
-      }else{
-        queryParams.params.beginScanDate = null;
-        queryParams.params.endScanDate = null;
-      }
-      if(this.queryParams.params.queryOrderType == "1"){
-        queryParams.orderSN=null;
-      }else if(this.queryParams.params.queryOrderType == "0"){
-        queryParams.orderSN=this.queryParams.billCode;
-        queryParams.billCode=null;
-      }
-      queryParams.scanType="50";
+      let queryParams = this.initQueryParams();
       listEmisTmsScanRecord(queryParams).then(response => {
         this.tmsScanList = [];
         this.loading = false;
@@ -356,6 +341,24 @@ export default {
         }
       });
     },
+    initQueryParams() {
+      let qParam = Object.assign({}, this.queryParams);
+      if (null != this.dateTimeRange && '' != this.dateTimeRange) {
+        qParam.params.beginScanDate = dateToStr(new Date(this.dateTimeRange[0]));
+        qParam.params.endScanDate = dateToStr(new Date(this.dateTimeRange[1]));
+      } else {
+        qParam.params.beginScanDate = null;
+        qParam.params.endScanDate = null;
+      }
+      if (this.queryParams.params.queryOrderType == "1") {
+        qParam.orderSN = null;
+      } else if (this.queryParams.params.queryOrderType == "0") {
+        qParam.orderSN = this.queryParams.billCode;
+        qParam.billCode = null;
+      }
+      qParam.scanType = "50";
+      return qParam;
+    },
     onStaffSelect(item){
       this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
       this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
@@ -440,25 +443,12 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-     const loadingInstance = this.$loading({
-            text: '正在导出...'
-        })
-      let queryParams = Object.assign({},this.queryParams);
-      queryParams.pageNum=1;
-      queryParams.pageSize=5000;
-      if (null != this.dateTimeRange && '' != this.dateTimeRange) {
-        queryParams.params.beginSignDate = this.dateTimeRange[0];
-        queryParams.params.endSignDate = this.dateTimeRange[1];
-      }else{
-        queryParams.params.beginSignDate = null;
-        queryParams.params.endSignDate = null;
-      }
-      if(this.queryParams.params.queryOrderType == "1"){
-        queryParams.orderSN=null;
-      }else if(this.queryParams.params.queryOrderType == "0"){
-        queryParams.orderSN=this.queryParams.billCode;
-        queryParams.billCode=null;
-      }
+      const loadingInstance = this.$loading({
+        text: '正在导出...'
+      })
+      let queryParams = this.initQueryParams();
+      queryParams.pageNum = 1;
+      queryParams.pageSize = 5000;
       listEmisTmsScanRecord(queryParams).then(response => {
         this.downloadLoading = false
         let rows = response.rows;
@@ -467,40 +457,27 @@ export default {
           this.$modal.msgError("未查到单号");
           return;
         }
-        // for (let index = 0; index < rows.length; index++) {
-        //   let scanRstItem = rows[index];
-        //   console.log(scanRstItem);
-        //   let record =Object.assign({}, scanRstItem)
-        //   record.queryType = this.queryParams.queryType;
-        //   record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
-        //   record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
-        //   this.tmsScanList.push(record);
-        // }
         if (response.code === 200) {
-          const curList = []
-          for (let index = 0; index < response.rows.length; index++) {
-            let scanRstItem = response.rows[index];
-            let record =Object.assign({}, scanRstItem)
-            record.orderType = this.queryParams.orderType;
-            record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
-            record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
-            curList.push(record);
-          }
-          import('@/vendor/Export2Excel').then(excel => {
-            const tHeader = ['id','单号','单号类型','车牌号','扫描时间','扫描类型','扫描网点','上/下一网点','扫描员','录入时间','扫描重量'];
-            const filterVal = ['id','billCode','orderType','carNo','scanDate','scanType','scanSite','preOrNextStation','scanMan','createTime','scanWeight'];
-            const data = this.formatJson(filterVal, curList, curList)
-            excel.export_json_to_excel({
-              header: tHeader,
-              data,
-              filename: '签收记录',
-              autoWidth: true
-            })
-            loadingInstance.close()
-          })
+          this.exportData(rows,loadingInstance);
         }
       });
     },
+    exportData(selData, loadingInstance) {
+      const curList = selData
+      import('@/vendor/Export2Excel').then(excel => {
+        const exportParam = this.$refs.refTable.getExportParam();
+        const tHeader = exportParam.header;
+        const filterVal = exportParam.filter;
+        const data = this.formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '签收记录列表',
+          autoWidth: true
+        })
+        loadingInstance.close()
+      })
+    },
     formatJson(filterVal, jsonData, resData) {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
@@ -508,18 +485,50 @@ export default {
           return ++index
         }
         if (j === 'status') {
-          var statusStr='xxx'
-          if(v[j] == 10){
-              statusStr='xxx'
-          }
-          return statusStr;
+          return '已签收';
+        }
+        if (j === 'sendDate') {
+          //formatJson
+          return v['waybillDetail']?.[j]||'';
+        }
+        //waybillDetail.estimateDate
+        if (j === 'estimateDate') {
+          return v['waybillDetail']?.[j]||'';
+        }
+        //waybillDetail.transLineTypeName
+        if (j === 'transLineTypeName') {
+          return v['waybillDetail']?.[j]||'';
+        }
+        //paymentType
+        if (j === 'paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail'][j]);
+        }
+        //waybillDetail.timeType
+        if (j === 'timeType') {
+          return v['waybillDetail']?.[j]||'';
+        }
+        //waybillDetail.customerName
+        if (j === 'customerName') {
+          return v['waybillDetail']?.[j]||'';
+        }
+        //waybillDetail.receiveCountryName
+        if (j === 'waybillDetail.receiveCountryName') {
+          return v['waybillDetail']?.['receiveCountryName']||'';
+        }
+        // waybillDetail.receiveProvinceName
+        if (j === 'waybillDetail.receiveProvinceName') {
+          return v['waybillDetail']?.['receiveProvinceName']||'';
+        }
+        //waybillDetail.productTypeName
+        if (j === 'productTypeName') {
+          return v['waybillDetail']?.[j]||'';
         }
         return v[j]
       }))
     },
     /** 列索引函数  */
     getIndex($index) {
-          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+      return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
     },
   }
 };
@@ -527,26 +536,26 @@ export default {
 
 <style scoped>
   .el-divider{
-    margin-top: 0px;
-    background: 0 0;
-    border-top: 1px solid #E6EBF5;
-  }
-  .el-divider__text {
-    color: #0955ee;
-    cursor: pointer;
-  }
-  .query-label {
+  margin-top: 0px;
+  background: 0 0;
+  border-top: 1px solid #E6EBF5;
+}
+.el-divider__text {
+  color: #0955ee;
+  cursor: pointer;
+}
+.query-label {
     .el-radio{
-        display: block;
-        line-height: 23px;
-        white-space: normal;
-        margin-right: 0;
-    }
-  }
-  .ellipsis {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    vertical-align: top;
-    white-space: nowrap;
+    display: block;
+    line-height: 23px;
+    white-space: normal;
+    margin-right: 0;
   }
+}
+.ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  vertical-align: top;
+  white-space: nowrap;
+}
 </style>

From 70c957c2e3049f1abaad59e758221ae0e934db19 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 27 Mar 2026 13:37:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=9D=83=E9=87=8D?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tpl/import_special_calc_weight.xlsx       | Bin 0 -> 10299 bytes
 src/api/emis/emisSpecialCalcWeight.js         |   9 +
 .../batchImportSpecialCalcWeight.vue          | 414 ++++++++++++++++++
 .../emis/emisSpecialCalcWeight/index.vue      |  24 +-
 4 files changed, 445 insertions(+), 2 deletions(-)
 create mode 100644 public/static/tpl/import_special_calc_weight.xlsx
 create mode 100644 src/views/emis/emisSpecialCalcWeight/batchImportSpecialCalcWeight.vue

diff --git a/public/static/tpl/import_special_calc_weight.xlsx b/public/static/tpl/import_special_calc_weight.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..8ad7dcce35bc7e8607046d6d101e92dd71fa3131
GIT binary patch
literal 10299
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

literal 0
HcmV?d00001

diff --git a/src/api/emis/emisSpecialCalcWeight.js b/src/api/emis/emisSpecialCalcWeight.js
index ea8cadf1..82c94a41 100644
--- a/src/api/emis/emisSpecialCalcWeight.js
+++ b/src/api/emis/emisSpecialCalcWeight.js
@@ -42,3 +42,12 @@ export function delEmisSpecialCalcWeight(id) {
     method: 'delete'
   })
 }
+
+//批量导入特殊取重
+export function draftSubmitSpecialCalcWeight(data) {
+  return request({
+    url: '/emis/emisSpecialCalcWeight/draftSubmitSpecialCalcWeight',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/views/emis/emisSpecialCalcWeight/batchImportSpecialCalcWeight.vue b/src/views/emis/emisSpecialCalcWeight/batchImportSpecialCalcWeight.vue
new file mode 100644
index 00000000..e126276b
--- /dev/null
+++ b/src/views/emis/emisSpecialCalcWeight/batchImportSpecialCalcWeight.vue
@@ -0,0 +1,414 @@
+<template>
+  <XdPageContainer >
+    <div slot="pageHeader"></div>
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+          storageName="batchSiteBatchRecord_main_9"
+
+          ref="multipleTable"
+          :row-class-name="tableRowClassName"
+           v-loading="loading"
+           border
+           size="mini"
+           :data="orderList"
+           :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-upload
+                  action=""
+                  name="file"
+                  accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                  :show-file-list="true"
+                  :limit="1"
+                  :file-list="fileList"
+                  :tooltip="fileName"
+                  :on-change="fileChange"
+                  :before-upload="beforeUpload">
+                  <el-button slot="trigger" plain class="filter-item" size="mini"  type="primary" >选择文件</el-button>
+                  <el-link type="primary" style="line-height: 28px;font-size:13px;color:blue" href="/static/tpl/import_destination.xlsx">下载导入Excel模板</el-link>
+                </el-upload>
+           </el-col>
+            <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleRealUploadAll"
+                >批量发送</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                >删除</el-button>
+              </el-col>
+          </el-row>
+      </div>
+
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column :label="$t('状态')" align="center" prop="uploadStatus" min-width="80" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+              <el-tag v-if="scope.row.uploadStatus==1" type="success">发送成功</el-tag>
+              <el-tag v-if="scope.row.uploadStatus==0" type="info">待发送</el-tag>
+              <el-tag v-if="scope.row.uploadStatus==-1" type="danger">发送异常</el-tag>
+          </template>
+      </el-table-column> 
+      <el-table-column :label="$t('异常信息')" align="center" prop="errorInfo" min-width="300" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+              <span v-if="scope.row.uploadStatus==-1" style="color:red">{{ scope.row.errorInfo }}</span>
+              <span v-if="scope.row.uploadStatus==1">发送成功</span>
+              <span v-if="scope.row.uploadStatus==0">待发送</span>
+
+          </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('所属国家')" align="center" prop="country" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('所属线路')" align="center" prop="lineCode" min-width="120" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('产品类型')" align="center" prop="prodCode" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('取重方式')" align="center" prop="carryType" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('起始重量')" align="center" prop="beginWeight" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('结束重量')" align="center" prop="endWeight" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('生效时间')" align="center" prop="beginDate" min-width="150" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column :label="$t('失效时间')" align="center" prop="endDate" min-width="150" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" :show-overflow-tooltip="true"/>
+    </XdTable>
+  </XdPageContainer>
+</template>
+
+<script>
+import { draftSubmitSpecialCalcWeight } from "@/api/emis/emisSpecialCalcWeight";
+import {timeDiffTime,excelDateToJSDate, timeFormat} from '@/utils/dateUtils'
+import XLSX from 'xlsx'
+
+export default {
+  name: "BatchImportDestination",
+  components: {
+  },
+  data() {
+    return {
+      resetRefreshId:null,
+      // 遮罩层
+      loading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+
+      // 总条数
+      total: 0,
+      // 运单列表表格数据
+      orderList: [],
+      tmpDataList: [],
+      selectionList:[],
+      selectionIndexList: [],
+
+      form:{},
+      rules:{},
+
+      openUploadForm:false,
+      uploadMsg:"",
+      uploadExcelDataInfo:"",
+      fileName:"",
+      fileList:[],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        queryKey:null,
+      },
+    };
+  },
+  created() {
+
+  },
+  mounted() {
+
+  },
+  methods: {
+    getUUID() {
+        return Math.random().toString(36).substring(3,10);
+    },
+    handleBatchImport(){
+      this.resetRefreshId="importForm-"+this.getUUID();
+
+      this.openUploadForm=true;
+      this.fileList=[];
+      this.uploadExcelDataInfo="";
+      this.fileName="";
+
+    },
+    calcDeliveryTime(startData,endDate){
+        return timeDiffTime(startData,endDate)
+    },
+      //标红table指定行
+    tableRowClassName(row, index) {
+      row.row.index = row.rowIndex;
+      if (row.uploadStatus=='1') {
+        return 'success-row';
+      }
+      else if (row.uploadStatus=='-1') {
+        return 'warning-row';
+      }
+      return '';
+    },
+    /** 查询运单列表列表 */
+    getList() {
+      this.loading = true;
+    },
+    fileChange(file, fileList) {
+          this.fileList = fileList;
+    },
+    beforeUpload(file) {
+      this.fileName = file.name;
+      this.form.batchName = file.name;
+      this.readerData(file)
+      return false
+    },
+    readerData(rawFile) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        reader.onload = e => {
+          const data = e.target.result
+          const workbook = XLSX.read(data, { type: 'array'})
+          const firstSheetName = workbook.SheetNames[0] // firstSheetName
+          // if (!excelTypes.includes(firstSheetName)) {
+          //   reject('无法识别当前Excel模板')
+          //   this.$modal.msgError('无法识别当前Excel模板')
+          //   return
+          // }
+          const worksheet = workbook.Sheets[firstSheetName]
+          // const header = this.getHeaderRow(worksheet) // 标题
+          const results = XLSX.utils.sheet_to_json(worksheet)
+
+          console.log(results);
+
+          this.batchImportData(results);
+
+          resolve()
+        }
+        reader.readAsArrayBuffer(rawFile)
+      })
+    },
+    getHeaderRow(sheet) {
+      const headers = []
+      const range = XLSX.utils.decode_range(sheet['!ref'])
+      let C
+      const R = range.s.r
+      /* start in the first row */
+      for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+        const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })]
+        /* find the cell in the first row */
+        let hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+        if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+        headers.push(hdr)
+      }
+      return headers
+    },
+    async batchImportData(results) {
+      const _index = 1
+      let loadingInstance = this.$loading({
+        text: '正在解析 ' + _index + ' 数据...'
+      })
+
+      this.orderList = [];
+
+      // 组装提交的数据
+      for (let index = 0; index < results.length; index++) {
+        const element = results[index]
+        let orderData={
+            country: element['所属国家'],
+            transLineCode: element['所属线路'],
+            prodCode: element['产品类型'],
+            carryType: element['取重方式'],
+            beginWeight: element['起始重量'],
+            endWeight: element['结束重量'],
+            beginDate: element['生效时间'],
+            endDate: element['失效时间'],
+            remark: element['备注'],
+            uploadStatus: 0,
+            errorInfo: '',
+        }
+         //转时间格式
+        if(orderData.beginDate){
+            // orderData.beginDate=timeFormat(orderData.beginDate,'YYYY-MM-DD HH:mm:ss')
+            orderData.beginDate=excelDateToJSDate(orderData.beginDate);
+        }
+        if(orderData.endDate){
+            // orderData.endDate=timeFormat(orderData.endDate,'YYYY-MM-DD HH:mm:ss')
+            orderData.endDate=excelDateToJSDate(orderData.endDate);
+        }
+        //数据转换
+        this.tmpDataList.push(orderData);
+        
+    }
+    
+    // 判断是否有数据
+    this.orderList=[];
+    if(this.tmpDataList.length==0){
+        this.$modal.msgError('表格中没有数据');
+        loadingInstance.close()
+        return;
+    }
+      this.tmpDataList=this.tmpDataList.map(item=>this.transformData(item));
+      this.orderList = this.orderList.concat(this.tmpDataList);
+      this.tmpDataList=[];
+      loadingInstance.close()
+
+    },
+    // 数据转换
+    transformData(orderData){
+        orderData.status=orderData.status=='启用'?'1':'0';
+        orderData.isHinterland=orderData.isHinterland=='是'?'1':'0';
+        return orderData;
+    },
+    handleRealUploadAll(){
+          if (this.ids && this.ids.length>0) {
+            this.$confirm("确认发送吗?", "提示", {
+                cancelButtonText: "取消",
+                confirmButtonText: "确认",
+                type: "warning",
+                distinguishCancelAndClose: true,
+                closeOnClickModal: false
+            }).then(async () => {
+
+              if(this.selectionList&&this.selectionList.length>0){
+                for(let i=0;i<this.selectionList.length;i++){
+                  let orderItem=this.selectionList[i];
+
+                  // 检查数据后发送
+                  let res=await draftSubmitSpecialCalcWeight(orderItem)
+                  let rstData=res.data;
+                  if(rstData.result=='success'){
+                    orderItem.uploadStatus=1;
+                    orderItem.errorInfo="发送成功";
+                    orderItem.batchNo=rstData.batchNo;
+                  }
+                  else{
+                    orderItem.uploadStatus=-1;
+                    orderItem.errorInfo=rstData.msg;
+                  }
+
+                }
+                this.$modal.msgSuccess("上传成功");
+
+              }
+            });
+
+          }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      // this.queryParams.pageNum = 1;
+      // this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      // this.resetForm("queryForm");
+      // this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+
+      this.selectionList=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();
+    },
+
+    cancel(){
+      this.openUploadForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      let that=this;
+      this.$modal.confirm('是否确认删除').then(function() {
+        that.selectionList.forEach((item,index) =>{
+          that.orderList.forEach((v,i)=>{
+                if(item.index === v.index){
+                  that.orderList.splice(i,1)
+                }
+            })
+        })
+        that.$refs.multipleTable.clearSelection();
+      }).then(() => {
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+:deep .el-form-item__label-wrap {
+  margin-left: 0 !important;
+  }
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+
+
+   .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+
+  .queryForm .el-form-item {
+    margin-bottom: 0px !important;
+  }
+
+  :deep .el-table .success-row {
+    color: rgb(21, 174, 31) !important;
+  }
+
+  :deep .el-table .warning-row {
+    color: #f51f1f !important;
+  }
+
+  :deep .el-form-item__label {
+    text-align: left;
+  }
+</style>
diff --git a/src/views/emis/emisSpecialCalcWeight/index.vue b/src/views/emis/emisSpecialCalcWeight/index.vue
index e0b21728..0d2556ec 100644
--- a/src/views/emis/emisSpecialCalcWeight/index.vue
+++ b/src/views/emis/emisSpecialCalcWeight/index.vue
@@ -109,6 +109,16 @@
                   v-hasPermi="['emis:emisSpecialCalcWeight:export']"
                 >导出</el-button>
               </el-col> -->
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-upload"
+                  size="mini"
+                  @click="handleBatchAdd"
+                  v-hasPermi="['emis:emisSpecialCalcWeight:draftSubmitSpecialCalcWeight']"
+                >批量导入</el-button>
+              </el-col>
           </el-row>
       </div>
 
@@ -177,7 +187,10 @@
         <emisSpecialCalcWeightView :id="id" ></EmisSpecialCalcWeightView>
     </el-dialog>
     -->
-
+<!-- 批量新增特殊取重弹窗 -->
+ <el-dialog :title="titleBatchAdd" :visible.sync="openBatchAdd" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
+  <batchImportSpecialCalcWeight></batchImportSpecialCalcWeight>
+</el-dialog>
   </XdPageContainer>
 </template>
 
@@ -189,10 +202,11 @@ import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
 import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
+import batchImportSpecialCalcWeight from '@/views/emis/emisSpecialCalcWeight/batchImportSpecialCalcWeight.vue';
 
 export default {
   name: "EmisSpecialCalcWeight",
-  components: { CountryPicker,TransLinePicker,elDateSimplePicker,TransProductPicker,emisSpecialCalcWeightForm ,TransProductCasPicker},
+  components: { CountryPicker,TransLinePicker,elDateSimplePicker,TransProductPicker,emisSpecialCalcWeightForm ,TransProductCasPicker,batchImportSpecialCalcWeight},
   dicts: [
         'sys_normal_disable',
         'emis_take_weight_method',
@@ -236,6 +250,8 @@ export default {
       daterangeCreateTime: [],
       // 更新时间时间范围
       daterangeUpdateTime: [],
+      openBatchAdd: false,
+      titleBatchAdd: "批量新增特殊取重",
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -391,6 +407,10 @@ export default {
     dateTimeChange(value){
         this.dateTimeRange=value;
     },
+    handleBatchAdd(){
+      this.openBatchAdd= true;
+      this.batchAddTitleForm = "批量导入";
+    },
   }
 };
 </script>

From 02b48f23ffe2271a9852c56fdfbc1058686eb8aa Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 27 Mar 2026 13:56:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=8F=96=E9=87=8D?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/tpl/import_country.xlsx         | Bin 0 -> 9961 bytes
 src/api/emis/emisCountry.js                   |   9 +
 .../emis/emisCountry/batchImportCountry.vue   | 400 ++++++++++++++++++
 src/views/emis/emisCountry/index.vue          |  24 +-
 .../batchImportSpecialCalcWeight.vue          |   2 +-
 5 files changed, 433 insertions(+), 2 deletions(-)
 create mode 100644 public/static/tpl/import_country.xlsx
 create mode 100644 src/views/emis/emisCountry/batchImportCountry.vue

diff --git a/public/static/tpl/import_country.xlsx b/public/static/tpl/import_country.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..ad3a78b9071f18ed3180fddb1937363a93fc482d
GIT binary patch
literal 9961
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
a(w~7}MIH{q2LJ#K@~VSSit<Mh74Sd#LC|ji

literal 0
HcmV?d00001

diff --git a/src/api/emis/emisCountry.js b/src/api/emis/emisCountry.js
index 38dafdab..a6d5bdf2 100644
--- a/src/api/emis/emisCountry.js
+++ b/src/api/emis/emisCountry.js
@@ -51,3 +51,12 @@ export function delEmisCountry(id) {
     method: 'delete'
   })
 }
+
+//批量导入国家
+export function draftSubmitCountry(data) {
+  return request({
+    url: '/emis/emisCountry/draftSubmitCountry',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/views/emis/emisCountry/batchImportCountry.vue b/src/views/emis/emisCountry/batchImportCountry.vue
new file mode 100644
index 00000000..af22def4
--- /dev/null
+++ b/src/views/emis/emisCountry/batchImportCountry.vue
@@ -0,0 +1,400 @@
+<template>
+  <XdPageContainer >
+    <div slot="pageHeader"></div>
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+          storageName="batchSiteBatchRecord_main_9"
+
+          ref="multipleTable"
+          :row-class-name="tableRowClassName"
+           v-loading="loading"
+           border
+           size="mini"
+           :data="orderList"
+           :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-upload
+                  action=""
+                  name="file"
+                  accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                  :show-file-list="true"
+                  :limit="1"
+                  :file-list="fileList"
+                  :tooltip="fileName"
+                  :on-change="fileChange"
+                  :before-upload="beforeUpload">
+                  <el-button slot="trigger" plain class="filter-item" size="mini"  type="primary" >选择文件</el-button>
+                  <el-link type="primary" style="line-height: 28px;font-size:13px;color:blue" href="/static/tpl/import_country.xlsx">下载导入Excel模板</el-link>
+                </el-upload>
+           </el-col>
+            <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleRealUploadAll"
+                >批量发送</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                >删除</el-button>
+              </el-col>
+          </el-row>
+      </div>
+
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column :label="$t('状态')" align="center" prop="uploadStatus" min-width="80" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+              <el-tag v-if="scope.row.uploadStatus==1" type="success">发送成功</el-tag>
+              <el-tag v-if="scope.row.uploadStatus==0" type="info">待发送</el-tag>
+              <el-tag v-if="scope.row.uploadStatus==-1" type="danger">发送异常</el-tag>
+          </template>
+      </el-table-column> 
+      <el-table-column :label="$t('异常信息')" align="center" prop="errorInfo" min-width="300" :show-overflow-tooltip="true" >
+        <template slot-scope="scope">
+              <span v-if="scope.row.uploadStatus==-1" style="color:red">{{ scope.row.errorInfo }}</span>
+              <span v-if="scope.row.uploadStatus==1">发送成功</span>
+              <span v-if="scope.row.uploadStatus==0">待发送</span>
+
+          </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('国家名称')" align="center" prop="name" min-width="120" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('英文名称')" align="center" prop="nameEn" min-width="120" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('国家编码')" align="center" prop="code" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('电话区号')" align="center" prop="telAreaCode" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('所属区域')" align="center" prop="continentId" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('二字码')" align="center" prop="twoCode" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('三字码')" align="center" prop="threeCode" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" :show-overflow-tooltip="true"/>
+    </XdTable>
+  </XdPageContainer>
+</template>
+
+<script>
+import { draftSubmitCountry } from "@/api/emis/emisCountry";
+import {timeDiffTime} from '@/utils/dateUtils'
+import XLSX from 'xlsx'
+
+export default {
+  name: "BatchImportCountry",
+  components: {
+  },
+  data() {
+    return {
+      resetRefreshId:null,
+      // 遮罩层
+      loading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+
+      // 总条数
+      total: 0,
+      // 运单列表表格数据
+      orderList: [],
+      tmpDataList: [],
+      selectionList:[],
+      selectionIndexList: [],
+
+      form:{},
+      rules:{},
+
+      openUploadForm:false,
+      uploadMsg:"",
+      uploadExcelDataInfo:"",
+      fileName:"",
+      fileList:[],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        queryKey:null,
+      },
+    };
+  },
+  created() {
+
+  },
+  mounted() {
+
+  },
+  methods: {
+    getUUID() {
+        return Math.random().toString(36).substring(3,10);
+    },
+    handleBatchImport(){
+      this.resetRefreshId="importForm-"+this.getUUID();
+
+      this.openUploadForm=true;
+      this.fileList=[];
+      this.uploadExcelDataInfo="";
+      this.fileName="";
+
+    },
+    calcDeliveryTime(startData,endDate){
+        return timeDiffTime(startData,endDate)
+    },
+      //标红table指定行
+    tableRowClassName(row, index) {
+      row.row.index = row.rowIndex;
+      if (row.uploadStatus=='1') {
+        return 'success-row';
+      }
+      else if (row.uploadStatus=='-1') {
+        return 'warning-row';
+      }
+      return '';
+    },
+    /** 查询运单列表列表 */
+    getList() {
+      this.loading = true;
+    },
+    fileChange(file, fileList) {
+          this.fileList = fileList;
+    },
+    beforeUpload(file) {
+      this.fileName = file.name;
+      this.form.batchName = file.name;
+      this.readerData(file)
+      return false
+    },
+    readerData(rawFile) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        reader.onload = e => {
+          const data = e.target.result
+          const workbook = XLSX.read(data, { type: 'array' ,cellDates: true})
+          const firstSheetName = workbook.SheetNames[0] // firstSheetName
+          // if (!excelTypes.includes(firstSheetName)) {
+          //   reject('无法识别当前Excel模板')
+          //   this.$modal.msgError('无法识别当前Excel模板')
+          //   return
+          // }
+          const worksheet = workbook.Sheets[firstSheetName]
+          // const header = this.getHeaderRow(worksheet) // 标题
+          const results = XLSX.utils.sheet_to_json(worksheet)
+
+          console.log(results);
+
+          this.batchImportData(results);
+
+          resolve()
+        }
+        reader.readAsArrayBuffer(rawFile)
+      })
+    },
+    getHeaderRow(sheet) {
+      const headers = []
+      const range = XLSX.utils.decode_range(sheet['!ref'])
+      let C
+      const R = range.s.r
+      /* start in the first row */
+      for (C = range.s.c; C <= range.e.c; ++C) { /* walk every column in the range */
+        const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })]
+        /* find the cell in the first row */
+        let hdr = 'UNKNOWN ' + C // <-- replace with your desired default
+        if (cell && cell.t) hdr = XLSX.utils.format_cell(cell)
+        headers.push(hdr)
+      }
+      return headers
+    },
+    async batchImportData(results) {
+      const _index = 1
+      let loadingInstance = this.$loading({
+        text: '正在解析 ' + _index + ' 数据...'
+      })
+
+      this.orderList = [];
+
+      // 组装提交的数据
+      for (let index = 0; index < results.length; index++) {
+        const element = results[index]
+        let orderData={
+                name: element['国家名称'],
+                nameEn: element['英文名称'],
+                code: element['国家编码'],
+                telAreaCode: element['电话区号'],
+                continentId: element['所属区域'],
+                twoCode: element['二字码'],
+                threeCode: element['三位码'],
+                orderNum: element['排序'],
+                remark: element['备注'],
+                uploadStatus: 0,
+                errorInfo:'',
+        }
+        //数据转换
+        this.tmpDataList.push(orderData);
+    }
+    
+    // 判断是否有数据
+    this.orderList=[];
+    if(this.tmpDataList.length==0){
+        this.$modal.msgError('表格中没有数据');
+        loadingInstance.close()
+        return;
+    }
+      this.tmpDataList=this.tmpDataList.map(item=>this.transformData(item));
+      this.orderList = this.orderList.concat(this.tmpDataList);
+      this.tmpDataList=[];
+      loadingInstance.close()
+
+    },
+    // 数据转换
+    transformData(orderData){
+        return orderData;
+    },
+    handleRealUploadAll(){
+          if (this.ids && this.ids.length>0) {
+            this.$confirm("确认发送吗?", "提示", {
+                cancelButtonText: "取消",
+                confirmButtonText: "确认",
+                type: "warning",
+                distinguishCancelAndClose: true,
+                closeOnClickModal: false
+            }).then(async () => {
+
+              if(this.selectionList&&this.selectionList.length>0){
+                for(let i=0;i<this.selectionList.length;i++){
+                  let orderItem=this.selectionList[i];
+
+                  // 检查数据后发送
+                  let res=await draftSubmitCountry(orderItem)
+                  let rstData=res.data;
+                  if(rstData.result=='success'){
+                    orderItem.uploadStatus=1;
+                    orderItem.errorInfo="发送成功";
+                    orderItem.batchNo=rstData.batchNo;
+                  }
+                  else{
+                    orderItem.uploadStatus=-1;
+                    orderItem.errorInfo=rstData.msg;
+                  }
+
+                }
+                this.$modal.msgSuccess("上传成功");
+
+              }
+            });
+
+          }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      // this.queryParams.pageNum = 1;
+      // this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      // this.resetForm("queryForm");
+      // this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+
+      this.selectionList=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();
+    },
+
+    cancel(){
+      this.openUploadForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      let that=this;
+      this.$modal.confirm('是否确认删除').then(function() {
+        that.selectionList.forEach((item,index) =>{
+          that.orderList.forEach((v,i)=>{
+                if(item.index === v.index){
+                  that.orderList.splice(i,1)
+                }
+            })
+        })
+        that.$refs.multipleTable.clearSelection();
+      }).then(() => {
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+:deep .el-form-item__label-wrap {
+  margin-left: 0 !important;
+  }
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+
+
+   .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+
+  .queryForm .el-form-item {
+    margin-bottom: 0px !important;
+  }
+
+  :deep .el-table .success-row {
+    color: rgb(21, 174, 31) !important;
+  }
+
+  :deep .el-table .warning-row {
+    color: #f51f1f !important;
+  }
+
+  :deep .el-form-item__label {
+    text-align: left;
+  }
+</style>
diff --git a/src/views/emis/emisCountry/index.vue b/src/views/emis/emisCountry/index.vue
index 7c8d81fe..f416ca95 100644
--- a/src/views/emis/emisCountry/index.vue
+++ b/src/views/emis/emisCountry/index.vue
@@ -155,6 +155,16 @@
                     v-hasPermi="['emis:emisCountry:export']"
                   >导出</el-button>
                 </el-col>
+                <el-col :span="1.5">
+                  <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-upload"
+                    size="mini"
+                    @click="handleBatchAdd"
+                    v-hasPermi="['emis:emisCountry:draftSubmitCountry']"
+                  >批量导入</el-button>
+                </el-col>
               </el-row>
 
             </div>
@@ -276,17 +286,22 @@
       <el-dialog :title="titleForm" :visible.sync="openForm" :destroy-on-close="true" width="500px" :close-on-click-modal="false" v-dialogDrag  append-to-body>
         <emisContinentForm :id="currentContinentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisContinentForm>
       </el-dialog>
+      <!-- 批量导入国家对话框 -->
+       <el-dialog :title="batchAddTitleForm" :visible.sync="openBatchAdd" width="45%" :close-on-click-modal="false" v-dialogDrag  append-to-body> 
+        <batchImportCountry></batchImportCountry>
+       </el-dialog>
   </div>
 </template>
 
 <script>
+import batchImportCountry from '@/views/emis/emisCountry/batchImportCountry';
 import { listEmisCountry, getEmisCountry, delEmisCountry, addEmisCountry, updateEmisCountry } from "@/api/emis/emisCountry";
 import { listEmisContinent, getEmisContinent, delEmisContinent, addEmisContinent, updateEmisContinent } from "@/api/emis/emisContinent";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisContinentForm from '@/views/emis/emisContinent/emisContinentForm';
 export default {
   name: "EmisCountry",
-  components: { elDateSimplePicker,emisContinentForm},
+  components: { elDateSimplePicker,emisContinentForm,batchImportCountry},
   dicts: [
   ],
   data() {
@@ -343,6 +358,9 @@ export default {
       daterangeCreateTime: [],
       // 删除标志（0代表存在时间范围
       daterangeUpdateTime: [],
+      //批量导入国家
+      openBatchAdd: false,
+      batchAddTitleForm: "",
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -725,6 +743,10 @@ export default {
     dateTimeChange(value){
         this.dateTimeRange=value;
     },
+    handleBatchAdd(){
+      this.openBatchAdd= true;
+      this.batchAddTitleForm = "批量导入";
+    },
   }
 };
 </script>
diff --git a/src/views/emis/emisSpecialCalcWeight/batchImportSpecialCalcWeight.vue b/src/views/emis/emisSpecialCalcWeight/batchImportSpecialCalcWeight.vue
index e126276b..add4be08 100644
--- a/src/views/emis/emisSpecialCalcWeight/batchImportSpecialCalcWeight.vue
+++ b/src/views/emis/emisSpecialCalcWeight/batchImportSpecialCalcWeight.vue
@@ -36,7 +36,7 @@
                   :on-change="fileChange"
                   :before-upload="beforeUpload">
                   <el-button slot="trigger" plain class="filter-item" size="mini"  type="primary" >选择文件</el-button>
-                  <el-link type="primary" style="line-height: 28px;font-size:13px;color:blue" href="/static/tpl/import_destination.xlsx">下载导入Excel模板</el-link>
+                  <el-link type="primary" style="line-height: 28px;font-size:13px;color:blue" href="/static/tpl/import_special_calc_weight.xlsx">下载导入Excel模板</el-link>
                 </el-upload>
            </el-col>
             <el-col :span="1.5">