4.0.38 修改数据导入

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.37",
+  "version": "4.0.38",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

src/customer/DataImportPanel.vue

@@ -36,14 +36,14 @@
                 </select>
               </div>
               <div class="form-group">
-                <label class="form-label">2.请下载导入模板</label>
-                <button
-                  type="button"
-                  class="btn btn-primary btn-primary-1 btn-primary-block"
+                <label class="form-label">2.请下载导入模板</label><br />
+                <a-button
+                  style="padding: 0"
+                  type="link"
                   @click="downloadTemplateButton"
                 >
                   {{ $t("lang.DataImportPanel.downloadTemplate") }}
-                </button>
+                </a-button>
               </div>
             </div>
           </div>
@@ -53,7 +53,7 @@
           <div>
             <div>
               <div class="form-group">
-                <label>1.请选择Excel数据</label>
+                <label>3.请选择Excel数据</label>
                 <input
                   id="file"
                   ref="uploadFileInput"
@@ -65,7 +65,7 @@
                 <span>{{ uploadFilePath }}</span>
               </div>
               <div>
-                <label>2.请选择需要导入的sheet</label>
+                <label>4.请选择需要导入的sheet</label>
                 <select
                   v-model="selectedIndex"
                   class="form-control sheet-select"
@@ -109,22 +109,23 @@
                   class="btn btn-primary btn-primary-1"
                   @click="testImportButton(true)"
                 >
-                  1.{{ $t("lang.DataImportPanel.testImport") }}
+                  {{ $t("lang.DataImportPanel.testImport") }}
                 </button>
                 <button
+                  v-if="testSuccess"
                   type="button"
                   class="btn btn-primary btn-primary-1 btn-primary-import"
                   @click="runProcessImport(selectedDataTemplateNo)"
                 >
-                  2.{{ $t("lang.DataImportPanel.formalImport") }}
+                  {{ $t("lang.DataImportPanel.formalImport") }}
                 </button>
-                <button
+                <!-- <button
                   type="button"
                   class="btn btn-primary btn-primary-1 btn-primary-import"
                   @click="runProcessClear(selectedDataTemplateNo, false)"
                 >
                   3.{{ $t("lang.DataImportPanel.emptyImport") }}
-                </button>
+                </button> -->
                 <button
                   v-if="taskId != null && taskId.length > 0"
                   type="button"
@@ -149,11 +150,12 @@
           </div>
 
           <a-table
+            v-if="current === 2"
             bordered
+            sticky
             :columns="columns"
             :data-source="dataSource"
-            :scroll="{ y: 900 }"
-            size="small"
+            :scroll="{ x: 2200 }"
           >
             <a-table-column type="index" />
             <template #bodyCell="{ column, record }">
@@ -162,7 +164,6 @@
               </template>
             </template>
           </a-table>
-
           <Loading v-if="loading" />
         </div>
       </div>
@@ -242,6 +243,7 @@ export default {
       dataSource: [], // 表格数据源
       lineCount: null, // 导入行数
       columnCount: null, // 导入列数
+      testSuccess: false, // 测试导入是否成功
     };
   },
 
@@ -272,6 +274,7 @@ export default {
         this.current++;
       }
       if (this.current == 2) {
+        this.testSuccess = false;
         this.runProcessClear(this.selectedDataTemplateNo, true);
       }
     },
@@ -542,11 +545,11 @@ export default {
       var _self = this;
       var sheetIndex = _self.selectedIndex;
 
-      if(_self.lineCount <= 0){
+      if (_self.lineCount <= 0) {
         message.warning('请输入正确的导入行数！');
         return;
       }
-      if(_self.columnCount <= 0){
+      if (_self.columnCount <= 0) {
         message.warning('请输入正确的导入列数！');
         return;
       }
@@ -594,7 +597,9 @@ export default {
       const columnCount = _self.columnCount;
       _self.loading = true;
       $.ajax({
-        url: Common.getApiURL(`dataImportResource/saveImportModelData?lineCount=${lineCount}&columnCount=${columnCount}`),
+        url: Common.getApiURL(
+          `dataImportResource/saveImportModelData?lineCount=${lineCount}&columnCount=${columnCount}`,
+        ),
         type: 'post',
         dataType: 'json',
         contentType: 'application/json',
@@ -686,8 +691,15 @@ export default {
 
       data.forEach(function (item) {
         _self.dataSource.push(item.data);
-        console.log('dataSource:::', _self.dataSource);
       });
+      const flag = _self.dataSource.every(item => {
+        return item.ImportResult === '成功';
+      });
+      if (flag) {
+        this.testSuccess = true;
+      } else {
+        this.testSuccess = false;
+      }
     },
 
     /**
@@ -695,11 +707,11 @@ export default {
      */
     runProcessImport: function (selectedDataTemplateNo) {
       var _self = this;
-      if(_self.lineCount <= 0){
+      if (_self.lineCount <= 0) {
         message.warning('请输入正确的导入行数！');
         return;
       }
-      if(_self.columnCount <= 0){
+      if (_self.columnCount <= 0) {
         message.warning('请输入正确的导入列数！');
         return;
       }
@@ -708,7 +720,10 @@ export default {
       const columnCount = _self.columnCount;
       _self.loading = true;
       $.ajax({
-        url: Common.getApiURL('dataImportResource/formalDataImportByIds/') + no + `?lineCount=${lineCount}&columnCount=${columnCount}`,
+        url:
+          Common.getApiURL('dataImportResource/formalDataImportByIds/') +
+          no +
+          `?lineCount=${lineCount}&columnCount=${columnCount}`,
         type: 'post',
         dataType: 'json',
         beforeSend: function (request) {
@@ -750,20 +765,11 @@ export default {
         },
         success: function (data) {
           _self.loading = false;
-          if (flag) {
-            message.success(
-              _self.$t('lang.DataImportPanel.describe9') +
-                '!' +
-                data.processResult.result,
-            );
-          } else {
-            message.success(
-              _self.$t('lang.DataImportPanel.describe9') +
-                '!' +
-                data.processResult.result,
-              10,
-            );
-          }
+          console.log(
+            _self.$t('lang.DataImportPanel.describe9') +
+              '!' +
+              data.processResult.result,
+          );
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
           _self.loading = false;
@@ -866,4 +872,7 @@ export default {
 .btn-primary-import {
   margin-left: 5px;
 }
+:deep(.ant-table-sticky-scroll){
+  display: none !important;
+}
 </style>

webpack.dev.js

@@ -132,6 +132,9 @@ module.exports = WebpackMerge.merge(baseConfig, {
         secure:true,
       },
     },
+    client: {
+      overlay: false //解决ResizeObserver loop completed with undelivered notifications
+    },
   },
 
   devtool: 'source-map',