woodao-pc-ui 0.0.45 → 0.0.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "woodao-pc-ui",
-  "version": "0.0.45",
+  "version": "0.0.46",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/woodao-pc-ui/woodao-pc-ui.common.js

@@ -161297,7 +161297,7 @@ function useEcharts(dom, theme) {
   return instance;
 }
 ;// ./package.json
-var package_namespaceObject = {"rE":"0.0.45"};
+var package_namespaceObject = {"rE":"0.0.46"};
 ;// ./src/setting/index.ts
 
 const primaryColors = (/* unused pure expression or super */ null && (["#409eff", "#13C2C2", "#F5222D", "#722ED1", "#f7acbc", "#ef5b9c", "#bd6758", "#f47920", "#2e3a1f", "#b2d235", "#121a2a", "#6a6da9", "#867892", "#fcaf17", "#76becc", "#1b315e", "#b4532a", "#008792"]));
@@ -195269,18 +195269,21 @@ index_esm_VxeUI.setTheme('light');
 const RadioVxeGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(RadioVxeGridvue_type_script_lang_js, [['render',RadioVxeGridvue_type_template_id_269899bc_scoped_true_render],['__scopeId',"data-v-269899bc"]])
 
 /* harmony default export */ var RadioVxeGrid = (RadioVxeGrid_exports_);
-;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/ImportWin/ImportWin.vue?vue&type=template&id=6d8ecd6b&ts=true
+;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/ImportWin/ImportWin.vue?vue&type=template&id=8f208140&ts=true
 
-const ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_1 = {
+const ImportWinvue_type_template_id_8f208140_ts_true_hoisted_1 = {
   style: {
     height: 300 + 'px',
     overflow: 'auto'
   }
 };
-const ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_2 = {
+const ImportWinvue_type_template_id_8f208140_ts_true_hoisted_2 = {
   class: "margin-tb-sm"
 };
-function ImportWinvue_type_template_id_6d8ecd6b_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+const ImportWinvue_type_template_id_8f208140_ts_true_hoisted_3 = {
+  class: "margin-tb"
+};
+function ImportWinvue_type_template_id_8f208140_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_upload = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-upload");
   const _component_el_row = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-row");
   const _component_el_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-button");
@@ -195290,7 +195293,7 @@ function ImportWinvue_type_template_id_6d8ecd6b_ts_true_render(_ctx, _cache, $pr
     title: _ctx.title,
     showConfirm: false
   }, {
-    content: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_row, {
+    content: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_8f208140_ts_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_row, {
       class: "clearfix",
       style: {
         "margin-top": "3px"
@@ -195319,33 +195322,38 @@ function ImportWinvue_type_template_id_6d8ecd6b_ts_true_render(_ctx, _cache, $pr
         class: "upload-demo",
         drag: ""
       }, {
-        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[1] || (_cache[1] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("i", {
+        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[2] || (_cache[2] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("i", {
           class: "el-icon-upload"
         }, null, -1), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", {
           class: "el-upload__text"
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("em", null, "点击上传")], -1)])),
         _: 1,
-        __: [1]
+        __: [2]
       }, 8, ["before-upload", "headers", "max-size", "data", "action", "format", "on-progress", "on-format-error", "on-exceeded-size", "on-success", "on-error"])]),
       _: 1
-    }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
+    }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_8f208140_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
       class: "text-btn",
       onClick: _cache[0] || (_cache[0] =
       //@ts-ignore
       (...args) => _ctx.downloadModalFormer && _ctx.downloadModalFormer(...args))
-    }, "模版下载")], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.downUrl]])])]),
+    }, "模版下载")], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.downUrl]]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_8f208140_ts_true_hoisted_3, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
+      class: "text-btn",
+      onClick: _cache[1] || (_cache[1] =
+      //@ts-ignore
+      (...args) => _ctx.downloadResult && _ctx.downloadResult(...args))
+    }, "下载导入报告")], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.errFilePath != '']])])]),
     footer: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_button, {
       size: "small",
       onClick: _ctx.closeWin
     }, {
-      default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[2] || (_cache[2] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("取 消", -1)])),
+      default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[3] || (_cache[3] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("取 消", -1)])),
       _: 1,
