Skip to content

Z
zhichan
Commit fa43148b by 刘泽奇
Options

123

parent b4a8314a
Showing with 18 additions and 21 deletions
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<el-input v-model="name" placeholder="请输入内容"></el-input> <el-input v-model="name" placeholder="请输入内容"></el-input>
</div> </div>
<div><span>交付状态：</span> <div><span>交付状态：</span>
<el-select v-model="deliveryStatusName" placeholder="请选择"> <el-select v-model="deliveryStatus" placeholder="请选择">
<el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label" <el-option v-for="item in DeliveryStatus" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
inputDate: null, inputDate: null,
startTime: null, startTime: null,
entTime: null, entTime: null,
deliveryStatusName: null, deliveryStatus: null,
/**$ */ /**$ */
CreateDate: null, CreateDate: null,
tableData: [], tableData: [],
...@@ -274,9 +274,9 @@ ...@@ -274,9 +274,9 @@
/* /*
console.log(index, row); console.log(index, row);
*/ */
if ((row.deliveryStatus == "dsccl")) { if ((row.deliveryStatus == "dsccl")) {
if(this.showReg(index,row)){ if (this.showReg(index, row)) {
return false return false
} }
return true; return true;
...@@ -293,14 +293,14 @@ ...@@ -293,14 +293,14 @@
}, },
showDetails(idx, row){ showDetails(idx, row){
if (row.deliveryStatus != "dqrfa") { if (row.deliveryStatus != "dqrfa") {
if(this.showReg(idx,row)){ if (this.showReg(idx, row)) {
return false return false
} }
return true; return true;
} else { } else {
return false; return false;
} }
}, },
showReg(idx, row){ showReg(idx, row){
if (row.itemCode == 'zzsbzc') { if (row.itemCode == 'zzsbzc') {
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
channelOrderNo:row.channelServiceNo, channelOrderNo: row.channelServiceNo,
} }
}); });
window.scrollTo(0, 0); window.scrollTo(0, 0);
...@@ -342,16 +342,17 @@ ...@@ -342,16 +342,17 @@
console.log(d.data); console.log(d.data);
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
this.tableData = d.data; this.tableData = d.data;
this.countPage = d.data.length; /* 没有分页参数 需要重新改*/
this.countPage = 10 || d.data.length;
d.data.map((item, index) => { d.data.map((item, index) => {
if(item.submitTime){ if (item.submitTime) {
item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false }); item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
}else{ } else {
item.submitTime = '--'; item.submitTime = '--';
} }
if(item.CreateDate){ if (item.CreateDate) {
item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false }); item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false });
}else{ } else {
item.CreateDate = '--'; item.CreateDate = '--';
} }
}); });
...@@ -370,7 +371,7 @@ ...@@ -370,7 +371,7 @@
this.tmName = null; this.tmName = null;
this.CreateDate = null; this.CreateDate = null;
console.log(this.CreateDate); console.log(this.CreateDate);
this.deliveryStatusName = null; this.deliveryStatus = null;
}, },
find(){ find(){
this.indentInfo.channelServiceNo = this.channelServiceNo; this.indentInfo.channelServiceNo = this.channelServiceNo;
...@@ -379,7 +380,7 @@ ...@@ -379,7 +380,7 @@
this.indentInfo.itemName = this.itemName; this.indentInfo.itemName = this.itemName;
this.indentInfo.tmName = this.tmName; this.indentInfo.tmName = this.tmName;
this.indentInfo.CreateDate = this.CreateDate; this.indentInfo.CreateDate = this.CreateDate;
this.indentInfo.deliveryStatusName = this.deliveryStatusName; this.indentInfo.deliveryStatus = this.deliveryStatus;
this.indentInfo.startTime = this.startTime || ""; this.indentInfo.startTime = this.startTime || "";
this.indentInfo.entTime = this.entTime || ""; this.indentInfo.entTime = this.entTime || "";
this.handleSizeChange(); this.handleSizeChange();
...@@ -410,7 +411,7 @@ ...@@ -410,7 +411,7 @@
} }
if (obj.flag == "yyzz") { if (obj.flag == "yyzz") {
console.log(obj.result,"..........................."); console.log(obj.result, "...........................");
this.stuff.businessLicensePic = obj.result; this.stuff.businessLicensePic = obj.result;
var pic2pdf = { "key": obj.result }; var pic2pdf = { "key": obj.result };
var pic2pdf = this.$root.copyParams(pic2pdf, "pic2pdf", "/action/tmTools/springBoard"); var pic2pdf = this.$root.copyParams(pic2pdf, "pic2pdf", "/action/tmTools/springBoard");
...@@ -518,10 +519,6 @@ ...@@ -518,10 +519,6 @@
this.stuff.businessLicensePic = row.businessLicensePic; this.stuff.businessLicensePic = row.businessLicensePic;
this.stuff.identityCardPic = row.identityCardPic; this.stuff.identityCardPic = row.identityCardPic;
this.stuff.smwjUrl = row.smwjUrl; this.stuff.smwjUrl = row.smwjUrl;
}, },
uploadStuffs(){ uploadStuffs(){
console.log(this.stuff); console.log(this.stuff);
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="listPath">交付中心 <el-breadcrumb-item :to="listPath">交付中心
</el-breadcrumb-item> </el-breadcrumb-item>
<el-breadcrumb-item>自主注册</el-breadcrumb-item> <el-breadcrumb-item>自助注册</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<div style="background-color:white;width:1200px;margin:0 auto;padding:20px 0;padding-bottom: 90px; "> <div style="background-color:white;width:1200px;margin:0 auto;padding:20px 0;padding-bottom: 90px; ">
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
<div class="floatBox-right"> <div class="floatBox-right">
<!-- <img src="/imgs/mobileamilapply/wenhao.png" alt=""> --> <!-- <img src="/imgs/mobileamilapply/wenhao.png" alt=""> -->
<i class="el-icon-question" @mouseover="mouseOverDemo(99)" @mouseleave="mouseLeaveDemo(99)"></i> <i class="el-icon-question" @mouseover="mouseOverDemo(99)" @mouseleave="mouseLeaveDemo(99)"></i>
<div id="floatBox-demo" v-show="floatBoxDemo">由于官方商标注册增加“统一社会信用代码”的填写，企业申请必填，个体工商户申请可不填此项，请仔细核对营业执照填写。 <div id="floatBox-demo" v-show="floatBoxDemo">由于官方商标注册增加“统一社会信用代码”的填写，企业和个体户申请必填，请仔细核对营业执照填写。
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
......
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