Commit 9ad7f0dd by 刘泽奇

123

parent d8ee895f
...@@ -502,9 +502,9 @@ ...@@ -502,9 +502,9 @@
<div class="upload-box" v-loading="loading2" <div class="upload-box" v-loading="loading2"
@mouseover="mouseOverDemo(2,\'b\')" @mouseover="mouseOverDemo(2,\'b\')"
@mouseleave="mouseLeaveDemo(2,\'b\')"> @mouseleave="mouseLeaveDemo(2,\'b\')">
<img @click="window.open(editApply.gzwtsUrl)" <img @click="window.open(editDeliveryInfo.gzwtsUrl)"
class="upload-applyimg" v-if="editApply.gzwtsUrl" class="upload-applyimg" v-if="editDeliveryInfo.gzwtsUrl"
:src="editApply.gzwtsUrl" /> :src="editDeliveryInfo.gzwtsUrl" />
<gsb-upload v-else flag="wts" ref="wts" :d="d" @setKey="setKey" <gsb-upload v-else flag="wts" ref="wts" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
...@@ -514,8 +514,8 @@ ...@@ -514,8 +514,8 @@
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" <div class="upload-dialog"
v-show="editApply.gzwtsUrl && toViewImgKey == \'b\'"> v-show="editDeliveryInfo.gzwtsUrl && toViewImgKey == \'b\'">
<div @click="window.open(editApply.gzwtsUrl)">查看大图</div> <div @click="window.open(editDeliveryInfo.gzwtsUrl)">查看大图</div>
<gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey" <gsb-upload flag="wts" ref="wts" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
...@@ -541,9 +541,9 @@ ...@@ -541,9 +541,9 @@
<div class="upload-box" v-loading="loading3" <div class="upload-box" v-loading="loading3"
@mouseover="mouseOverDemo(3,\'c\')" @mouseover="mouseOverDemo(3,\'c\')"
@mouseleave="mouseLeaveDemo(3,\'c\')"> @mouseleave="mouseLeaveDemo(3,\'c\')">
<img @click="window.open(editApply.smwjUrl)" <img @click="window.open(editDeliveryInfo.smwjUrl)"
class="upload-applyimg" v-if="editApply.smwjUrl" class="upload-applyimg" v-if="editDeliveryInfo.smwjUrl"
:src="editApply.smwjUrl" /> :src="editDeliveryInfo.smwjUrl" />
<gsb-upload v-else flag="yxq" ref="yxq" :d="d" @setKey="setKey" <gsb-upload v-else flag="yxq" ref="yxq" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
...@@ -553,8 +553,8 @@ ...@@ -553,8 +553,8 @@
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" <div class="upload-dialog"
v-show="editApply.smwjUrl && toViewImgKey == \'c\'"> v-show="editDeliveryInfo.smwjUrl && toViewImgKey == \'c\'">
<div @click="window.open(editApply.smwjUrl)">查看大图</div> <div @click="window.open(editDeliveryInfo.smwjUrl)">查看大图</div>
<gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey" <gsb-upload flag="yxq" ref="yxq" :d="d" @setKey="setKey"
:action="action" filetype="image/jpeg" :ifshowlist="false" :action="action" filetype="image/jpeg" :ifshowlist="false"
@uploadsuccess="uploadsuccess" @error="error"> @uploadsuccess="uploadsuccess" @error="error">
......
...@@ -478,6 +478,7 @@ ...@@ -478,6 +478,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");
} }
}).then(() => { }).then(() => {
if (loadingA == 0 && loadingB == 0 && loadingC == 0) { if (loadingA == 0 && loadingB == 0 && loadingC == 0) {
...@@ -763,7 +764,8 @@ ...@@ -763,7 +764,8 @@
that.loading3 = false; that.loading3 = false;
that.loading = false; that.loading = false;
if (d.status == 0) { if (d.status == 0) {
that.editApply.gzwtsUrl = obj.result; that.editDeliveryInfo.gzwtsUrl = obj.result;
return; return;
} else { } else {
that.$refs[obj.flag][0].result = ""; that.$refs[obj.flag][0].result = "";
...@@ -783,8 +785,7 @@ ...@@ -783,8 +785,7 @@
} }
if (obj.flag == "yxq") { if (obj.flag == "yxq") {
console.log(obj); console.log(obj);
that.editApply.smwjUrl = obj.result; that.editDeliveryInfo.smwjUrl = obj.result;
that.editDeliveryInfo = JSON.parse(JSON.stringify(that.deliveryInfo));
console.log(that.editDeliveryInfo, `mmmmmmmmmmmmmmmmmmmmmmmmmmmmm`); console.log(that.editDeliveryInfo, `mmmmmmmmmmmmmmmmmmmmmmmmmmmmm`);
/**that.apply["smwjUrl"] = obj.result; */ /**that.apply["smwjUrl"] = obj.result; */
setTimeout(() => { setTimeout(() => {
...@@ -1460,7 +1461,9 @@ ...@@ -1460,7 +1461,9 @@
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); console.log(this.editApply,this.deliveryOrderNo,`mmmmmmmmmmmmmmmmmmmmmm`);
this.editApply.gzwtsUrl = this.editDeliveryInfo.gzwtsUrl;
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");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
if (res.status == 0) { if (res.status == 0) {
......
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