Skip to content

Z
zhichan
Commit 32eb52aa by 刘泽奇
Options

123

parent 9ad04140
Showing with 25 additions and 26 deletions
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<!-- 修改弹窗 --> <!-- 修改弹窗 -->
<div class="jdindentdetail-diag"> <div class="jdindentdetail-diag">
<el-dialog :title="headerInfo" width="62.5%" :visible.sync="dialogTableVisible" center > <el-dialog :title="headerInfo" width="62.5%" :visible.sync="dialogTableVisible" center>
<div v-show="headerInfo==\'商标信息\'"> <div v-show="headerInfo==\'商标信息\'">
<el-form v-show="step==1" ref="form" :rules="rules" :model="form" class="demo-ruleForm" <el-form v-show="step==1" ref="form" :rules="rules" :model="form" class="demo-ruleForm"
label-width="120px"> label-width="120px">
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
<el-tree class="gsb_tree" class="selftmreg_filter-tree" :data="ncldata" <el-tree class="gsb_tree" class="selftmreg_filter-tree" :data="ncldata"
:props="defaultProps" node-key="name" default-expand-all show-checkbox accordion :props="defaultProps" node-key="name" default-expand-all show-checkbox accordion
@check-change="handleCheckChange" @node-click="nodeClick" @check-change="handleCheckChange" @node-click="nodeClick"
:filter-node-method="filterNode" ref="tree" > :filter-node-method="filterNode" ref="tree">
</el-tree> </el-tree>
</div> </div>
</el-aside> </el-aside>
...@@ -357,7 +357,6 @@ ...@@ -357,7 +357,6 @@
<span style="font-size:16px"><b>{{nclone.code}} {{nclone.name}}</b></span> <span style="font-size:16px"><b>{{nclone.code}} {{nclone.name}}</b></span>
<span style="font-size:16px;float:right"><b>已选择<span <span style="font-size:16px;float:right"><b>已选择<span
style="color:#0F8EE9;">{{nclone.nclThree.length}}</span>项</b> style="color:#0F8EE9;">{{nclone.nclThree.length}}</span>项</b>
<span style="color:#FF2E22;">￥{{nclone.price}}</span> <span style="color:#FF2E22;">￥{{nclone.price}}</span>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<span @click="removeNclOne(index,nclone)" style="cursor: pointer;"><i <span @click="removeNclOne(index,nclone)" style="cursor: pointer;"><i
...@@ -569,8 +568,8 @@ ...@@ -569,8 +568,8 @@
<div class="selftmregType" v-model="editApply.customerType" <div class="selftmregType" v-model="editApply.customerType"
:style="editApply.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'" :style="editApply.customerType==\'ent\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
@click="editApply.customerType = \'ent\'">企业<img v-if="editApply.customerType==\'ent\'" @click="editApply.customerType = \'ent\'">企业<img
src="/imgs/sjd.png" alt=""></div> v-if="editApply.customerType==\'ent\'" src="/imgs/sjd.png" alt=""></div>
<div class="selftmregType" v-model="editApply.customerType" <div class="selftmregType" v-model="editApply.customerType"
:style="editApply.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'" :style="editApply.customerType==\'person\' ? \'border: 1px solid #409EFF;color: #409EFF;\' : \'\'"
@click="editApply.customerType = \'person\'">个体户<img @click="editApply.customerType = \'person\'">个体户<img
...@@ -646,9 +645,9 @@ ...@@ -646,9 +645,9 @@
@mouseleave="mouseLeaveDemo(1,\'a\')"> @mouseleave="mouseLeaveDemo(1,\'a\')">
<img class="upload-applyimg" v-if="editApply.businessLicensePic" <img class="upload-applyimg" v-if="editApply.businessLicensePic"
:src="editApply.businessLicensePic?editApply.businessLicensePic:\'/imgs/sbzc/yyzzD.png\'" /> :src="editApply.businessLicensePic?editApply.businessLicensePic:\'/imgs/sbzc/yyzzD.png\'" />
<gsb-upload v-else flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" <gsb-upload v-else flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action"
:action="action" filetype="image/jpeg" :ifshowlist="false" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@uploadsuccess="uploadsuccess" @error="error"> @error="error">
<div class="upload-button" @click="loadingKey = 0"> <div class="upload-button" @click="loadingKey = 0">
<div><i class="el-icon-circle-plus-outline"></i></div> <div><i class="el-icon-circle-plus-outline"></i></div>
<div>(需盖公章)</div> <div>(需盖公章)</div>
...@@ -657,15 +656,14 @@ ...@@ -657,15 +656,14 @@
<div class="upload-dialog" <div class="upload-dialog"
v-show="editApply.businessLicensePic && toViewImgKey == \'a\'"> v-show="editApply.businessLicensePic && toViewImgKey == \'a\'">
<div @click="window.open(editApply.businessLicensePic)">查看大图</div> <div @click="window.open(editApply.businessLicensePic)">查看大图</div>
<gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" <gsb-upload flag="yyzz" ref="yyzz" :d="d" @setKey="setKey" :action="action"
:action="action" filetype="image/jpeg" :ifshowlist="false" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@uploadsuccess="uploadsuccess" @error="error"> @error="error">
<div @click="loadingKey = 0">重新上传</div> <div @click="loadingKey = 0">重新上传</div>
</gsb-upload> </gsb-upload>
</div> </div>
</div> </div>
<div class="upload-img" @mouseover="mouseOverDemo(1)" <div class="upload-img" @mouseover="mouseOverDemo(1)" @mouseleave="mouseLeaveDemo(1)">
@mouseleave="mouseLeaveDemo(1)">
<img <img
:src="editApply.customerType == \'ent\' ? \'/imgs/sbzc/yyzz1.png\' : \'imgs/sbzc/yyzz.png\'" /> :src="editApply.customerType == \'ent\' ? \'/imgs/sbzc/yyzz1.png\' : \'imgs/sbzc/yyzz.png\'" />
<div v-if="toViewImgKey == 1" class="toViewImg" <div v-if="toViewImgKey == 1" class="toViewImg"
...@@ -681,26 +679,24 @@ ...@@ -681,26 +679,24 @@
<img @click="window.open(editApply.identityCardPic)" class="upload-applyimg" <img @click="window.open(editApply.identityCardPic)" class="upload-applyimg"
v-if="editApply.identityCardPic" v-if="editApply.identityCardPic"
:src="editApply.identityCardPic?editApply.identityCardPic:\'/imgs/sbzc/pdf.png\'" /> :src="editApply.identityCardPic?editApply.identityCardPic:\'/imgs/sbzc/pdf.png\'" />
<gsb-upload v-else flag="sfz" ref="sfz" :d="d" @setKey="setKey" <gsb-upload v-else flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action"
:action="action" filetype="image/jpeg" :ifshowlist="false" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@uploadsuccess="uploadsuccess" @error="error"> @error="error">
<div class="upload-button" @click="loadingKey = 1"> <div class="upload-button" @click="loadingKey = 1">
<div><i class="el-icon-circle-plus-outline"></i></div> <div><i class="el-icon-circle-plus-outline"></i></div>
<div>(需盖公章)</div> <div>(需盖公章)</div>
</div> </div>
</gsb-upload> </gsb-upload>
<div class="upload-dialog" <div class="upload-dialog" v-show="applyInfo.identityCardPic && toViewImgKey == \'d\'">
v-show="applyInfo.identityCardPic && toViewImgKey == \'d\'">
<div @click="window.open(applyInfo.identityCardPic)">查看大图</div> <div @click="window.open(applyInfo.identityCardPic)">查看大图</div>
<gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" <gsb-upload flag="sfz" ref="sfz" :d="d" @setKey="setKey" :action="action"
:action="action" filetype="image/jpeg" :ifshowlist="false" filetype="image/jpeg" :ifshowlist="false" @uploadsuccess="uploadsuccess"
@uploadsuccess="uploadsuccess" @error="error"> @error="error">
<div @click="loadingKey = 1">重新上传</div> <div @click="loadingKey = 1">重新上传</div>
</gsb-upload> </gsb-upload>
</div> </div>
</div> </div>
<div class="upload-img" @mouseover="mouseOverDemo(4)" <div class="upload-img" @mouseover="mouseOverDemo(4)" @mouseleave="mouseLeaveDemo(4)">
@mouseleave="mouseLeaveDemo(4)">
<img src="/imgs/sbzc/sfz.png" /> <img src="/imgs/sbzc/sfz.png" />
<div v-if="toViewImgKey == 4" class="toViewImg" <div v-if="toViewImgKey == 4" class="toViewImg"
@click="toViewImg(\'/imgs/sbzc/sfzD.png\')">查看大图</div> @click="toViewImg(\'/imgs/sbzc/sfzD.png\')">查看大图</div>
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -415,7 +415,7 @@ ...@@ -415,7 +415,7 @@
}); });
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", nclObj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", nclObj).then((d) => {
loadingC = 0; loadingC = 0;
console.log(d, `nclObj`); console.log(d.data, `nclObj`);
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
this.nclInfo = d.data; this.nclInfo = d.data;
/* /*
...@@ -423,6 +423,7 @@ ...@@ -423,6 +423,7 @@
*/ */
this.nclInfo.map((item, index) => { this.nclInfo.map((item, index) => {
item.nclSmallCodes = JSON.parse(item.nclSmallCodes); item.nclSmallCodes = JSON.parse(item.nclSmallCodes);
console.log(item,item.nclSmallCodes,"////////////////////////////////");
}); });
this.ncl = JSON.parse(JSON.stringify(this.nclInfo)); this.ncl = JSON.parse(JSON.stringify(this.nclInfo));
} }
...@@ -439,6 +440,7 @@ ...@@ -439,6 +440,7 @@
showDialog(from, index){ showDialog(from, index){
this.popupValue = from; this.popupValue = from;
this.nclIndex = index; this.nclIndex = index;
console.log(this.nclIndex);
this.dialogTableVisible = true; this.dialogTableVisible = true;
switch (from) { switch (from) {
case 1: case 1:
...@@ -1325,7 +1327,7 @@ ...@@ -1325,7 +1327,7 @@
this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode; this.editNcl.tbCode = this.nclInfo[this.nclIndex].tbCode;
this.editNcl.nclOneCodes = this.nclOne[0].code; this.editNcl.nclOneCodes = this.nclOne[0].code;
this.editNcl.nclSmallCodes = this.nclOne[0].nclThree; this.editNcl.nclSmallCodes = this.nclOne[0].nclThree;
console.log(this.nclInfo, this.nclOne, `xxxxxxxxxxxxxxxxxxxxxxxx`); console.log(this.nclInfo, this.nclOne,this.editNcl, `xxxxxxxxxxxxxxxxxxxxxxxx`);
var obj = this.$root.copyParams(this.editNcl, "updateNclInfo", "/action/tmOrder/springBoard", "yes", "yes"); var obj = this.$root.copyParams(this.editNcl, "updateNclInfo", "/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) {
...@@ -1336,7 +1338,8 @@ ...@@ -1336,7 +1338,8 @@
message: '修改成功!' message: '修改成功!'
}); });
this.$root.loading = false; this.$root.loading = false;
this.$router.go(0); /** this.$router.go(0);*/
} else { } else {
this.$message(res.msg); this.$message(res.msg);
} }
......
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