提交 e94f2df0 编写于 作者: 张敬贤's avatar 张敬贤

Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !87
...@@ -447,7 +447,7 @@ export default { ...@@ -447,7 +447,7 @@ export default {
font-size: 14px; font-size: 14px;
background: #f9fafb; background: #f9fafb;
border-radius: 11px; border-radius: 11px;
padding: 5px 15px; padding: 12px 15px;
margin-bottom: 14px; margin-bottom: 14px;
.tip-org { .tip-org {
color: #ff720c; color: #ff720c;
......
...@@ -159,6 +159,10 @@ export default { ...@@ -159,6 +159,10 @@ export default {
checkStatus(res) { checkStatus(res) {
this.yunOrderNo = res.data.yunOrderNo; this.yunOrderNo = res.data.yunOrderNo;
this.query.yunOrderNo = res.data.yunOrderNo; this.query.yunOrderNo = res.data.yunOrderNo;
this.projectEquityNo = res.data.projectEquityNo;
this.externalOrderNo = res.data.externalOrderNo;
this.query.projectEquityNo = this.projectEquityNo;
this.query.externalOrderNo = this.externalOrderNo;
this.status = res.data.statusCode; this.status = res.data.statusCode;
this.getDetectionName(this.yunOrderNo); this.getDetectionName(this.yunOrderNo);
...@@ -180,6 +184,7 @@ export default { ...@@ -180,6 +184,7 @@ export default {
break; break;
case '0201': case '0201':
this.query.needDetect = 1; this.query.needDetect = 1;
console.log('this.query.needDetect', this.query);
this.turnToPage(this.routerMap[this.status], this.query); this.turnToPage(this.routerMap[this.status], this.query);
break; break;
case '0302': case '0302':
......
...@@ -128,7 +128,8 @@ export default { ...@@ -128,7 +128,8 @@ export default {
// 去预约 // 去预约
toAppoint() { toAppoint() {
if (this.buttonStatus) { if (this.buttonStatus) {
const {projectEquityNo, externalOrderNo, yunOrderNo} = this.query; const { projectEquityNo, externalOrderNo, yunOrderNo } = this.query;
console.log('this.query', this.query);
this.$router.push({ this.$router.push({
path: '/appoint', path: '/appoint',
query: {projectEquityNo, externalOrderNo, yunOrderNo}, query: {projectEquityNo, externalOrderNo, yunOrderNo},
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册