Skip to content

Z
zhichan
Commit c066e1bf by 刘泽奇
Options

123

parent 663ba86d
Showing with 6 additions and 10 deletions
channel-access/src/views/fqembed/companylist.vue
...@@ -7,8 +7,9 @@ ...@@ -7,8 +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"></Companydetail> <Companydetail :no="detailsNeedNo" @companyAddDone="closeCompanyAddDialog" />
</el-dialog> </el-dialog>
<div class="company-find"> <div class="company-find">
<div class="box"> <div class="box">
<div>方案编号：</div> <div>方案编号：</div>
...@@ -123,11 +124,8 @@ ...@@ -123,11 +124,8 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table><<<<<<< HEAD </el-table>
<el-dialog title="公司注册方案" :visible.sync="companyDetailDialog" width="60%" center>
<Companydetail @companyAddDone="closeCompanyAddDialog" />
</el-dialog>=======
>>>>>>> f76e22315d3770da5c3fcd6e691517a2bf887691
</div> </div>
<div class="block"> <div class="block">
<el-pagination <el-pagination
...@@ -142,9 +140,7 @@ ...@@ -142,9 +140,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>
<<<<<<< HEAD <Cloudcompany @cloudAddDone="closeCloudCompanyAddDialog"></Cloudcompany>
<Cloudcompany @cloudAddDone="closeCloudCompanyAddDialog"></Cloudcompany>=======
<Cloudcompany></Cloudcompany>
</el-dialog> </el-dialog>
<el-dialog title="云上公司注册方案" :visible.sync="cloudDetailDialog" width="60%" center> <el-dialog title="云上公司注册方案" :visible.sync="cloudDetailDialog" width="60%" center>
<Clouddetails :no="detailsNeedNo"></Clouddetails>>>>>>>> f76e22315d3770da5c3fcd6e691517a2bf887691 <Clouddetails :no="detailsNeedNo"></Clouddetails>>>>>>>> f76e22315d3770da5c3fcd6e691517a2bf887691
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment