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

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

@@ -7,9 +7,9 @@
           <companysub />
           <companysub />
         </el-dialog>
         </el-dialog>
         <el-dialog title="公司注册方案" :visible.sync="companyDetailDialog" width="60%" center>
         <el-dialog title="公司注册方案" :visible.sync="companyDetailDialog" width="60%" center>
-            <Companydetail :no="detailsNeedNo" @companyAddDone="closeCompanyAddDialog" />
-          </el-dialog>
-        
+          <Companydetail :no="detailsNeedNo" @companyAddDone="closeCompanyAddDialog" />
+        </el-dialog>
+
         <div class="company-find">
         <div class="company-find">
           <div class="box">
           <div class="box">
             <div>方案编号：</div>
             <div>方案编号：</div>
@@ -125,7 +125,6 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>
-          
         </div>
         </div>
         <div class="block">
         <div class="block">
           <el-pagination
           <el-pagination
@@ -140,10 +139,7 @@
       </el-tab-pane>
       </el-tab-pane>
       <el-tab-pane label="云上公司注册" name="2">
       <el-tab-pane label="云上公司注册" name="2">
         <el-dialog title="云上公司注册方案" :visible.sync="cloudCompanyAddDialog" width="60%" center>
         <el-dialog title="云上公司注册方案" :visible.sync="cloudCompanyAddDialog" width="60%" center>
-          <Cloudcompany @cloudAddDone="closeCloudCompanyAddDialog"></Cloudcompany>
-        </el-dialog>
-        <el-dialog title="云上公司注册方案" :visible.sync="cloudDetailDialog" width="60%" center>
-          <Clouddetails :no="detailsNeedNo"></Clouddetails>
+          <Cloudcompany @cloudAddDone="closeCloudCompanyAddDialog" :no="detailsNeedNo"></Cloudcompany>
         </el-dialog>
         </el-dialog>
         <div class="company-find">
         <div class="company-find">
           <div class="box">
           <div class="box">
@@ -486,7 +482,7 @@ export default {
       }
       }
       this.getListData();
       this.getListData();
     },
     },
-  
+
     toDetails(idx, row) {
     toDetails(idx, row) {
       console.log(row, "////////////////////////////");
       console.log(row, "////////////////////////////");
       this.detailsNeedNo = row.needNo;
       this.detailsNeedNo = row.needNo;
@@ -534,13 +530,13 @@ export default {
     },
     },
     dotColor(status) {
     dotColor(status) {
       switch (status) {
       switch (status) {
-        case 'dqr':
+        case "dqr":
           return `hold`;
           return `hold`;
           break;
           break;
-        case 'ywc':
+        case "ywc":
           return `done`;
           return `done`;
           break;
           break;
-        case 'yzf':
+        case "yzf":
           return `cancellation`;
           return `cancellation`;
           break;
           break;
       }
       }
@@ -670,7 +666,7 @@ export default {
       //生产环境
       //生产环境
       this.baseURL = "/web/action/icapi/springBoard";
       this.baseURL = "/web/action/icapi/springBoard";
     }
     }
-    console.log(JSON.parse(this.$route.query.data));
+    // console.log(JSON.parse(this.$route.query.data));
   },
   },
   mounted() {
   mounted() {
     this.getListData();
     this.getListData();