-      __: [2]
+      __: [3]
     }, 8, ["onClick"])]),
     _: 1
   }, 8, ["title"]);
 }
-;// ./src/package/ImportWin/ImportWin.vue?vue&type=template&id=6d8ecd6b&ts=true
+;// ./src/package/ImportWin/ImportWin.vue?vue&type=template&id=8f208140&ts=true
 
 ;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Dialog/Dialog.vue?vue&type=template&id=e83c379c&ts=true
 
@@ -195553,6 +195561,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
 
 
 
+
 /* harmony default export */ var ImportWinvue_type_script_lang_ts = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'importWin',
   components: {
@@ -195686,6 +195695,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
     const dialogRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const uploadRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const baseFormRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const errFilePath = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)('');
     let bigloading = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(null);
     const calendar = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const token = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
@@ -195712,6 +195722,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
       showTip: true
     });
     const initPostData = () => {
+      errFilePath.value = '';
       postData.value = {
         sessionId: storageUtils/* default */.A.getSessionItem("sessionId") || localStorage.getItem('admin-token'),
         bid: '',
@@ -195745,6 +195756,22 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
         });
       }
     }
+    function downloadResult() {
+      window.open(sysConfigUtils.niftyUrl + errFilePath.value);
+      // if(props.fixed===true){
+      //   window.open(props.downUrl)
+      // }else {
+      //   let params = {
+      //     busId:props.busId,
+      //     busCode:props.busCode,
+      //     domainName:props.domainName,
+      //   };
+      //   let queryCommand = new QueryCommand({
+      //     url: props.downUrl
+      //   });
+      //   queryCommand.executeExport(props.downUrl, props.busName+'导入模版.xlsx', { ...params });
+      // }
+    }
     //关闭窗口
     const beforeUpload = () => {
       uploadRef.value.clearFiles();
@@ -195782,30 +195809,24 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
     //处理附件上传成功事件  查重
     function handleSuccess(res) {
       endLoading();
-      closeWin();
-      notification/* ElNotification */.df.success({
-        title: '提示消息',
-        type: 'success',
-        message: '导入成功'
-      });
-      emit('success', res);
       // loadingInstance.close();
-      /* if (res.code && res.code == "200") {
-         emit('success',res)
-         closeWin()
-         ElNotification.success({
-           title: '提示消息',
-           type: 'success',
-           message: '导入成功',
-         })
-       } else {
-         ElNotification.warning({
-           title: '提示消息',
-           type: 'warning',
-           message: res.message,
-         })
-         // loadingInstance.close();
-       }*/
+      if (res.code && res.code == "200") {
+        emit('success', res);
+        closeWin();
+        notification/* ElNotification */.df.success({
+          title: '提示消息',
+          type: 'success',
+          message: '导入成功'
+        });
+      } else {
+        notification/* ElNotification */.df.warning({
+          title: '提示消息',
+          type: 'warning',
+          message: res.message
+        });
+        errFilePath.value = res.errFilePath;
+        // loadingInstance.close();
+      }
     }
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(props.params, val => {
       initPostData();
@@ -195844,8 +195865,10 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
       return true;
     }
     return {
+      errFilePath,
       checkFileType,
       downloadModalFormer,
+      downloadResult,
       tenantId,
       initPostData,
       postData,
@@ -195875,7 +195898,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
 
 
 ;
-const ImportWin_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(ImportWinvue_type_script_lang_ts, [['render',ImportWinvue_type_template_id_6d8ecd6b_ts_true_render]])
+const ImportWin_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(ImportWinvue_type_script_lang_ts, [['render',ImportWinvue_type_template_id_8f208140_ts_true_render]])
 
 /* harmony default export */ var ImportWin = (ImportWin_exports_);
 ;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Table/TableBody.vue?vue&type=template&id=06b83184&scoped=true&ts=true

package/woodao-pc-ui/woodao-pc-ui.umd.js

@@ -161297,7 +161297,7 @@ function useEcharts(dom, theme) {
   return instance;
 }
 ;// ./package.json
-var package_namespaceObject = {"rE":"0.0.45"};
+var package_namespaceObject = {"rE":"0.0.46"};
 ;// ./src/setting/index.ts
 
 const primaryColors = (/* unused pure expression or super */ null && (["#409eff", "#13C2C2", "#F5222D", "#722ED1", "#f7acbc", "#ef5b9c", "#bd6758", "#f47920", "#2e3a1f", "#b2d235", "#121a2a", "#6a6da9", "#867892", "#fcaf17", "#76becc", "#1b315e", "#b4532a", "#008792"]));
@@ -195269,18 +195269,21 @@ index_esm_VxeUI.setTheme('light');
 const RadioVxeGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(RadioVxeGridvue_type_script_lang_js, [['render',RadioVxeGridvue_type_template_id_269899bc_scoped_true_render],['__scopeId',"data-v-269899bc"]])
 
 /* harmony default export */ var RadioVxeGrid = (RadioVxeGrid_exports_);
-;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/ImportWin/ImportWin.vue?vue&type=template&id=6d8ecd6b&ts=true
+;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/ImportWin/ImportWin.vue?vue&type=template&id=8f208140&ts=true
 
-const ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_1 = {
+const ImportWinvue_type_template_id_8f208140_ts_true_hoisted_1 = {
   style: {
     height: 300 + 'px',
     overflow: 'auto'
   }
 };
-const ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_2 = {
+const ImportWinvue_type_template_id_8f208140_ts_true_hoisted_2 = {
   class: "margin-tb-sm"
 };
-function ImportWinvue_type_template_id_6d8ecd6b_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+const ImportWinvue_type_template_id_8f208140_ts_true_hoisted_3 = {
+  class: "margin-tb"
+};
+function ImportWinvue_type_template_id_8f208140_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_upload = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-upload");
   const _component_el_row = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-row");
   const _component_el_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-button");
@@ -195290,7 +195293,7 @@ function ImportWinvue_type_template_id_6d8ecd6b_ts_true_render(_ctx, _cache, $pr
     title: _ctx.title,
     showConfirm: false
   }, {
-    content: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_row, {
+    content: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_8f208140_ts_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_row, {
       class: "clearfix",
       style: {
         "margin-top": "3px"
@@ -195319,33 +195322,38 @@ function ImportWinvue_type_template_id_6d8ecd6b_ts_true_render(_ctx, _cache, $pr
         class: "upload-demo",
         drag: ""
       }, {
-        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[1] || (_cache[1] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("i", {
+        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[2] || (_cache[2] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("i", {
           class: "el-icon-upload"
         }, null, -1), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", {
           class: "el-upload__text"
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("em", null, "点击上传")], -1)])),
         _: 1,
-        __: [1]
+        __: [2]
       }, 8, ["before-upload", "headers", "max-size", "data", "action", "format", "on-progress", "on-format-error", "on-exceeded-size", "on-success", "on-error"])]),
       _: 1
-    }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
+    }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_8f208140_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
       class: "text-btn",
       onClick: _cache[0] || (_cache[0] =
       //@ts-ignore
       (...args) => _ctx.downloadModalFormer && _ctx.downloadModalFormer(...args))
-    }, "模版下载")], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.downUrl]])])]),
+    }, "模版下载")], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.downUrl]]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_8f208140_ts_true_hoisted_3, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
+      class: "text-btn",
+      onClick: _cache[1] || (_cache[1] =
+      //@ts-ignore
+      (...args) => _ctx.downloadResult && _ctx.downloadResult(...args))
+    }, "下载导入报告")], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.errFilePath != '']])])]),
     footer: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_button, {
       size: "small",
       onClick: _ctx.closeWin
     }, {
-      default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[2] || (_cache[2] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("取 消", -1)])),
+      default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[3] || (_cache[3] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("取 消", -1)])),
       _: 1,
