Commit c9d032d6 by 刘泽奇

123

parent fa43148b
...@@ -463,7 +463,9 @@ ...@@ -463,7 +463,9 @@
console.log(this.form, "lllllllllllllllllllllllllllllll"); console.log(this.form, "lllllllllllllllllllllllllllllll");
this.orderFlow = d.data.orderFlow; this.orderFlow = d.data.orderFlow;
this.orderFlow.map((item, index) => { this.orderFlow.map((item, index) => {
item.createDate = new Date(item.createDate).toLocaleString('chinese', { hour12: false }); if (item.createDate) {
item.createDate = new Date(item.createDate).toLocaleString('chinese', { hour12: false });
}
}) })
} }
}).then(() => { }).then(() => {
...@@ -478,7 +480,7 @@ ...@@ -478,7 +480,7 @@
this.applyInfo = d.data; this.applyInfo = d.data;
this.apply = JSON.parse(JSON.stringify(this.applyInfo)); this.apply = JSON.parse(JSON.stringify(this.applyInfo));
this.editApply = JSON.parse(JSON.stringify(this.apply)); this.editApply = JSON.parse(JSON.stringify(this.apply));
console.log(this.editApply,"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); console.log(this.editApply, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
} }
}).then(() => { }).then(() => {
if (loadingA == 0 && loadingB == 0 && loadingC == 0) { if (loadingA == 0 && loadingB == 0 && loadingC == 0) {
...@@ -765,7 +767,7 @@ ...@@ -765,7 +767,7 @@
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.editDeliveryInfo.gzwtsUrl = obj.result; that.editDeliveryInfo.gzwtsUrl = obj.result;
return; return;
} else { } else {
that.$refs[obj.flag][0].result = ""; that.$refs[obj.flag][0].result = "";
...@@ -1374,7 +1376,7 @@ ...@@ -1374,7 +1376,7 @@
submitEdit(v, agree){ submitEdit(v, agree){
console.log(v); console.log(v);
this.$nextTick(() => { this.$nextTick(() => {
if (v != "商标类别" && v != "交官文件" ) { if (v != "商标类别" && v != "交官文件") {
this.$refs[this.popupValue].validate(valid => { this.$refs[this.popupValue].validate(valid => {
if (valid) { if (valid) {
console.log(valid); console.log(valid);
...@@ -1461,7 +1463,7 @@ ...@@ -1461,7 +1463,7 @@
if (v == "交官文件") { if (v == "交官文件") {
this.$root.loading = true; this.$root.loading = true;
this.editApply.deliveryOrderNo = this.deliveryOrderNo; this.editApply.deliveryOrderNo = this.deliveryOrderNo;
console.log(this.editApply,this.deliveryOrderNo,`mmmmmmmmmmmmmmmmmmmmmm`); console.log(this.editApply, this.deliveryOrderNo, `mmmmmmmmmmmmmmmmmmmmmm`);
this.editApply.gzwtsUrl = this.editDeliveryInfo.gzwtsUrl; this.editApply.gzwtsUrl = this.editDeliveryInfo.gzwtsUrl;
this.editApply.smwjUrl = this.editDeliveryInfo.smwjUrl; this.editApply.smwjUrl = this.editDeliveryInfo.smwjUrl;
var obj = this.$root.copyParams(this.editApply, "updateOfficial", "/action/tmOrder/springBoard", "yes", "yes"); var obj = this.$root.copyParams(this.editApply, "updateOfficial", "/action/tmOrder/springBoard", "yes", "yes");
......
...@@ -123,11 +123,11 @@ ...@@ -123,11 +123,11 @@
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block"> style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400; <span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737; color:#373737;
line-height:20px;display: block;text-align: center">企业营业执照 </span> line-height:20px;display: block;text-align: center">企业营业执照</span>
</div> </div>
<div v-if="applyInfo.identityCardPic" <div v-if="deliveryInfo.gzwtsUrl"
style="position: relative;display:inline-block;padding-left:10px;cursor: pointer;margin-right: 50px"> style="position: relative;display:inline-block;padding-left:10px;cursor: pointer;margin-right: 50px">
<img @click="window.open(applyInfo.identityCardPic)" v-if="applyInfo.identityCardPic" <img @click="window.open(deliveryInfo.gzwtsUrl)" v-if="deliveryInfo.gzwtsUrl"
src="/imgs/sbzc/wtsD.png" src="/imgs/sbzc/wtsD.png"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block"> style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400; <span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
...@@ -138,9 +138,9 @@ ...@@ -138,9 +138,9 @@
</span> </span>
</div> </div>
<div v-if="applyInfo.sealAuthorizeStuff" <div v-if="deliveryInfo.smwjUrl"
style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px;"> style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px;">
<img :src="applyInfo.sealAuthorizeStuff" <img :src="deliveryInfo.smwjUrl"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block"> style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400; <span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737; color:#373737;
...@@ -148,9 +148,9 @@ ...@@ -148,9 +148,9 @@
style="color: rgb(15, 142, 233);" class="el-icon-question "></i></span> style="color: rgb(15, 142, 233);" class="el-icon-question "></i></span>
</div> </div>
<div v-if="applyInfo.descUrl" <div v-if="applyInfo.identityCardPic"
style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px"> style="display:inline-block;padding-left:10px;cursor: pointer;margin-right:50px">
<img :src="applyInfo.descUrl" <img :src="applyInfo.identityCardPic"
style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block"> style="margin-bottom:10px;height:112px;width:81px;border: 2px dashed rgb(233, 233, 233);display: block">
<span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400; <span style="font-size:14px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;
color:#373737; color:#373737;
......
...@@ -207,7 +207,9 @@ ...@@ -207,7 +207,9 @@
this.deliveryInfo = d.data.tm; this.deliveryInfo = d.data.tm;
this.orderFlow = d.data.orderFlow; this.orderFlow = d.data.orderFlow;
this.orderFlow.map((item, index) => { this.orderFlow.map((item, index) => {
item.createDate = new Date(item.createDate).toLocaleString('chinese', { hour12: false }); if(item.createDate){
item.createDate = new Date(item.createDate).toLocaleString('chinese', { hour12: false });
}
}) })
} }
}).then(() => { }).then(() => {
......
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