修改商户审核和商户信息弹框显示

src/views/ldt_shop/audit.vue

@@ -1,5 +1,11 @@
 <template>
   <basic-container>
+    <el-dialog @close="dialogShow=false" append-to-body :close-on-click-modal="false" :visible.sync="dialogShow"
+               :destroy-on-close="true"
+               :title="dialogTitle" width="80%">
+      <handle-mini-c-r-o-shop-audit v-if="dialogTitle=='小微审核'" ref="refName" :operateId="operateId" :processInstanceId="processInstanceId"></handle-mini-c-r-o-shop-audit>
+      <handle-shop-audit v-if="dialogTitle=='商户审核'" ref="refName" :operateId="operateId" :processInstanceId="processInstanceId"></handle-shop-audit>
+    </el-dialog>
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
@@ -29,10 +35,17 @@
 <script>
   import {getList, getDetail, add, update, remove} from "@/api/ldt_shop/audit";
   import {mapGetters} from "vuex";
+  import handleMiniCROShopAudit from "./handleMiniCROShopAudit";
+  import handleShopAudit from "./handleShopAudit";
 
   export default {
+    components:{handleMiniCROShopAudit,handleShopAudit},
     data() {
       return {
+        dialogShow: false,
+        dialogTitle: "",
+        operateId: "",
+        processInstanceId: "",
         form: {},
         query: {},
         loading: true,
@@ -132,10 +145,15 @@
     },
     methods: {
       handleAudit(row){
+        this.dialogShow = true;
+        this.processInstanceId = row.processInstanceId;
+        this.operateId = row.id;
         if(row.typeOfEnterprise==="MINICRO"){
-          this.$router.push(`/work/process/shop/miniCRO/handle/${row.processInstanceId}/${row.id}`);
+          this.dialogTitle = "小微审核";
+          // this.$router.push(`/work/process/shop/miniCRO/handle/${row.processInstanceId}/${row.id}`);
         }else{
-          this.$router.push(`/work/process/shop/handle/${row.processInstanceId}/${row.id}`);
+          this.dialogTitle = "商户审核";
+          // this.$router.push(`/work/process/shop/handle/${row.processInstanceId}/${row.id}`);
         }
       },
       rowSave(row, done, loading) {

src/views/ldt_shop/comps/shop-wechat-config.vue

@@ -105,7 +105,7 @@ export default {
   },
   methods: {
     init() {
-      this.businessId = this.$route.params.businessId;
+      // this.businessId = this.$route.params.businessId;
       getWechatConfigQuery(this.businessId).then(res => {
         this.parentData = res.data.data;
       });

src/views/ldt_shop/handleMiniCROShopAudit.vue

@@ -15,7 +15,7 @@
             <el-button v-if="form.auditStatus == 'WAITING_PLATFORM'" type="danger" @click="handleDisagree"
                        :loading="loading">驳回
             </el-button>
-            <el-button @click="handleCancel">关闭</el-button>
+<!--            <el-button @click="handleCancel">关闭</el-button>-->
           </el-form-item>
         </el-row>
       </el-card>
@@ -67,6 +67,14 @@ export default {
   mounted() {
     this.init();
   },
+  props:{
+    operateId:{
+      type: "String"
+    },
+    processInstanceId:{
+      type: "String"
+    }
+  },
   data() {
     return {
       businessId: null,
@@ -397,8 +405,10 @@ export default {
       this.activeNames = name;
     },
     init() {
-      this.businessId = this.$route.params.businessId;
-      this.processInstanceId = this.$route.params.processInstanceId;
+      // this.businessId = this.$route.params.businessId;
+      // this.processInstanceId = this.$route.params.processInstanceId;
+      this.businessId = this.operateId;
+      this.processInstanceId = this.processInstanceId;
       getDetail(this.businessId).then(res => {
         this.form = res.data.data;
         getShopDetail(res.data.data.entityId).then(res => {

src/views/ldt_shop/handleShopAudit.vue

@@ -15,7 +15,7 @@
             <el-button v-if="form.auditStatus == 'WAITING_PLATFORM'" type="danger" @click="handleDisagree"
                        :loading="loading">驳回
             </el-button>
-            <el-button @click="handleCancel">关闭</el-button>
+<!--            <el-button @click="handleCancel">关闭</el-button>-->
           </el-form-item>
         </el-row>
       </el-card>
@@ -67,6 +67,14 @@ export default {
   mounted() {
     this.init();
   },
+  props:{
+    operateId:{
+      type: "String"
+    },
+    processInstanceId:{
+      type: "String"
+    }
+  },
   data() {
     return {
       businessId: null,
@@ -460,8 +468,10 @@ export default {
       this.activeNames = name;
     },
     init() {
-      this.businessId = this.$route.params.businessId;
-      this.processInstanceId = this.$route.params.processInstanceId;
+      // this.businessId = this.$route.params.businessId;
+      // this.processInstanceId = this.$route.params.processInstanceId;
+      this.businessId = this.operateId;
+      this.processInstanceId = this.processInstanceId;
       getDetail(this.businessId).then(res => {
         getMallDetail(res.data.data.entityId).then(res => {
           this.form.locationCode = res.data.data.locationCode;

src/views/ldt_shop/shop-info.vue

@@ -10,6 +10,7 @@
           <shop-joinrecord v-if="dialogTitle==='参加的活动'" ref="refName" :operateId="businessId"></shop-joinrecord>
           <shop-withdrawrec v-if="dialogTitle==='提现记录'" ref="refName" :operateId="businessId"></shop-withdrawrec>
           <shop-product-fee v-if="dialogTitle==='产品费率'" ref="refName" :operateId="businessId"></shop-product-fee>
+          <shop-wechat-config v-if="dialogTitle==='公众号配置'" ref="refName" :businessId="businessId"></shop-wechat-config>
           <shop-auth-state v-if="dialogTitle==='易宝商户授权'" ref="refName" :operateId="businessId"></shop-auth-state>
         </el-dialog>
         <el-col style="padding: 10px 0 10px 0;">
@@ -22,7 +23,7 @@
                      :disabled="$isEmpty(this.merchantNo)">产品费率
           </el-button>
           <el-button size="small" plain icon="el-icon-chat-dot-round"
-                     @click.stop="handleWechatConfig" :disabled="$isEmpty(this.merchantNo)">公众号配置
+                     @click.stop="openDialog('公众号配置')" :disabled="$isEmpty(this.merchantNo)">公众号配置
           </el-button>
           <el-button size="small" plain icon="el-icon-s-check"
                      @click.stop="openDialog('易宝商户授权')" :disabled="$isEmpty(this.merchantNo)">易宝商户授权
@@ -97,6 +98,11 @@ export default {
     ShopWechatConfig,
     shopMember, shopBills, shopJoinrecord, shopWithdrawrec, shopProductFee
   },
+  props:{
+    operateId:{
+      type: "String"
+    }
+  },
   data() {
     return {
       merchant: {
@@ -394,7 +400,8 @@ export default {
   },
   methods: {
     init() {
-      this.businessId = this.$route.params.businessId;
+      this.businessId = this.operateId;
+      // this.businessId = this.$route.params.businessId;
       this.merchantNo = this.$route.params.no;
       this.getAccountInfo();
       this.getDetail();

src/views/ldt_shop/shop.vue

@@ -745,7 +745,12 @@ export default {
   },
   methods: {
     handleShopInfo(row) {
-      this.$router.push(`/work/process/shopInfo/handle/${row.id}`);
+      //跳链接方式
+      // this.$router.push(`/work/process/shopInfo/handle/${row.id}`);
+      this.dialogShow  = true;
+      this.dialogTitle  = "商户信息";
+      this.operateId  = row.id;
+      this.dialogTitle = "查看";
     },
     openDialog(id, name) {
       this.dialogTitle = name