seal-rayin优化-tapd的bug

src/api/business/sealCompanyInfo.js

@@ -79,7 +79,8 @@ export function saveSealCompanyInfo(data) {
   return request({
     url: '/business/sealCompanyInfo/saveSealCompanyInfo',
     method: 'post',
-    data: data
+    data: data,
+    timeout: 1000 * 60 * 2
   })
 }
 //制作电子章
@@ -89,7 +90,8 @@ export function makeSeaApil(id) {
     method: 'get',
     params: {
       id: id
-    }
+    },
+    timeout: 1000 * 60 * 3
   })
 }
 //查询电子章信息
@@ -99,6 +101,7 @@ export function querySealPicApi(id) {
     method: 'get',
     params:{
       id: id
-    }
+    },
+    timeout: 1000 * 60 * 3
   })
 }

src/views/business/companyInfo/merchant.vue

@@ -312,7 +312,7 @@ export default {
           console.log(response.code == 200)
           if (response.code == 200) {
             //校验完成 前往生成电子签章页面 sealCompanyInfo/index
-            this.$router.push({ path: '/seal/sealCompanyInfo', query: { bussinessId: row.id, bussinessType: type } })
+            this.$router.push({ path: '/seal/sealCompanyInfo', query: { bussinessId: row.id, bussinessType: type, showFlag:1 } })
           }else {
             this.$modal.msgError(response.msg)
           }
@@ -322,7 +322,7 @@ export default {
     /** 查看电子签章 */
     viewSealInfo(row) {
       const type = "hr";
-      this.$router.push({ path: '/seal/sealCompanyInfo', query: { bussinessId: row.id, bussinessType: type } })
+      this.$router.push({ path: '/seal/sealCompanyInfo', query: { bussinessId: row.id, bussinessType: type, showFlag:0 } })
     }
   }
 };

src/views/business/sealCompanyInfo/index.vue

@@ -156,13 +156,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:sealCompanyInfo:edit']"
           >修改</el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['business:sealCompanyInfo:remove']"-->
-<!--          >删除</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:sealCompanyInfo:remove']"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -297,6 +297,7 @@ export default {
       //路由传值
       bussinessId: null,
       bussinessType: null,
+      showFlag: null,
       //上传电子签章委托书
       baseUrl: process.env.VUE_APP_BASE_API,
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
@@ -437,10 +438,17 @@ export default {
       this.queryParams.bussinessType = this.$route.query.bussinessType;
       console.log("this.bussinessType："+this.bussinessType)
     }
-    if(this.bussinessId && this.bussinessType){
+    if(this.$route.query.showFlag){
+      this.showFlag = this.$route.query.showFlag;
+      console.log("this.showFlag："+this.showFlag)
+      this.getList();
+    }
+    if(this.bussinessId && this.bussinessType && this.showFlag && this.showFlag == 1){
       console.log("this.bussinessId："+this.bussinessId + "; this.bussinessType："+this.bussinessType)
       this.getEnterpriseSubmittedInfo(this.bussinessId,this.bussinessType)
     }
+
+
   },
   methods: {
     /** 查询电子章信息列表 */

src/views/business/taxUnit/index.vue

@@ -345,14 +345,15 @@ export default {
     /** 生成电子签章 */
     makeSealPre(row) {
       //是否确认生成电子签章 ，如果确认，调用接口生成电子签章，然后跳转到电子签章页面
-      this.$modal.confirm('是否确认为【'+row.unitName+'】企业生成电子签章？').then(function() {
+      this.$modal.confirm('是否确认为【'+row.unitName+'】企业生成电子签章？').then(() => {
         const type = "tax";
         makeSealPreCheck(row.id,type).then(response => {
+          console.log(response.code == 200)
           if (response.code == 200) {
             //校验完成 前往生成电子签章页面 sealCompanyInfo/index
-            self.$router.push({ path: '/seal/sealCompanyInfo', query: { bussinessId: row.id, bussinessType: type , addFlag:true } })
+            this.$router.push({ path: '/seal/sealCompanyInfo', query: { bussinessId: row.id, bussinessType: type, showFlag:1 } })
           }else {
-            self.$modal.msgError(response.data.msg)
+            this.$modal.msgError(response.msg)
           }
         })
       })
@@ -360,7 +361,7 @@ export default {
     /** 查看电子签章 */
     viewSealInfo(row) {
       const type = "hr";
-      this.$router.push({ path: '/seal/sealCompanyInfo', query: { bussinessId: row.id, bussinessType: type } })
+      this.$router.push({ path: '/seal/sealCompanyInfo', query: { bussinessId: row.id, bussinessType: type, showFlag:0 } })
     }
   }
 }