Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

src/components/FileUpload/index.vue

@@ -204,9 +204,13 @@ export default {
 
       this.uploadList.push({ name: res.fileName, url:res.url });
 
+      console.log("==1111==>", this.uploadList);
+
       if (this.uploadList.length === this.number) {
         this.fileList = this.fileList.concat(this.uploadList);
 
+        console.log("==2222==>", this.uploadList);
+
         this.uploadList = [];
         this.number = 0;
         this.$emit("input", this.listToString(this.fileList));

src/components/XdTable/index.vue

@@ -38,7 +38,17 @@
                       <!-- <el-button @click="delAllStorage">恢复系统表格设置</el-button>
                       <el-button @click="delStorage">恢复当前表格设置</el-button> -->
                       <div style="text-align: left;width: 55%;">
-                        <el-select v-model="curentTbShowTpl" size="mini"  clearable placeholder="选择模版" :style="{width: '100%'}" @change="changeTbShowTpl" :disabled="!isNeedDbSaveTpl" >
+                        <el-select
+                        v-model="curentTbShowTpl"
+                            size="mini"
+                            clearable
+                            filterable
+                            allow-create
+                            placeholder="选择模版"
+                            :style="{width: '100%'}"
+                            @change="changeTbShowTpl"
+                            :disabled="!isNeedDbSaveTpl"
+                         >
                             <el-option
                               v-for="(item, index) in storeTplList"
                               :key="index"
@@ -131,9 +141,10 @@
                   size="mini"
                   clearable
                   filterable
+                  allow-create
                   placeholder="选择模版"
                   :style="{width: '100%'}"
-                  allow-create=""
+
                   @change="changeSaveTbShowTpl"
                   >
                     <el-option

src/views/emis/emisWaybill/sendWaybillList.vue

@@ -302,6 +302,7 @@
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
 
+          id="refTable"
           storageName="sendWaybillList_main"
            v-loading="loading"
            border
@@ -621,6 +622,8 @@ import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnl
 import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
 
 
+import FileSaver from 'file-saver'
+import XLSX from 'xlsx'
 
 
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
@@ -1000,8 +1003,27 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
+    handleExport_new() {
+      var xlsxParam = { raw: true }
+      let wb = XLSX.utils.table_to_book(document.querySelector("#refTable"),xlsxParam);
+      let wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array"
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([wbout], { type: "application/octet-stream" }),
+          '运单列表.xlsx'
+        );
+      }
+      catch (e) {
+        if (typeof console !== "undefined") console.log(e, wbout);
+      }
+      return wbout;
+    },
     /** 导出按钮操作 */
-    handleExport() {
+    handleExport_old() {
     //   this.download('emis/emisWaybill/export', {
     //     ...this.queryParams
     //   }, `emisWaybill_${new Date().getTime()}.xlsx`)

src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue

@@ -176,13 +176,13 @@
       <el-table-column :label="$t('所属业务员')" align="center" prop="salesmen" min-width="150" />
       <el-table-column :label="$t('业务员编号')" align="center" prop="xxx" min-width="150" />
       <el-table-column :label="$t('问题件回复')" align="center" prop="reversionStr" min-width="150" />
-      <el-table-column :label="$t('回复人')" align="center" prop="reversionMan" min-width="150" />
+      <el-table-column :label="$t('回复人')" align="center" prop="reversionManName" min-width="150" />
       <el-table-column :label="$t('回复日期')" align="center" prop="reversionDate" min-width="170">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reversionDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" min-width="100" />
+      <el-table-column :label="$t('回复网点')" align="center" prop="reversionSiteName" min-width="100" />
       <el-table-column :label="$t('处理状态')" align="center" prop="dealResult" min-width="100">
         <template slot-scope="scope">
           <span v-if="scope.row.dealResult=='1'" style="background-color: #f0e68c;">处理中</span>

src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue

@@ -167,7 +167,7 @@
           <span class="ellipsis">{{ scope.row.reversionStr }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('回复人')" align="center" prop="reversionMan" min-width="150" />
+      <el-table-column :label="$t('回复人')" align="center" prop="reversionManName" min-width="150" />
       <el-table-column :label="$t('回复日期')" align="center" prop="reversionDate" min-width="170">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reversionDate) }}</span>

src/views/system/updater/printerUpdater.vue

@@ -3,7 +3,7 @@
        <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="100px">
          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
           <el-col :span="24">
-            <el-form-item label="下载地址" prop="downUrl">
+            <el-form-item label="上传打印组件" prop="downUrl">
               <FileUpload  :showTip="true" v-model="form.downUrl" :isNeedUpload="true" :fileType="['zip']" :limit="1"></FileUpload>
             </el-form-item>
           </el-col>