Commit 2e15fcb8 by 刘泽奇

213

parent 0bbdd0a2
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</div> </div>
</div> </div>
<div class="box btn"> <div class="box btn">
<el-button>查询</el-button> <el-button @click="find">查询</el-button>
<el-button @click="addCompany">新增</el-button> <el-button @click="addCompany">新增</el-button>
</div> </div>
</div> </div>
...@@ -90,19 +90,20 @@ ...@@ -90,19 +90,20 @@
<div class="ndata"> <div class="ndata">
<img src="@/assets/imgs/fqembed/datanull.png" alt /> <img src="@/assets/imgs/fqembed/datanull.png" alt />
</div> </div>
<div>很抱歉!暂时没有查询到您搜索到内容~</div>
</div> </div>
<el-table-column fixed prop="date" label="方案编号" width></el-table-column> <el-table-column fixed prop="solutionNo" label="方案编号" width="188"></el-table-column>
<el-table-column prop="name" label="服务单号" width></el-table-column> <el-table-column prop="orderNo" label="服务单号" width="188"></el-table-column>
<el-table-column prop="province" label="公司名称" width></el-table-column> <el-table-column prop="entName" label="公司名称" width></el-table-column>
<el-table-column prop="city" label="组织类型" width></el-table-column> <el-table-column prop="organizationType" label="组织类型" width></el-table-column>
<el-table-column prop="address" label="公司性质" width></el-table-column> <el-table-column prop="entNature" label="公司性质" width></el-table-column>
<el-table-column prop="zip" label="纳税人类型" width></el-table-column> <el-table-column prop="taxpayerType" label="纳税人类型" width></el-table-column>
<el-table-column prop="zip" label="注册城市" width></el-table-column> <el-table-column prop="city" label="注册城市" width></el-table-column>
<el-table-column prop="zip" label="方案状态"> <el-table-column prop="statusName" label="方案状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="payment"> <div class="payment">
<div :class="dotColor(1)"></div> <div :class="dotColor(1)"></div>
<div>{{scope.row.date}}</div> <div>{{scope.row.statusName}}</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -123,13 +124,12 @@ ...@@ -123,13 +124,12 @@
</div> </div>
<div class="block"> <div class="block">
<el-pagination <el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage2" :current-page.sync="currentPage2"
:page-size="100" :page-size="20"
background background
layout="prev, pager, next, jumper" layout="prev, pager, next, jumper"
:total="1000" :total="dataCount"
></el-pagination> ></el-pagination>
</div> </div>
</el-tab-pane> </el-tab-pane>
...@@ -211,27 +211,28 @@ ...@@ -211,27 +211,28 @@
</div> </div>
</div> </div>
<div class="box btn"> <div class="box btn">
<el-button>查询</el-button> <el-button @click="find">查询</el-button>
<el-button @click="addCloudCompany">新增</el-button> <el-button @click="addCloudCompany">新增</el-button>
</div> </div>
</div> </div>
<div class="companylist"> <div class="companylist">
<el-table :data="companyData" style="width: 100%"> <el-table :data="cloudData" style="width: 100%">
<div slot="empty"> <div slot="empty">
<div class="ndata"> <div class="ndata">
<img src="@/assets/imgs/fqembed/datanull.png" alt /> <img src="@/assets/imgs/fqembed/datanull.png" alt />
</div> </div>
<div>很抱歉!暂时没有查询到您搜索到内容~</div>
</div> </div>
<el-table-column fixed prop="date" label="方案编号" width></el-table-column> <el-table-column fixed prop="solutionNo" label="方案编号" width></el-table-column>
<el-table-column prop="name" label="服务单号" width></el-table-column> <el-table-column prop="orderNo" label="服务单号" width></el-table-column>
<el-table-column prop="province" label="注册园区" width></el-table-column> <el-table-column prop="regPark" label="注册园区" width></el-table-column>
<el-table-column prop="city" label="产品类型" width></el-table-column> <el-table-column prop="productType" label="产品类型" width></el-table-column>
<el-table-column prop="address" label="注册类型" width></el-table-column> <el-table-column prop="regType" label="注册类型" width></el-table-column>
<el-table-column prop="zip" label="方案状态" width> <el-table-column prop="statusName" label="方案状态" width>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="payment"> <div class="payment">
<div :class="dotColor(1)"></div> <div :class="dotColor(2)"></div>
<div>{{scope.row.date}}</div> <div>{{scope.row.statusName}}</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -252,13 +253,12 @@ ...@@ -252,13 +253,12 @@
</div> </div>
<div class="block"> <div class="block">
<el-pagination <el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage2" :current-page.sync="currentPage2"
:page-size="100" :page-size="20"
background background
layout="prev, pager, next, jumper" layout="prev, pager, next, jumper"
:total="1000" :total="dataCount"
></el-pagination> ></el-pagination>
</div> </div>
</el-tab-pane> </el-tab-pane>
...@@ -349,24 +349,24 @@ export default { ...@@ -349,24 +349,24 @@ export default {
scheme: "", scheme: "",
schemeOptions: [ schemeOptions: [
{ {
value: "待确认", value: "ytj",
label: "待确认" label: "已提交"
}, },
{ {
value: "已完成", value: "yfk",
label: "已完成" label: "已付款"
}, },
{ {
value: "已作废", value: "yzf",
label: "已作废" label: "已作废"
} },
],
companyData: [
{ {
date: 123 value: "ytk",
label: "已退款"
} }
], ],
// 云******************* companyData: [],
// 云 *******************
regParkOptions: [], regParkOptions: [],
regPark: "", regPark: "",
cSchemeNo: "", cSchemeNo: "",
...@@ -375,22 +375,29 @@ export default { ...@@ -375,22 +375,29 @@ export default {
cScheme: "", cScheme: "",
cSchemeOptions: [ cSchemeOptions: [
{ {
value: "待确认", value: "ytj",
label: "待确认" label: "已提交"
}, },
{ {
value: "已完成", value: "yfk",
label: "已完成" label: "已付款"
}, },
{ {
value: "已作废", value: "yzf",
label: "已作废" label: "已作废"
},
{
value: "ytk",
label: "已退款"
} }
], ],
pType: "", pType: "",
pTypeOptions: [], pTypeOptions: [],
currentPage1: 1, currentPage1: 1,
currentPage2: 1 currentPage2: 1,
cloudData: [],
dataCount:1,
// 获取详情数据
}; };
}, },
methods: { methods: {
...@@ -413,6 +420,7 @@ export default { ...@@ -413,6 +420,7 @@ export default {
this.haveChoosedTab = 2; this.haveChoosedTab = 2;
console.log("云上公司注册"); console.log("云上公司注册");
} }
this.getListData();
}, },
deleteRow(idx, row) { deleteRow(idx, row) {
console.log(idx, row); console.log(idx, row);
...@@ -430,6 +438,9 @@ export default { ...@@ -430,6 +438,9 @@ export default {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.currentPage1 = val;
this.currentPage2 = val;
this.getListData();
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
}, },
dotColor(status) { dotColor(status) {
...@@ -444,56 +455,132 @@ export default { ...@@ -444,56 +455,132 @@ export default {
return `cancellation`; return `cancellation`;
break; break;
} }
} },
}, getListData() {
created() { let baseURL = "";
let baseURL = ""; if (process.env.NODE_ENV == "development") {
if (process.env.NODE_ENV == "development") { //开发环境
//开发环境 baseURL = "/api/web/action/icapi/springBoard";
baseURL = "/api/web/action/icapi/springBoard"; } else if (process.env.NODE_ENV == "production") {
} else if (process.env.NODE_ENV == "production") { //生产环境
//生产环境 baseURL = "/web/action/icapi/springBoard";
baseURL = "/web/action/icapi/springBoard"; }
} if (this.activeName == "1") {
req
.post(
baseURL,
{
actionType: "getProgrammeListByUser",
actionBody: {
pageIndex: this.currentPage1,
pageSize: "20",
needNo: "",
solutionNo: this.schemeNo || "",
bizType: "companyreg",
orderNo: this.serviceNo || "",
status: this.scheme || "",
entName: this.entName || "",
city: this.city,
taxpayerType: this.taxpayer || "",
organizationType: this.tissue || ""
}
},
{
headers: {
token: "3260d5a2452441dd93ecc7ecb35f6dc0",
userpin: "39fcf7bc5f6c4e55a1f85d750e37316b"
}
}
)
.then(res => {
console.log(res.data.data);
if (res.data.status == 0) {
let dataList = [];
let dataItem = {};
res.data.data.map((item, index) => {
dataItem.solutionNo = item.solutionNo || "---";
dataItem.orderNo = item.orderNo || "---";
dataItem.status = item.status || "---";
dataItem.statusName = item.statusName || "---";
dataItem.entName =
item.solutionContent.solution.entName || "---";
dataItem.organizationType =
item.solutionContent.solution.organizationType || "---";
dataItem.entNature =
item.solutionContent.solution.entNature || "---";
dataItem.taxpayerType =
item.solutionContent.solution.taxpayerType || "---";
dataItem.city = item.solutionContent.solution.province || "---";
dataList.push(dataItem);
dataItem = {};
});
this.companyData = dataList;
this.dataCount = res.data.dataCount;
console.log(res.data,'!!!!!!!!!!!!!!!!!!!')
req console.log(this.companyData);
.post( }
baseURL, });
{ } else if (this.activeName == "2") {
actionType: "getProgrammeInfoByNeedNo", req
actionBody: { .post(
needNo: "N202002141324bupnr8L", baseURL,
solutionContent: { {
bizType: "companyreg", actionType: "getProgrammeListByUser",
notes: "方案备注", actionBody: {
solution: { pageIndex: this.currentPage2,
//公司注册方案 pageSize: "20",
entName: "公司名称", needNo: "",
province: "省", solutionNo: this.cSchemeNo || "", //方案编号
city: "市", entName: this.cEntName || "",
taxpayerType: "纳税人类型", bizType: "companyreg_cloud",
entNature: "公司性质", orderNo: this.cServiceNo || "", //服务单号
organizationType: "组织类型", status: this.cScheme || "", //方案状态
industry: "行业", regPark: this.regPark || "", //注册园区
businessScope: "经营范围", regType: this.pType || "" //产品类型
//云上公司注册方案 }
regPark: "注册园区", },
regType: "注册类型", {
productType: "产品类型" headers: {
token: "3260d5a2452441dd93ecc7ecb35f6dc0",
userpin: "39fcf7bc5f6c4e55a1f85d750e37316b"
} }
} }
} )
}, .then(res => {
{ console.log(res.data.data);
headers: { if (res.data.status == 0) {
token: "3260d5a2452441dd93ecc7ecb35f6dc0", let dataList = [];
userpin: "39fcf7bc5f6c4e55a1f85d750e37316b" let dataItem = {};
} res.data.data.map((item, index) => {
} dataItem.solutionNo = item.solutionNo || "---";
) dataItem.orderNo = item.orderNo || "---";
.then(res => { dataItem.status = item.status || "---";
console.log(res); dataItem.statusName = item.statusName || "---";
}); dataItem.regPark =
item.solutionContent.solution.regPark || "---";
dataItem.regType =
item.solutionContent.solution.regType || "---";
dataItem.productType =
item.solutionContent.solution.productType || "---";
dataList.push(dataItem);
dataItem = {};
});
this.cloudData = dataList;
this.dataCount = res.data.dataCount;
console.log(this.cloudData);
}
});
}
},
find() {
this.getListData();
}
},
watch: {},
created() {},
mounted() {
this.getListData();
} }
}; };
</script> </script>
...@@ -506,6 +593,9 @@ export default { ...@@ -506,6 +593,9 @@ export default {
width: 612px; width: 612px;
height: 398px; height: 398px;
margin: 24px auto 0; margin: 24px auto 0;
+ div {
margin: 0 auto;
}
> img { > img {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -598,6 +688,7 @@ export default { ...@@ -598,6 +688,7 @@ export default {
} }
} }
.block { .block {
margin-top: 30px;
text-align: center; text-align: center;
} }
.payment { .payment {
...@@ -610,7 +701,23 @@ export default { ...@@ -610,7 +701,23 @@ export default {
height: 6px; height: 6px;
background: rgba(255, 189, 46, 1); background: rgba(255, 189, 46, 1);
border-radius: 6px; border-radius: 6px;
transform: translate(-1px, 1px); transform: translate(-4px, 1px);
}
.done {
display: block;
width: 6px;
height: 6px;
background: #28ca42;
border-radius: 6px;
transform: translate(-4px, 1px);
}
.cancellation {
display: block;
width: 6px;
height: 6px;
background: #000000;
border-radius: 6px;
transform: translate(-4px, 1px);
} }
} }
} }
......
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