-      __: [2]
+      __: [3]
     }, 8, ["onClick"])]),
     _: 1
   }, 8, ["title"]);
 }
-;// ./src/package/ImportWin/ImportWin.vue?vue&type=template&id=6d8ecd6b&ts=true
+;// ./src/package/ImportWin/ImportWin.vue?vue&type=template&id=8f208140&ts=true
 
 ;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Dialog/Dialog.vue?vue&type=template&id=e83c379c&ts=true
 
@@ -195553,6 +195561,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
 
 
 
+
 /* harmony default export */ var ImportWinvue_type_script_lang_ts = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'importWin',
   components: {
@@ -195686,6 +195695,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
     const dialogRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const uploadRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const baseFormRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const errFilePath = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)('');
     let bigloading = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(null);
     const calendar = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const token = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
@@ -195712,6 +195722,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
       showTip: true
     });
     const initPostData = () => {
+      errFilePath.value = '';
       postData.value = {
         sessionId: storageUtils/* default */.A.getSessionItem("sessionId") || localStorage.getItem('admin-token'),
         bid: '',
@@ -195745,6 +195756,22 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
         });
       }
     }
+    function downloadResult() {
+      window.open(sysConfigUtils.niftyUrl + errFilePath.value);
+      // if(props.fixed===true){
+      //   window.open(props.downUrl)
+      // }else {
+      //   let params = {
+      //     busId:props.busId,
+      //     busCode:props.busCode,
+      //     domainName:props.domainName,
+      //   };
+      //   let queryCommand = new QueryCommand({
+      //     url: props.downUrl
+      //   });
+      //   queryCommand.executeExport(props.downUrl, props.busName+'导入模版.xlsx', { ...params });
+      // }
+    }
     //关闭窗口
     const beforeUpload = () => {
       uploadRef.value.clearFiles();
@@ -195782,30 +195809,24 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
     //处理附件上传成功事件  查重
     function handleSuccess(res) {
       endLoading();
-      closeWin();
-      notification/* ElNotification */.df.success({
-        title: '提示消息',
-        type: 'success',
-        message: '导入成功'
-      });
-      emit('success', res);
       // loadingInstance.close();
-      /* if (res.code && res.code == "200") {
-         emit('success',res)
-         closeWin()
-         ElNotification.success({
-           title: '提示消息',
-           type: 'success',
-           message: '导入成功',
-         })
-       } else {
-         ElNotification.warning({
-           title: '提示消息',
-           type: 'warning',
-           message: res.message,
-         })
-         // loadingInstance.close();
-       }*/
+      if (res.code && res.code == "200") {
+        emit('success', res);
+        closeWin();
+        notification/* ElNotification */.df.success({
+          title: '提示消息',
+          type: 'success',
+          message: '导入成功'
+        });
+      } else {
+        notification/* ElNotification */.df.warning({
+          title: '提示消息',
+          type: 'warning',
+          message: res.message
+        });
+        errFilePath.value = res.errFilePath;
+        // loadingInstance.close();
+      }
     }
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(props.params, val => {
       initPostData();
@@ -195844,8 +195865,10 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
       return true;
     }
     return {
+      errFilePath,
       checkFileType,
       downloadModalFormer,
+      downloadResult,
       tenantId,
       initPostData,
       postData,
@@ -195875,7 +195898,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
 
 
 ;
-const ImportWin_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(ImportWinvue_type_script_lang_ts, [['render',ImportWinvue_type_template_id_6d8ecd6b_ts_true_render]])
+const ImportWin_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(ImportWinvue_type_script_lang_ts, [['render',ImportWinvue_type_template_id_8f208140_ts_true_render]])
 
 /* harmony default export */ var ImportWin = (ImportWin_exports_);
 ;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Table/TableBody.vue?vue&type=template&id=06b83184&scoped=true&ts=true

package/woodao-pc-ui/woodao-pc-ui.umd.min.js

@@ -161297,7 +161297,7 @@ function useEcharts(dom, theme) {
   return instance;
 }
 ;// ./package.json
-var package_namespaceObject = {"rE":"0.0.45"};
+var package_namespaceObject = {"rE":"0.0.46"};
 ;// ./src/setting/index.ts
 
 const primaryColors = (/* unused pure expression or super */ null && (["#409eff", "#13C2C2", "#F5222D", "#722ED1", "#f7acbc", "#ef5b9c", "#bd6758", "#f47920", "#2e3a1f", "#b2d235", "#121a2a", "#6a6da9", "#867892", "#fcaf17", "#76becc", "#1b315e", "#b4532a", "#008792"]));
@@ -195269,18 +195269,21 @@ index_esm_VxeUI.setTheme('light');
 const RadioVxeGrid_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(RadioVxeGridvue_type_script_lang_js, [['render',RadioVxeGridvue_type_template_id_269899bc_scoped_true_render],['__scopeId',"data-v-269899bc"]])
 
 /* harmony default export */ var RadioVxeGrid = (RadioVxeGrid_exports_);
-;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/ImportWin/ImportWin.vue?vue&type=template&id=6d8ecd6b&ts=true
+;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/ImportWin/ImportWin.vue?vue&type=template&id=8f208140&ts=true
 
-const ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_1 = {
+const ImportWinvue_type_template_id_8f208140_ts_true_hoisted_1 = {
   style: {
     height: 300 + 'px',
     overflow: 'auto'
   }
 };
-const ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_2 = {
+const ImportWinvue_type_template_id_8f208140_ts_true_hoisted_2 = {
   class: "margin-tb-sm"
 };
-function ImportWinvue_type_template_id_6d8ecd6b_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+const ImportWinvue_type_template_id_8f208140_ts_true_hoisted_3 = {
+  class: "margin-tb"
+};
+function ImportWinvue_type_template_id_8f208140_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_upload = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-upload");
   const _component_el_row = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-row");
   const _component_el_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)("el-button");
@@ -195290,7 +195293,7 @@ function ImportWinvue_type_template_id_6d8ecd6b_ts_true_render(_ctx, _cache, $pr
     title: _ctx.title,
     showConfirm: false
   }, {
-    content: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_row, {
+    content: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_8f208140_ts_true_hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_row, {
       class: "clearfix",
       style: {
         "margin-top": "3px"
@@ -195319,33 +195322,38 @@ function ImportWinvue_type_template_id_6d8ecd6b_ts_true_render(_ctx, _cache, $pr
         class: "upload-demo",
         drag: ""
       }, {
-        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[1] || (_cache[1] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("i", {
+        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[2] || (_cache[2] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("i", {
           class: "el-icon-upload"
         }, null, -1), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", {
           class: "el-upload__text"
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("em", null, "点击上传")], -1)])),
         _: 1,
-        __: [1]
+        __: [2]
       }, 8, ["before-upload", "headers", "max-size", "data", "action", "format", "on-progress", "on-format-error", "on-exceeded-size", "on-success", "on-error"])]),
       _: 1
-    }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_6d8ecd6b_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
+    }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_8f208140_ts_true_hoisted_2, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
       class: "text-btn",
       onClick: _cache[0] || (_cache[0] =
       //@ts-ignore
       (...args) => _ctx.downloadModalFormer && _ctx.downloadModalFormer(...args))
-    }, "模版下载")], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.downUrl]])])]),
+    }, "模版下载")], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.downUrl]]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("div", ImportWinvue_type_template_id_8f208140_ts_true_hoisted_3, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createElementVNode)("span", {
+      class: "text-btn",
+      onClick: _cache[1] || (_cache[1] =
+      //@ts-ignore
+      (...args) => _ctx.downloadResult && _ctx.downloadResult(...args))
+    }, "下载导入报告")], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_.vShow, _ctx.errFilePath != '']])])]),
     footer: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createVNode)(_component_el_button, {
       size: "small",
       onClick: _ctx.closeWin
     }, {
-      default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[2] || (_cache[2] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("取 消", -1)])),
+      default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.withCtx)(() => _cache[3] || (_cache[3] = [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.createTextVNode)("取 消", -1)])),
       _: 1,
