Merge branch 'channel-access' of gitlab.gongsibao.com:jiangyong/zhichan into channel-access

channel-access/src/views/fqembed/Cloudcompany.vue

@@ -194,8 +194,8 @@ export default {
           {
             actionType: "submitProgramme",
             actionBody: {
-              // needNo: "N202002141324bupnr8L",
-              needNo: this.$route.query.needNo,
+              needNo: "N202002141324bupnr8L",
+              // needNo: this.$route.query.needNo,
               solutionContent: {
                 bizType: "companyreg_cloud", // 注册类型：
                 solution: {
@@ -226,9 +226,9 @@ export default {
           },
           {
             headers: {
-              // token: "3260d5a2452441dd93ecc7ecb35f6dc0",
-              token: this.$route.query.token,
-              userpin: "39fcf7bc5f6c4e55a1f85d750e37316b"
+              token: "3260d5a2452441dd93ecc7ecb35f6dc0",
+              // token: this.$route.query.token,
+              userpin: "417c247bc8664999a508fd710cc25567"
             }
           }
         )

channel-access/src/views/fqembed/Companydetail.vue

@@ -292,7 +292,7 @@ export default {
         {
           headers: {
             token: "3260d5a2452441dd93ecc7ecb35f6dc0",
-            userpin: "39fcf7bc5f6c4e55a1f85d750e37316b"
+            userpin: "417c247bc8664999a508fd710cc25567"
           }
         }
       )

channel-access/src/views/fqembed/Companysub.vue

@@ -423,7 +423,7 @@ export default {
         "方案备注：",
         this.notes
       );
-      this.$emit("companyAddDone", this.passCompanyDialog);
+      // this.$emit("companyAddDone", this.passCompanyDialog);
 
       req
         .post(
@@ -431,8 +431,8 @@ export default {
           {
             actionType: "submitProgramme",
             actionBody: {
-              // needNo: "N202002141324bupnr8L",
-              needNo: this.$route.query.needNo,
+              needNo: "N202002141324bupnr8L",
+              // needNo: this.$route.query.needNo,
               solutionContent: {
                 bizType: "companyreg", // 注册类型：
                 solution: {
@@ -456,9 +456,9 @@ export default {
           },
           {
             headers: {
-              // token: "3260d5a2452441dd93ecc7ecb35f6dc0",
-              token: this.$route.query.token,
-              userpin: "39fcf7bc5f6c4e55a1f85d750e37316b"
+              token: "3260d5a2452441dd93ecc7ecb35f6dc0",
+              // token: this.$route.query.token,
+              userpin: "417c247bc8664999a508fd710cc25567"
             }
           }
         )
@@ -476,7 +476,7 @@ export default {
             this.industryValue = "";
             this.scope = "";
             this.notes = "";
-            // this.$emit("companyAddDone", this.passCompanyDialog);
+            this.$emit("companyAddDone", this.passCompanyDialog);
           } else {
             this.$message("公司注册方案提交失败");
           }

channel-access/src/views/fqembed/companylist.vue

@@ -4,10 +4,10 @@
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane label="公司注册" name="1">
         <el-dialog title="公司注册方案" :visible.sync="companyAddDialog" width="60%" center>
-          <companysub />
+          <companysub @companyAddDone="closeCompanyAddDialog" />
         </el-dialog>
         <el-dialog title="公司注册方案" :visible.sync="companyDetailDialog" width="60%" center>
-          <Companydetail :no="detailsNeedNo" @companyAddDone="closeCompanyAddDialog" />
+          <Companydetail :no="detailsNeedNo" />
         </el-dialog>
 
         <div class="company-find">
@@ -141,6 +141,9 @@
         <el-dialog title="云上公司注册方案" :visible.sync="cloudCompanyAddDialog" width="60%" center>
           <Cloudcompany @cloudAddDone="closeCloudCompanyAddDialog" :no="detailsNeedNo"></Cloudcompany>
         </el-dialog>
+        <el-dialog title="云上公司注册方案" :visible.sync="cloudDetailDialog" width="60%" center>
+          <clouddetails :no="detailsNeedNo"></clouddetails>
+        </el-dialog>
         <div class="company-find">
           <div class="box">
             <div>方案编号：</div>