feat: gx

src/App.vue

@@ -7,10 +7,9 @@
 </template>
 
 <script>
-
 export default {
-  name: 'App',
-}
+  name: "App",
+};
 </script>
 
 <style>
@@ -27,4 +26,10 @@ export default {
   background-color: #a1a3a9;
   border-radius: 2px;
 }
+.fullLoading .el-loading-text {
+  font-size: 20px !important;
+}
+.fullLoading .el-loading-spinner {
+  font-size: 30px;
+}
 </style>

src/api/upload.js

@@ -38,8 +38,6 @@ export function uploadVideo(params) {
  * 上传文件
  */
 export function uploadFile(params) {
-  console.log("params---", params);
-
   let header = {
     "Content-Type": "multipart/form-data",
   };
@@ -56,8 +54,6 @@ export function uploadFile(params) {
  * 上传文件
  */
 export function uploadWordFile(params) {
-  console.log("params---", params);
-
   let header = {
     "Content-Type": "multipart/form-data",
   };
@@ -74,8 +70,6 @@ export function uploadWordFile(params) {
  * 上传人才政策文件
  */
 export function uploadTalentFile(params) {
-  console.log("params---", params);
-
   let header = {
     "Content-Type": "multipart/form-data",
   };

src/views/Commercialdeedtax/dy_house.vue

@@ -642,6 +642,7 @@ export default {
         },
       ],
       detail: {},
+      appLoading: null,
     };
   },
   watch: {
@@ -704,6 +705,43 @@ export default {
             this.tableData = [];
           }
         }
+        // this.appLoading?.close();
+      });
+    },
+    initNew() {
+      return new Promise((resolve) => {
+        this.tableData = [];
+        this.loading = true;
+        let parmas = {
+          name: this.searchForm.name,
+          phone: this.searchForm.phone,
+          state: this.searchForm.state,
+          departmentCode: this.searchForm.departmentCode,
+          pageNum: this.pagination.currentPage,
+          pageSize: this.pagination.pageSize,
+          checkArea: this.realEstateArea,
+          checkArealEstateArea: this.searchForm.checkArealEstateArea,
+        };
+        queryCommerListDeedTax(parmas).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.pagination.total = res.data.total;
+            if (res.data.total) {
+              this.tableData = res.data.list.map((item) => {
+                item.stateName = this.getSatusArr(item.state).stateName;
+                item.type = this.getSatusArr(item.state).type;
+                return item;
+              });
+              if (localStorage.getItem("userName") == "admin") {
+                this.tableData = changeList(this.tableData);
+              }
+              resolve();
+            } else {
+              this.tableData = [];
+            }
+          }
+          this.appLoading?.close();
+        });
       });
     },
     onSubmit() {
@@ -871,6 +909,13 @@ export default {
             this.$message.error("未输入原因");
             return;
           }
+          this.appLoading = this.$loading({
+            lock: true,
+            text: "审核中",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+            customClass: "fullLoading",
+          });
           queryCommerDeedTaxDetailInfo({ code: row.code }).then((res) => {
             if (res.success) {
               let params = {
@@ -889,7 +934,7 @@ export default {
               updateCommerDeedTaxState(params).then((res) => {
                 if (res.success) {
                   this.$message.success(`复审通过`);
-                  this.init();
+
                   this.resetHandle(row);
 
                   // if (this.$route.query.realEstateArea != '句容市') {
@@ -926,6 +971,14 @@ export default {
             this.$message.error("未输入原因");
             return;
           }
+          this.appLoading = this.$loading({
+            lock: true,
+            text: "审核中",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+            customClass: "fullLoading",
+          });
+
           queryCommerDeedTaxDetailInfo({ code: row.code }).then((res) => {
             if (res.success) {
               let params = {
@@ -941,8 +994,7 @@ export default {
                 reason: value,
               };
 
-              updateCommerDeedTaxState(params).then((res) => {
-                console.log(res);
+              updateCommerDeedTaxState(params).then(() => {
                 this.$message.success(`复审驳回成功`);
                 this.init();
               });
@@ -1033,7 +1085,7 @@ export default {
         Promise.all([
           queryCommerDeedTaxDetailInfo(params),
           queryCommerDeedTaxRecord(params),
-        ]).then((res) => {
+        ]).then(async (res) => {
           this.detail = res[0].data;
 
           this.arrList = res[1].data;
@@ -1053,23 +1105,25 @@ export default {
               : "";
           });
 
-          this.initTemplate();
+          await this.initTemplate();
+
           resolve();
         });
       });
     },
     initTemplate() {
+      return new Promise((resolve) => {
         let that = this;
         let promiseText = that.$store.state.utils.promiseText;
         let text = "";
         if (
-        that.realEstateArea == "丹阳市" &&
+          that.detail.realEstateArea == "丹阳市" &&
           that.detail.commitmentType == "1"
         ) {
           // 单独所有、共同共有
           text = promiseText.alone;
         } else if (
-        that.realEstateArea == "丹阳市" &&
+          that.detail.realEstateArea == "丹阳市" &&
           that.detail.commitmentType == "2"
         ) {
           // 按份共有
@@ -1078,6 +1132,7 @@ export default {
         } else {
           text = promiseText.default;
         }
+
         let arr = {};
         arr.promiseText = text;
 
@@ -1085,6 +1140,7 @@ export default {
 
         arr.commitmentTypeName =
           that.detail.commitmentType == 1 ? "单独所有、共同共有" : "按份共有";
+
         arr.name = that.detail.name;
         arr.idCard = that.detail.idCard;
         arr.title = "商办用房";
@@ -1104,15 +1160,18 @@ export default {
         arr.arr1 = that.arr1 || ""; // 财政
         arr.arr2 = that.arr2 || ""; // 不动产
         arr.arr3 = that.arr3 || ""; // 税务
+        if (this.$route.query.realEstateArea != "句容市") {
+          arr.arr1 = that.arr1 || ""; // 财政
+          arr.arr2 = that.arr2 || ""; // 不动产
+          arr.arr3 = that.arr3 || ""; // 税务
+          this.docxsrc = "./static/deedTax1.docx"; //模板文件的位置
+        }
 
-      if (that.detail.realEstateArea == "丹阳市") {
         arr.arr1 = that.arr1 || ""; // 财政
         arr.arr2 = that.arr2 || ""; // 不动产
         arr.arr3 = that.arr3 || ""; // 税务
         arr.arr4 = that.arr4 || ""; // 住建
         this.docxsrc = "./static/deedTax1_danYang.docx"; //模板文件的位置
-      }
-      console.log(this.docxsrc, "docxsrc");
 
         // let docxname = '购房契税补贴申请表'; //导出文件的名字
         // 读取并获得模板文件的二进制内容
@@ -1132,24 +1191,23 @@ export default {
           doc.setData({
             ...arr, // e中的数据可以再模板中直接使用
           });
-        try {
-          // 用模板变量的值替换所有模板变量
           doc.render();
-        } catch (error) {
-          // 抛出异常
-          let e = {
-            message: error.message,
-            name: error.name,
-            stack: error.stack,
-            properties: error.properties,
-          };
-          console.log(
-            JSON.stringify({
-              error: e,
-            })
-          );
-          throw error;
-        }
+
+          // try {
+          //   // 用模板变量的值替换所有模板变量
+          //   doc.render();
+          // }
+          //  catch (error) {
+          //   // // 抛出异常
+          //   // let e = {
+          //   //   message: error.message,
+          //   //   name: error.name,
+          //   //   stack: error.stack,
+          //   //   properties: error.properties,
+          //   // };
+
+          //   throw error;
+          // }
           // 生成一个代表docxtemplater对象的zip文件（不是一个真实的文件，而是在内存中的表示）
           let out = doc.getZip().generate({
             type: "blob",
@@ -1161,21 +1219,19 @@ export default {
               type: out.type,
             })
           ).then((res) => {
-          console.log("文件的res----", res);
             if (res.success) {
               let params = {
                 code: that.detail.code,
                 fileUrl: res.data,
               };
-            saveCommerFileUrl(params).then((res) => {
-              console.log("初审通过后的传填充文件给后端---", res);
-              that.init();
+              saveCommerFileUrl(params).then(async (res) => {
+                await that.initNew();
+                resolve(res);
               });
             } else {
               that.$message.error(res.msg);
               queryCommerDeedTaxDetailInfo({ code: that.rowDetail.code }).then(
                 (res) => {
-                console.log(res);
                   if (res.success) {
                     let params = {
                       code: that.rowDetail.code,
@@ -1183,9 +1239,9 @@ export default {
                       reviewerId: that.rowDetail.reviewerId,
                       state: res.data.state,
                     };
-                  initCommerDepartmentRevocation(params).then((res) => {
-                    console.log(res);
-                    that.init();
+                    initCommerDepartmentRevocation(params).then(async (res) => {
+                      await that.initNew();
+                      resolve(res);
                     });
                   }
                 }
@@ -1193,6 +1249,7 @@ export default {
             }
           });
         });
+      });
     },
   },
   created() {

src/views/Commercialdeedtax/house.vue

@@ -1276,7 +1276,7 @@ export default {
           break;
 
         default:
-          await this.resetHandle(row);
+          // await this.resetHandle(row);
           window.location.href = row.fileUrl;
           break;
       }

src/views/Commercialdeedtax/index.vue

@@ -889,7 +889,6 @@ export default {
       })[0];
     },
     pass(row) {
-      console.log(row);
       this.rowDetail = row;
       this.$prompt(`确定通过该申请的初审吗?`, "提示", {
         confirmButtonText: "确定",
@@ -1239,8 +1238,9 @@ export default {
       }
       const loading = this.$loading({
         lock: true,
-        text: "Loading",
+        text: "审核中",
         spinner: "el-icon-loading",
+        customClass: "fullLoading",
       });
       userCommerExport(this.downLoadParams)
         .then((res) => {

src/views/Deedtax/dy_house.vue

@@ -642,6 +642,7 @@ export default {
         },
       ],
       detail: {},
+      appLoading: null,
     };
   },
   watch: {
@@ -704,6 +705,43 @@ export default {
             this.tableData = [];
           }
         }
+        this.appLoading?.close();
+      });
+    },
+    initNew() {
+      return new Promise((resolve) => {
+        this.tableData = [];
+        this.loading = true;
+        let parmas = {
+          name: this.searchForm.name,
+          phone: this.searchForm.phone,
+          state: this.searchForm.state,
+          departmentCode: this.searchForm.departmentCode,
+          pageNum: this.pagination.currentPage,
+          pageSize: this.pagination.pageSize,
+          checkArea: this.realEstateArea,
+          checkArealEstateArea: this.searchForm.checkArealEstateArea,
+        };
+        queryListDeedTax(parmas).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.pagination.total = res.data.total;
+            if (res.data.total) {
+              this.tableData = res.data.list.map((item) => {
+                item.stateName = this.getSatusArr(item.state).stateName;
+                item.type = this.getSatusArr(item.state).type;
+                return item;
+              });
+              if (localStorage.getItem("userName") == "admin") {
+                this.tableData = changeList(this.tableData);
+              }
+              resolve();
+            } else {
+              this.tableData = [];
+            }
+          }
+          this.appLoading?.close();
+        });
       });
     },
     onSubmit() {
@@ -871,6 +909,13 @@ export default {
             this.$message.error("未输入原因");
             return;
           }
+          this.appLoading = this.$loading({
+            lock: true,
+            text: "审核中",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+            customClass: "fullLoading",
+          });
           queryDeedTaxDetailInfo({ code: row.code }).then((res) => {
             if (res.success) {
               let params = {
@@ -889,7 +934,7 @@ export default {
               updateDeedTaxState(params).then((res) => {
                 if (res.success) {
                   this.$message.success(`复审通过`);
-                  this.init();
+
                   this.resetHandle(row);
 
                   // if (this.$route.query.realEstateArea != '句容市') {
@@ -926,6 +971,13 @@ export default {
             this.$message.error("未输入原因");
             return;
           }
+          this.appLoading = this.$loading({
+            lock: true,
+            text: "审核中",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+            customClass: "fullLoading",
+          });
           queryDeedTaxDetailInfo({ code: row.code }).then((res) => {
             if (res.success) {
               let params = {
@@ -1059,17 +1111,18 @@ export default {
       });
     },
     initTemplate() {
+      return new Promise((resolve) => {
         let that = this;
         let promiseText = that.$store.state.utils.promiseText;
         let text = "";
         if (
-        that.realEstateArea == "丹阳市" &&
+          that.detail.realEstateArea == "丹阳市" &&
           that.detail.commitmentType == "1"
         ) {
           // 单独所有、共同共有
           text = promiseText.alone;
         } else if (
-        that.realEstateArea == "丹阳市" &&
+          that.detail.realEstateArea == "丹阳市" &&
           that.detail.commitmentType == "2"
         ) {
           // 按份共有
@@ -1078,6 +1131,7 @@ export default {
         } else {
           text = promiseText.default;
         }
+
         let arr = {};
         arr.promiseText = text;
 
@@ -1085,6 +1139,7 @@ export default {
 
         arr.commitmentTypeName =
           that.detail.commitmentType == 1 ? "单独所有、共同共有" : "按份共有";
+
         arr.name = that.detail.name;
         arr.idCard = that.detail.idCard;
         arr.title = "首套商品住房";
@@ -1101,18 +1156,23 @@ export default {
         arr.square = that.detail.square;
         arr.bank = that.detail.bank;
         arr.bankCard = that.detail.bankCard;
-      // arr.arr1 = that.arr1 || ""; // 财政
-      // arr.arr2 = that.arr2 || ""; // 不动产
-      // arr.arr3 = that.arr3 || ""; // 税务
+        arr.arr1 = that.arr1 || ""; // 财政
+        arr.arr2 = that.arr2 || ""; // 不动产
+        arr.arr3 = that.arr3 || ""; // 税务
+        if (this.$route.query.realEstateArea != "句容市") {
+          arr.arr1 = that.arr1 || ""; // 财政
+          arr.arr2 = that.arr2 || ""; // 不动产
+          arr.arr3 = that.arr3 || ""; // 税务
+          this.docxsrc = "./static/deedTax1.docx"; //模板文件的位置
+        }
 
-      console.log(that.detail.realEstateArea, "that.detail.realEstateArea");
-      // if (that.detail.realEstateArea == "丹阳市") {
         arr.arr1 = that.arr1 || ""; // 财政
         arr.arr2 = that.arr2 || ""; // 不动产
         arr.arr3 = that.arr3 || ""; // 税务
         arr.arr4 = that.arr4 || ""; // 住建
         this.docxsrc = "./static/deedTax1_danYang.docx"; //模板文件的位置
-      // }
+
+        console.log(this.docxsrc, "docxsrc");
 
         // let docxname = '购房契税补贴申请表'; //导出文件的名字
         // 读取并获得模板文件的二进制内容
@@ -1167,9 +1227,11 @@ export default {
                 code: that.detail.code,
                 fileUrl: res.data,
               };
-            saveFileUrl(params).then((res) => {
+              saveFileUrl(params).then(async (res) => {
                 console.log("初审通过后的传填充文件给后端---", res);
-              that.init();
+
+                await that.initNew();
+                resolve();
               });
             } else {
               that.$message.error(res.msg);
@@ -1183,9 +1245,10 @@ export default {
                       reviewerId: that.rowDetail.reviewerId,
                       state: res.data.state,
                     };
-                  initDepartmentRevocation(params).then((res) => {
+                    initDepartmentRevocation(params).then(async (res) => {
                       console.log(res);
-                    that.init();
+                      await that.initNew();
+                      resolve();
                     });
                   }
                 }
@@ -1193,6 +1256,7 @@ export default {
             }
           });
         });
+      });
     },
   },
   created() {

src/views/Deedtax/house.vue

@@ -1261,7 +1261,7 @@ export default {
           break;
 
         default:
-          await this.resetHandle(row);
+          // await this.resetHandle(row);
 
           window.location.href = row.fileUrl;
           break;

src/views/Deedtax/index.vue

@@ -884,7 +884,6 @@ export default {
       })[0];
     },
     pass(row) {
-      console.log(row);
       this.rowDetail = row;
       this.$prompt(`确定通过该申请的初审吗?`, "提示", {
         confirmButtonText: "确定",
@@ -1238,8 +1237,9 @@ export default {
       }
       const loading = this.$loading({
         lock: true,
-        text: "Loading",
+        text: "审核中",
         spinner: "el-icon-loading",
+        customClass: "fullLoading",
       });
       userExport(this.downLoadParams)
         .then((res) => {

src/views/Housedeedtax/dy_house.vue

@@ -642,6 +642,7 @@ export default {
         },
       ],
       detail: {},
+      appLoading: null,
     };
   },
   watch: {
@@ -706,6 +707,42 @@ export default {
         }
       });
     },
+    initNew() {
+      return new Promise((resolve) => {
+        this.tableData = [];
+        this.loading = true;
+        let parmas = {
+          name: this.searchForm.name,
+          phone: this.searchForm.phone,
+          state: this.searchForm.state,
+          departmentCode: this.searchForm.departmentCode,
+          pageNum: this.pagination.currentPage,
+          pageSize: this.pagination.pageSize,
+          checkArea: this.realEstateArea,
+          checkArealEstateArea: this.searchForm.checkArealEstateArea,
+        };
+        queryHouseListDeedTax(parmas).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.pagination.total = res.data.total;
+            if (res.data.total) {
+              this.tableData = res.data.list.map((item) => {
+                item.stateName = this.getSatusArr(item.state).stateName;
+                item.type = this.getSatusArr(item.state).type;
+                return item;
+              });
+              if (localStorage.getItem("userName") == "admin") {
+                this.tableData = changeList(this.tableData);
+              }
+              resolve();
+            } else {
+              this.tableData = [];
+            }
+          }
+          this.appLoading?.close();
+        });
+      });
+    },
     onSubmit() {
       this.pagination.currentPage = 1;
       this.init();
@@ -871,6 +908,13 @@ export default {
             this.$message.error("未输入原因");
             return;
           }
+          this.appLoading = this.$loading({
+            lock: true,
+            text: "审核中",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+            customClass: "fullLoading",
+          });
           queryHouseDeedTaxDetailInfo({ code: row.code }).then((res) => {
             if (res.success) {
               let params = {
@@ -889,7 +933,7 @@ export default {
               updateHouseDeedTaxState(params).then((res) => {
                 if (res.success) {
                   this.$message.success(`复审通过`);
-                  this.init();
+
                   this.resetHandle(row);
 
                   // if (this.$route.query.realEstateArea != '句容市') {
@@ -926,6 +970,13 @@ export default {
             this.$message.error("未输入原因");
             return;
           }
+          this.appLoading = this.$loading({
+            lock: true,
+            text: "审核中",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+            customClass: "fullLoading",
+          });
           queryHouseDeedTaxDetailInfo({ code: row.code }).then((res) => {
             if (res.success) {
               let params = {
@@ -1059,17 +1110,18 @@ export default {
       });
     },
     initTemplate() {
+      return new Promise((resolve) => {
         let that = this;
         let promiseText = that.$store.state.utils.promiseText;
         let text = "";
         if (
-        this.realEstateArea == "丹阳市" &&
+          that.detail.realEstateArea == "丹阳市" &&
           that.detail.commitmentType == "1"
         ) {
           // 单独所有、共同共有
           text = promiseText.alone;
         } else if (
-        this.realEstateArea == "丹阳市" &&
+          that.detail.realEstateArea == "丹阳市" &&
           that.detail.commitmentType == "2"
         ) {
           // 按份共有
@@ -1078,6 +1130,7 @@ export default {
         } else {
           text = promiseText.default;
         }
+
         let arr = {};
         arr.promiseText = text;
 
@@ -1085,10 +1138,10 @@ export default {
 
         arr.commitmentTypeName =
           that.detail.commitmentType == 1 ? "单独所有、共同共有" : "按份共有";
+
         arr.name = that.detail.name;
         arr.idCard = that.detail.idCard;
         arr.title = "改善型住房";
-
         arr.birthDate =
           that.detail.idCard.substring(6, 10) +
           "-" +
@@ -1105,14 +1158,18 @@ export default {
         arr.arr1 = that.arr1 || ""; // 财政
         arr.arr2 = that.arr2 || ""; // 不动产
         arr.arr3 = that.arr3 || ""; // 税务
-
-      if (this.detail.realEstateArea == "丹阳市") {
+        if (this.$route.query.realEstateArea != "句容市") {
+          arr.arr1 = that.arr1 || ""; // 财政
+          arr.arr2 = that.arr2 || ""; // 不动产
+          arr.arr3 = that.arr3 || ""; // 税务
+          this.docxsrc = "./static/deedTax1.docx"; //模板文件的位置
+        }
         arr.arr1 = that.arr1 || ""; // 财政
         arr.arr2 = that.arr2 || ""; // 不动产
         arr.arr3 = that.arr3 || ""; // 税务
         arr.arr4 = that.arr4 || ""; // 住建
         this.docxsrc = "./static/deedTax1_danYang.docx"; //模板文件的位置
-      }
+
         console.log(this.docxsrc, "docxsrc");
 
         // let docxname = '购房契税补贴申请表'; //导出文件的名字
@@ -1168,9 +1225,11 @@ export default {
                 code: that.detail.code,
                 fileUrl: res.data,
               };
-            saveHouseFileUrl(params).then((res) => {
+              saveHouseFileUrl(params).then(async (res) => {
                 console.log("初审通过后的传填充文件给后端---", res);
-              that.init();
+
+                await that.initNew();
+                resolve();
               });
             } else {
               that.$message.error(res.msg);
@@ -1184,9 +1243,10 @@ export default {
                       reviewerId: that.rowDetail.reviewerId,
                       state: res.data.state,
                     };
-                  initHouseDepartmentRevocation(params).then((res) => {
+                    initHouseDepartmentRevocation(params).then(async (res) => {
                       console.log(res);
-                    that.init();
+                      await that.initNew();
+                      resolve();
                     });
                   }
                 }
@@ -1194,6 +1254,7 @@ export default {
             }
           });
         });
+      });
     },
   },
   created() {

src/views/Housedeedtax/house.vue

@@ -1275,7 +1275,7 @@ export default {
           break;
 
         default:
-          await this.resetHandle(row);
+          // await this.resetHandle(row);
           window.location.href = row.fileUrl;
           break;
       }

src/views/Housedeedtax/index.vue

@@ -886,7 +886,6 @@ export default {
       })[0];
     },
     pass(row) {
-      console.log(row);
       this.rowDetail = row;
       this.$prompt(`确定通过该申请的初审吗?`, "提示", {
         confirmButtonText: "确定",
@@ -1248,8 +1247,9 @@ export default {
       }
       const loading = this.$loading({
         lock: true,
-        text: "Loading",
+        text: "审核中",
         spinner: "el-icon-loading",
+        customClass: "fullLoading",
       });
       userHouseExport(this.downLoadParams)
         .then((res) => {

src/views/Multipledeedtax/dy_house.vue

@@ -642,6 +642,7 @@ export default {
         },
       ],
       detail: {},
+      appLoading: null,
     };
   },
   watch: {
@@ -706,6 +707,42 @@ export default {
         }
       });
     },
+    initNew() {
+      return new Promise((resolve) => {
+        this.tableData = [];
+        this.loading = true;
+        let parmas = {
+          name: this.searchForm.name,
+          phone: this.searchForm.phone,
+          state: this.searchForm.state,
+          departmentCode: this.searchForm.departmentCode,
+          pageNum: this.pagination.currentPage,
+          pageSize: this.pagination.pageSize,
+          checkArea: this.realEstateArea,
+          checkArealEstateArea: this.searchForm.checkArealEstateArea,
+        };
+        queryMultipleListDeedTax(parmas).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.pagination.total = res.data.total;
+            if (res.data.total) {
+              this.tableData = res.data.list.map((item) => {
+                item.stateName = this.getSatusArr(item.state).stateName;
+                item.type = this.getSatusArr(item.state).type;
+                return item;
+              });
+              if (localStorage.getItem("userName") == "admin") {
+                this.tableData = changeList(this.tableData);
+              }
+              resolve();
+            } else {
+              this.tableData = [];
+            }
+          }
+          this.appLoading?.close();
+        });
+      });
+    },
     onSubmit() {
       this.pagination.currentPage = 1;
       this.init();
@@ -871,6 +908,13 @@ export default {
             this.$message.error("未输入原因");
             return;
           }
+          this.appLoading = this.$loading({
+            lock: true,
+            text: "审核中",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+            customClass: "fullLoading",
+          });
           queryMultipleDeedTaxDetailInfo({ code: row.code }).then((res) => {
             if (res.success) {
               let params = {
@@ -889,7 +933,7 @@ export default {
               updateMultipleDeedTaxState(params).then((res) => {
                 if (res.success) {
                   this.$message.success(`复审通过`);
-                  this.init();
+
                   this.resetHandle(row);
 
                   // if (this.$route.query.realEstateArea != '句容市') {
@@ -926,6 +970,13 @@ export default {
             this.$message.error("未输入原因");
             return;
           }
+          this.appLoading = this.$loading({
+            lock: true,
+            text: "审核中",
+            spinner: "el-icon-loading",
+            background: "rgba(0, 0, 0, 0.7)",
+            customClass: "fullLoading",
+          });
           queryMultipleDeedTaxDetailInfo({ code: row.code }).then((res) => {
             if (res.success) {
               let params = {
@@ -1059,17 +1110,18 @@ export default {
       });
     },
     initTemplate() {
+      return new Promise((resolve) => {
         let that = this;
         let promiseText = that.$store.state.utils.promiseText;
         let text = "";
         if (
-        this.realEstateArea == "丹阳市" &&
+          that.detail.realEstateArea == "丹阳市" &&
           that.detail.commitmentType == "1"
         ) {
           // 单独所有、共同共有
           text = promiseText.alone;
         } else if (
-        this.realEstateArea == "丹阳市" &&
+          that.detail.realEstateArea == "丹阳市" &&
           that.detail.commitmentType == "2"
         ) {
           // 按份共有
@@ -1078,6 +1130,7 @@ export default {
         } else {
           text = promiseText.default;
         }
+
         let arr = {};
         arr.promiseText = text;
 
@@ -1085,10 +1138,10 @@ export default {
 
         arr.commitmentTypeName =
           that.detail.commitmentType == 1 ? "单独所有、共同共有" : "按份共有";
+
         arr.name = that.detail.name;
         arr.idCard = that.detail.idCard;
         arr.title = "多子女家庭";
-
         arr.birthDate =
           that.detail.idCard.substring(6, 10) +
           "-" +
@@ -1105,14 +1158,18 @@ export default {
         arr.arr1 = that.arr1 || ""; // 财政
         arr.arr2 = that.arr2 || ""; // 不动产
         arr.arr3 = that.arr3 || ""; // 税务
-
-      if (this.detail.realEstateArea == "丹阳市") {
+        if (this.$route.query.realEstateArea != "句容市") {
+          arr.arr1 = that.arr1 || ""; // 财政
+          arr.arr2 = that.arr2 || ""; // 不动产
+          arr.arr3 = that.arr3 || ""; // 税务
+          this.docxsrc = "./static/deedTax1.docx"; //模板文件的位置
+        }
         arr.arr1 = that.arr1 || ""; // 财政
         arr.arr2 = that.arr2 || ""; // 不动产
         arr.arr3 = that.arr3 || ""; // 税务
         arr.arr4 = that.arr4 || ""; // 住建
         this.docxsrc = "./static/deedTax1_danYang.docx"; //模板文件的位置
-      }
+
         console.log(this.docxsrc, "docxsrc");
 
         // let docxname = '购房契税补贴申请表'; //导出文件的名字
@@ -1168,14 +1225,18 @@ export default {
                 code: that.detail.code,
                 fileUrl: res.data,
               };
-            saveMultipleFileUrl(params).then((res) => {
+              saveMultipleFileUrl(params).then(async (res) => {
                 console.log("初审通过后的传填充文件给后端---", res);
-              that.init();
+
+                await that.initNew();
+                resolve();
               });
             } else {
               that.$message.error(res.msg);
-            queryMultipleDeedTaxDetailInfo({ code: that.rowDetail.code }).then(
-              (res) => {
+
+              queryMultipleDeedTaxDetailInfo({
+                code: that.rowDetail.code,
+              }).then((res) => {
                 console.log(res);
                 if (res.success) {
                   let params = {
@@ -1184,14 +1245,15 @@ export default {
                     reviewerId: that.rowDetail.reviewerId,
                     state: res.data.state,
                   };
-                  initMultipleDepartmentRevocation(params).then((res) => {
+                  initMultipleDepartmentRevocation(params).then(async (res) => {
                     console.log(res);
-                    that.init();
+                    await that.initNew();
+                    resolve();
                   });
                 }
+              });
             }
-            );
-          }
+          });
         });
       });
     },

src/views/Multipledeedtax/house.vue

@@ -1283,7 +1283,7 @@ export default {
           break;
 
         default:
-          await this.resetHandle(row);
+          // await this.resetHandle(row);
           window.location.href = row.fileUrl;
           break;
       }

src/views/Multipledeedtax/index.vue

@@ -884,7 +884,6 @@ export default {
       })[0];
     },
     pass(row) {
-      console.log(row);
       this.rowDetail = row;
       this.$prompt(`确定通过该申请的初审吗?`, "提示", {
         confirmButtonText: "确定",
@@ -1241,8 +1240,9 @@ export default {
       }
       const loading = this.$loading({
         lock: true,
-        text: "Loading",
+        text: "审核中",
         spinner: "el-icon-loading",
+        customClass: "fullLoading",
       });
       userMultipleExport(this.downLoadParams)
         .then((res) => {