-      __: [2]
+      __: [3]
     }, 8, ["onClick"])]),
     _: 1
   }, 8, ["title"]);
 }
-;// ./src/package/ImportWin/ImportWin.vue?vue&type=template&id=6d8ecd6b&ts=true
+;// ./src/package/ImportWin/ImportWin.vue?vue&type=template&id=8f208140&ts=true
 
 ;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Dialog/Dialog.vue?vue&type=template&id=e83c379c&ts=true
 
@@ -195553,6 +195561,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
 
 
 
+
 /* harmony default export */ var ImportWinvue_type_script_lang_ts = ((0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   name: 'importWin',
   components: {
@@ -195686,6 +195695,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
     const dialogRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const uploadRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const baseFormRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const errFilePath = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)('');
     let bigloading = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)(null);
     const calendar = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const token = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
@@ -195712,6 +195722,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
       showTip: true
     });
     const initPostData = () => {
+      errFilePath.value = '';
       postData.value = {
         sessionId: storageUtils/* default */.A.getSessionItem("sessionId") || localStorage.getItem('admin-token'),
         bid: '',
@@ -195745,6 +195756,22 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
         });
       }
     }
+    function downloadResult() {
+      window.open(sysConfigUtils.niftyUrl + errFilePath.value);
+      // if(props.fixed===true){
+      //   window.open(props.downUrl)
+      // }else {
+      //   let params = {
+      //     busId:props.busId,
+      //     busCode:props.busCode,
+      //     domainName:props.domainName,
+      //   };
+      //   let queryCommand = new QueryCommand({
+      //     url: props.downUrl
+      //   });
+      //   queryCommand.executeExport(props.downUrl, props.busName+'导入模版.xlsx', { ...params });
+      // }
+    }
     //关闭窗口
     const beforeUpload = () => {
       uploadRef.value.clearFiles();
@@ -195782,30 +195809,24 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
     //处理附件上传成功事件  查重
     function handleSuccess(res) {
       endLoading();
-      closeWin();
-      notification/* ElNotification */.df.success({
-        title: '提示消息',
-        type: 'success',
-        message: '导入成功'
-      });
-      emit('success', res);
       // loadingInstance.close();
-      /* if (res.code && res.code == "200") {
-         emit('success',res)
-         closeWin()
-         ElNotification.success({
-           title: '提示消息',
-           type: 'success',
-           message: '导入成功',
-         })
-       } else {
-         ElNotification.warning({
-           title: '提示消息',
-           type: 'warning',
-           message: res.message,
-         })
-         // loadingInstance.close();
-       }*/
+      if (res.code && res.code == "200") {
+        emit('success', res);
+        closeWin();
+        notification/* ElNotification */.df.success({
+          title: '提示消息',
+          type: 'success',
+          message: '导入成功'
+        });
+      } else {
+        notification/* ElNotification */.df.warning({
+          title: '提示消息',
+          type: 'warning',
+          message: res.message
+        });
+        errFilePath.value = res.errFilePath;
+        // loadingInstance.close();
+      }
     }
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(props.params, val => {
       initPostData();
@@ -195844,8 +195865,10 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
       return true;
     }
     return {
+      errFilePath,
       checkFileType,
       downloadModalFormer,
+      downloadResult,
       tenantId,
       initPostData,
       postData,
@@ -195875,7 +195898,7 @@ const Dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(Dialogvue_t
 
 
 ;
-const ImportWin_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(ImportWinvue_type_script_lang_ts, [['render',ImportWinvue_type_template_id_6d8ecd6b_ts_true_render]])
+const ImportWin_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(ImportWinvue_type_script_lang_ts, [['render',ImportWinvue_type_template_id_8f208140_ts_true_render]])
 
 /* harmony default export */ var ImportWin = (ImportWin_exports_);
 ;// ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[4]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/Table/TableBody.vue?vue&type=template&id=06b83184&scoped=true&ts=true