123

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

@@ -7,8 +7,9 @@
           <companysub />
         </el-dialog>
         <el-dialog title="公司注册方案" :visible.sync="companyDetailDialog" width="60%" center>
-          <Companydetail :no="detailsNeedNo"></Companydetail>
-        </el-dialog>
+            <Companydetail :no="detailsNeedNo" @companyAddDone="closeCompanyAddDialog" />
+          </el-dialog>
+        
         <div class="company-find">
           <div class="box">
             <div>方案编号：</div>
@@ -123,11 +124,8 @@
                 </div>
               </template>
             </el-table-column>
-          </el-table><<<<<<< HEAD
-          <el-dialog title="公司注册方案" :visible.sync="companyDetailDialog" width="60%" center>
-            <Companydetail @companyAddDone="closeCompanyAddDialog" />
-          </el-dialog>=======
-          >>>>>>> f76e22315d3770da5c3fcd6e691517a2bf887691
+          </el-table>
+          
         </div>
         <div class="block">
           <el-pagination
@@ -142,9 +140,7 @@
       </el-tab-pane>
       <el-tab-pane label="云上公司注册" name="2">
         <el-dialog title="云上公司注册方案" :visible.sync="cloudCompanyAddDialog" width="60%" center>
-          <<<<<<< HEAD
-          <Cloudcompany @cloudAddDone="closeCloudCompanyAddDialog"></Cloudcompany>=======
-          <Cloudcompany></Cloudcompany>
+          <Cloudcompany @cloudAddDone="closeCloudCompanyAddDialog"></Cloudcompany>
         </el-dialog>
         <el-dialog title="云上公司注册方案" :visible.sync="cloudDetailDialog" width="60%" center>
           <Clouddetails :no="detailsNeedNo"></Clouddetails>>>>>>>> f76e22315d3770da5c3fcd6e691517a2bf887691