Commit 62487c0b by 尹亚亭

111

parents 5619739e f76e2231
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
<el-dialog title="公司注册方案" :visible.sync="companyAddDialog" width="60%" center> <el-dialog title="公司注册方案" :visible.sync="companyAddDialog" width="60%" center>
<companysub /> <companysub />
</el-dialog> </el-dialog>
<el-dialog title="公司注册方案" :visible.sync="companyDetailDialog" width="60%" center>
<Companydetail :no="detailsNeedNo"></Companydetail>
</el-dialog>
<div class="company-find"> <div class="company-find">
<div class="box"> <div class="box">
<div>方案编号:</div> <div>方案编号:</div>
...@@ -117,10 +120,11 @@ ...@@ -117,10 +120,11 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table><<<<<<< HEAD
<el-dialog title="公司注册方案" :visible.sync="companyDetailDialog" width="60%" center> <el-dialog title="公司注册方案" :visible.sync="companyDetailDialog" width="60%" center>
<Companydetail @companyAddDone="closeCompanyAddDialog" /> <Companydetail @companyAddDone="closeCompanyAddDialog" />
</el-dialog> </el-dialog>=======
>>>>>>> f76e22315d3770da5c3fcd6e691517a2bf887691
</div> </div>
<div class="block"> <div class="block">
<el-pagination <el-pagination
...@@ -135,7 +139,12 @@ ...@@ -135,7 +139,12 @@
</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> <<<<<<< HEAD
<Cloudcompany @cloudAddDone="closeCloudCompanyAddDialog"></Cloudcompany>=======
<Cloudcompany></Cloudcompany>
</el-dialog>
<el-dialog title="云上公司注册方案" :visible.sync="cloudDetailDialog" width="60%" center>
<Clouddetails :no="detailsNeedNo"></Clouddetails>>>>>>>> f76e22315d3770da5c3fcd6e691517a2bf887691
</el-dialog> </el-dialog>
<div class="company-find"> <div class="company-find">
<div class="box"> <div class="box">
...@@ -247,9 +256,6 @@ ...@@ -247,9 +256,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog title="云上公司注册方案" :visible.sync="cloudDetailDialog" width="60%" center>
<Clouddetails />
</el-dialog>
</div> </div>
<div class="block"> <div class="block">
<el-pagination <el-pagination
...@@ -442,8 +448,11 @@ export default { ...@@ -442,8 +448,11 @@ export default {
currentPage1: 1, currentPage1: 1,
currentPage2: 1, currentPage2: 1,
cloudData: [], cloudData: [],
dataCount: 1 dataCount: 1,
// 获取详情数据 // 获取详情数据
detailsData: {},
baseURL: "",
detailsNeedNo: ""
}; };
}, },
methods: { methods: {
...@@ -479,7 +488,8 @@ export default { ...@@ -479,7 +488,8 @@ export default {
console.log(idx, row); console.log(idx, row);
}, },
toDetails(idx, row) { toDetails(idx, row) {
console.log(row); console.log(row, "////////////////////////////");
this.detailsNeedNo = row.needNo;
if (this.haveChoosedTab == 1) { if (this.haveChoosedTab == 1) {
this.companyDetailDialog = true; this.companyDetailDialog = true;
} }
...@@ -510,18 +520,10 @@ export default { ...@@ -510,18 +520,10 @@ export default {
} }
}, },
getListData() { getListData() {
let baseURL = "";
if (process.env.NODE_ENV == "development") {
//开发环境
baseURL = "/api/web/action/icapi/springBoard";
} else if (process.env.NODE_ENV == "production") {
//生产环境
baseURL = "/web/action/icapi/springBoard";
}
if (this.activeName == "1") { if (this.activeName == "1") {
req req
.post( .post(
baseURL, this.baseURL,
{ {
actionType: "getProgrammeListByUser", actionType: "getProgrammeListByUser",
actionBody: { actionBody: {
...@@ -532,20 +534,21 @@ export default { ...@@ -532,20 +534,21 @@ export default {
bizType: "companyreg", bizType: "companyreg",
orderNo: this.serviceNo || "", orderNo: this.serviceNo || "",
status: this.scheme || "", status: this.scheme || "",
entName: this.entName || "", companyName: this.entName || "",
city: this.city, area: this.city,
taxpayerType: this.taxpayer || "", companyCategory: this.taxpayer || "",
organizationType: this.tissue || "" orgType: this.tissue || ""
} }
}, },
{ {
headers: { headers: {
token: "3260d5a2452441dd93ecc7ecb35f6dc0", token: "3260d5a2452441dd93ecc7ecb35f6dc0",
userpin: "39fcf7bc5f6c4e55a1f85d750e37316b" userpin: "7c00bdd9dde04c59a50a0a45788b9a59"
} }
} }
) )
.then(res => { .then(res => {
console.log(res.data.msg);
console.log(res.data.data); console.log(res.data.data);
if (res.data.status == 0) { if (res.data.status == 0) {
let dataList = []; let dataList = [];
...@@ -553,17 +556,18 @@ export default { ...@@ -553,17 +556,18 @@ export default {
res.data.data.map((item, index) => { res.data.data.map((item, index) => {
dataItem.solutionNo = item.solutionNo || "---"; dataItem.solutionNo = item.solutionNo || "---";
dataItem.orderNo = item.orderNo || "---"; dataItem.orderNo = item.orderNo || "---";
dataItem.needNo = item.needNo || "---";
dataItem.status = item.status || "---"; dataItem.status = item.status || "---";
dataItem.statusName = item.statusName || "---"; dataItem.statusName = item.statusName || "---";
dataItem.entName = dataItem.entName =
item.solutionContent.solution.entName || "---"; item.solutionContent.solution.companyName || "---";
dataItem.organizationType = dataItem.organizationType =
item.solutionContent.solution.organizationType || "---"; item.solutionContent.solution.orgType || "---";
dataItem.entNature = dataItem.entNature =
item.solutionContent.solution.entNature || "---"; item.solutionContent.solution.companyType || "---";
dataItem.taxpayerType = dataItem.taxpayerType =
item.solutionContent.solution.taxpayerType || "---"; item.solutionContent.solution.companyCategory || "---";
dataItem.city = item.solutionContent.solution.province || "---"; dataItem.city = item.solutionContent.solution.area || "---";
dataList.push(dataItem); dataList.push(dataItem);
dataItem = {}; dataItem = {};
}); });
...@@ -577,7 +581,7 @@ export default { ...@@ -577,7 +581,7 @@ export default {
} else if (this.activeName == "2") { } else if (this.activeName == "2") {
req req
.post( .post(
baseURL, this.baseURL,
{ {
actionType: "getProgrammeListByUser", actionType: "getProgrammeListByUser",
actionBody: { actionBody: {
...@@ -585,22 +589,23 @@ export default { ...@@ -585,22 +589,23 @@ export default {
pageSize: "20", pageSize: "20",
needNo: "", needNo: "",
solutionNo: this.cSchemeNo || "", //方案编号 solutionNo: this.cSchemeNo || "", //方案编号
entName: this.cEntName || "", companyName: this.cEntName || "",
bizType: "companyreg_cloud", bizType: "companyreg_cloud",
orderNo: this.cServiceNo || "", //服务单号 orderNo: this.cServiceNo || "", //服务单号
status: this.cScheme || "", //方案状态 status: this.cScheme || "", //方案状态
regPark: this.regPark || "", //注册园区 park: this.regPark || "", //注册园区
regType: this.pType || "" //产品类型 productType: this.pType || "" //产品类型
} }
}, },
{ {
headers: { headers: {
token: "3260d5a2452441dd93ecc7ecb35f6dc0", token: "3260d5a2452441dd93ecc7ecb35f6dc0",
userpin: "39fcf7bc5f6c4e55a1f85d750e37316b" userpin: "7c00bdd9dde04c59a50a0a45788b9a59"
} }
} }
) )
.then(res => { .then(res => {
console.log(res);
console.log(res.data.data); console.log(res.data.data);
if (res.data.status == 0) { if (res.data.status == 0) {
let dataList = []; let dataList = [];
...@@ -608,12 +613,12 @@ export default { ...@@ -608,12 +613,12 @@ export default {
res.data.data.map((item, index) => { res.data.data.map((item, index) => {
dataItem.solutionNo = item.solutionNo || "---"; dataItem.solutionNo = item.solutionNo || "---";
dataItem.orderNo = item.orderNo || "---"; dataItem.orderNo = item.orderNo || "---";
dataItem.needNo = item.needNo || "---";
dataItem.status = item.status || "---"; dataItem.status = item.status || "---";
dataItem.statusName = item.statusName || "---"; dataItem.statusName = item.statusName || "---";
dataItem.regPark = dataItem.regPark = item.solutionContent.solution.park || "---";
item.solutionContent.solution.regPark || "---";
dataItem.regType = dataItem.regType =
item.solutionContent.solution.regType || "---"; item.solutionContent.solution.registerType || "---";
dataItem.productType = dataItem.productType =
item.solutionContent.solution.productType || "---"; item.solutionContent.solution.productType || "---";
dataList.push(dataItem); dataList.push(dataItem);
...@@ -632,7 +637,14 @@ export default { ...@@ -632,7 +637,14 @@ export default {
}, },
watch: {}, watch: {},
created() { created() {
// console.log(JSON.parse(this.$route.query.data)); if (process.env.NODE_ENV == "development") {
//开发环境
this.baseURL = "/api/web/action/icapi/springBoard";
} else if (process.env.NODE_ENV == "production") {
//生产环境
this.baseURL = "/web/action/icapi/springBoard";
}
console.log(JSON.parse(this.$route.query.data));
}, },
mounted() { mounted() {
this.getListData(); this.getListData();
......
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