cloud-web-corejs-haier 1.0.35 → 1.0.36

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs-haier",
   "private": false,
-  "version": "1.0.35",
+  "version": "1.0.36",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/excelExport/mixins.js

@@ -562,7 +562,7 @@ function getGrid(that, tableRef) {
         num = 1;
         loopToDo(0, num);
       },
-      createExcelFile(loading) {
+      createExcelFile(loading,options) {
         let url1 = this.CURRENT_PREFIX + '/excel/createExcelTemplate';
         let datas = this.getHeadTitleJson();
         return this.$http({
@@ -573,7 +573,8 @@ function getGrid(that, tableRef) {
           },
           data: datas,
           modal: loading || false,
-          isLoading: loading
+          isLoading: loading,
+          ...options
         });
       },
       /*getExportTitleJson() {
@@ -672,7 +673,7 @@ function getGrid(that, tableRef) {
         }
         return titleArr;
       },
-      addExcelData(opts, loading) {
+      addExcelData(opts, loading,options) {
         let target = opts.target;
         let pageNumber = opts.pageNumber || 1;
         let callback = opts.callback;
@@ -689,16 +690,18 @@ function getGrid(that, tableRef) {
           },
           data: datas,
           modal: loading || false,
-          isLoading: loading || false
+          isLoading: loading || false,
+          ...options
         });
       },
-      mergeExcel(startPage, endPage, loading) {
+      mergeExcel(startPage, endPage, loading, options) {
         let url1 = this.CURRENT_PREFIX + "/excel/mergeExcel?uuid=" + this.uuid + "&ippaaapp=" + this.ippaaapp;
         return this.$http({
           url: url1 + "&startPage=" + startPage + "&endPage=" + endPage,
           method: "post",
           modal: loading || false,
-          isLoading: loading || false
+          isLoading: loading || false,
+          ...options
         })
       },
       createCountTimer() {
@@ -852,7 +855,7 @@ function getGrid(that, tableRef) {
 
         downLoadFile2();
       },
-      startProcess2(datas) {
+      async startProcess2(datas) {
         this.tableTarget = getGrid(this.option.vue, this.option.targetRef);
         let that = this;
         let options = this.option;
@@ -873,47 +876,61 @@ function getGrid(that, tableRef) {
           return;
         }
         this.CURRENT_PREFIX = options.prefix;
+        let flag1 = false;
+        let flag2 = false;
+        let flag3 = false;
 
-        let handleData = function () {
+        let handleData = async function () {
           let total = datas.length;
-          that.addExcelData({
+          await that.addExcelData({
             rows: datas,
             pageNumber: 1,
-          }, true).then(resultMsg2 => {
-            if (resultMsg2.type == "success") {
-              setTimeout(() => {
-                that.mergeExcel(1, 1, true).then(resultMsg3 => {
-                  if (resultMsg3.type == "success") {
-                    let fileInfo = resultMsg3.objx;
-                    let fileName = fileInfo.fileName;
-                    let fileSize = fileInfo.fileSize;
-
-                    let dataMap = {};
-                    dataMap["startPage"] = 1;
-                    dataMap["endPage"] = 1;
-                    dataMap["title"] = title;
-                    dataMap["uuid"] = fileName;
-                    dataMap["fileSize"] = fileSize;
-                    that.exportAll(dataMap);
-                  }
-                })
-              }, 0)
+          }, true, {
+            callback: (resultMsg2)=>{
+              if (resultMsg2.type == "success") {
+                flag2 = true;
+              }
+            },
+          })
+          if(flag2){
+            let fileInfo = null
+            await that.mergeExcel(1, 1, true,{
+              callback: (resultMsg3)=>{
+                if (resultMsg3.type == "success") {
+                  flag3 = true;
+                   fileInfo = resultMsg3.objx;
 
+                }
+              }
+            })
+            if(flag3){
+              let fileName = fileInfo.fileName;
+              let fileSize = fileInfo.fileSize;
+
+              let dataMap = {};
+              dataMap["startPage"] = 1;
+              dataMap["endPage"] = 1;
+              dataMap["title"] = title;
+              dataMap["uuid"] = fileName;
+              dataMap["fileSize"] = fileSize;
+              setTimeout(() => {
+                that.exportAll(dataMap);
+              },200);
             }
-          })
+          }
         }
-        that.createExcelFile(true).then(resultMsg => {
+        await that.createExcelFile(true, {callback: (resultMsg)=>{
           if (resultMsg.type == "success") {
             let aObj = resultMsg.objx;
             that.uuid = aObj.uuid;
             that.nowDate = aObj.nowDate;
             that.ippaaapp = aObj.ippaaapp;
-            setTimeout(() => {
-              handleData();
-            }, 0)
-
+            flag1 = true;
           }
-        })
+        }})
+       if(flag1){
+        handleData();
+       }
       },
       closeExportFieldDialog() {
         this.dialogClose2();

package/src/views/user/user/edit.vue

@@ -595,7 +595,7 @@ export default {
         storageType: "user",
         data: () => {
           this.handleData();
-          return this.user;
+          return this.getReqFormData();
         },
         chooseConfirm: (tempStorageData) => {
           this.user = tempStorageData;
@@ -658,6 +658,22 @@ export default {
         this.showExtendedProperties = true;
       }
     },
+    getReqFormData() {
+      let userCompanyInfoDTOs = this.user.userCompanyInfoDTOs.map((item) => {
+        return {
+          ...item,
+          saleOrgGridOption: null,
+          roleGridOption: null,
+          saleOrgData: null,
+          roleData: null,
+        };
+      });
+      let formData = {
+        ...this.user,
+        userCompanyInfoDTOs,
+      };
+      return formData;
+    },
     saveData() {
       let companyCode = this.companyInfo.companyCode;
       this.handleData();
@@ -680,20 +696,7 @@ export default {
         if (valid) {
           this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
             var url = USER_PREFIX + (this.isEdit ? "/user/update" : "/user/save");
-            let userCompanyInfoDTOs = this.user.userCompanyInfoDTOs.map((item) => {
-              return {
-                ...item,
-                saleOrgGridOption: null,
-                roleGridOption: null,
-                saleOrgData: null,
-                roleData: null,
-              };
-            });
-            let formData = {
-              ...this.user,
-              userCompanyInfoDTOs,
-            };
-
+            let formData = this.getReqFormData();
             this.$http({
               url: url,
               method: `post`,