Skip to content

Z
zhichan
Commit b676568b by 刘泽奇
Options

123

parent f2412f60
Showing with 58 additions and 24 deletions
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -330,6 +330,7 @@ ...@@ -330,6 +330,7 @@
query: { query: {
channelUserId: this.$root.channelUserId, channelUserId: this.$root.channelUserId,
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
channelOrderNo:row.channelServiceNo,
} }
}); });
window.scrollTo(0, 0); window.scrollTo(0, 0);
......
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html
...@@ -240,7 +240,8 @@ ...@@ -240,7 +240,8 @@
</el-form> </el-form>
<!-- page2 --> <!-- page2 -->
<el-form v-show="step==2" ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm" label-width="120px"> <el-form v-show="step==2" ref="apply" :rules="applyrules" :model="apply" class="demo-ruleForm"
label-width="120px">
<div class="selftmreg_main selfmreg-step2"> <div class="selftmreg_main selfmreg-step2">
<div class="selftmreg_shu"></div> <div class="selftmreg_shu"></div>
<h4 style="color:#535353"><i class="selftmreg_shuxian"></i>填写申请人信息</h4> <h4 style="color:#535353"><i class="selftmreg_shuxian"></i>填写申请人信息</h4>
...@@ -778,5 +779,11 @@ ...@@ -778,5 +779,11 @@
{{message.info}} {{message.info}}
</div> </div>
</transition> </transition>
<el-dialog title="提示" :visible.sync="showConfrim" width="30%" style="z-Index:9999;">
<span v-if="showConfrim">{{nclOne[0].code}}类{{nclOne[0].name}}，商品/服务项目<span style="color:red;">不足10项</span>，已选{{nclSelected}}项，还可选{{10-nclSelected}}个小项</span>
<span slot="footer" class="dialog-footer">
<el-button @click="closeConfrim()">取 消</el-button>
<el-button type="primary" @click="submitForm(\'form\',true)">确 定</el-button>
</span>
</el-dialog>
</div> </div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -292,6 +292,9 @@ ...@@ -292,6 +292,9 @@
info: "", info: "",
show: false, show: false,
}, },
showConfrim: false,
agree: false,
nclSelected: null,
} }
}, },
computed: Vuex.mapState({ computed: Vuex.mapState({
...@@ -344,7 +347,6 @@ ...@@ -344,7 +347,6 @@
this.$refs.tree.setChecked(newVal[1], false); this.$refs.tree.setChecked(newVal[1], false);
this.$refs.tree.setChecked(newVal[1].nclThree[0], false); this.$refs.tree.setChecked(newVal[1].nclThree[0], false);
newVal.pop(); newVal.pop();
this.message.show = !this.message.show; this.message.show = !this.message.show;
this.message.info = "只能选择同一个类别"; this.message.info = "只能选择同一个类别";
var timer = setTimeout(() => { var timer = setTimeout(() => {
...@@ -357,7 +359,6 @@ ...@@ -357,7 +359,6 @@
this.$refs.tree.setChecked(newVal[0].nclThree[10], false); this.$refs.tree.setChecked(newVal[0].nclThree[10], false);
newVal[0].nclThree.pop(); newVal[0].nclThree.pop();
console.log(newVal, newVal[0].nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`); console.log(newVal, newVal[0].nclThree, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
this.message.show = !this.message.show; this.message.show = !this.message.show;
this.message.info = "最多只能选择10项"; this.message.info = "最多只能选择10项";
var timer2 = setTimeout(() => { var timer2 = setTimeout(() => {
...@@ -1106,22 +1107,35 @@ ...@@ -1106,22 +1107,35 @@
selfclear(){ selfclear(){
this.nclOne = []; this.nclOne = [];
}, },
submitForm(formName) { closeConfrim(){
this.agree = false;
this.showConfrim = false;
},
submitForm(formName, agree) {
var that = this; var that = this;
console.log(formName, ";;;;;;;;;;;;;"); if (agree) {
if (formName == "form") { this.agree = agree;
this.showConfrim = false;
if (!this.form.name || !this.form.colorizedPicUrl) {
this.$message("请完善信息");
this.agree = false;
return;
}
}
console.log(formName, ";;;;;;;;;;;;;", this.agree);
if (this.agree == false) {
if (this.nclOne.length > 0) { if (this.nclOne.length > 0) {
if (this.nclOne[0].nclThree.length < 10) { if (this.nclOne[0].nclThree.length < 10) {
this.message.show = !this.message.show; this.nclSelected = this.nclOne[0].nclThree.length;
this.message.info = "小类必须选择10项"; this.showConfrim = true;
var timer3 = setTimeout(() => {
this.message.show = false;
clearTimeout(timer3);
}, 2000);
return; return;
} }
} }
}; };
if (!this.form.name || !this.form.colorizedPicUrl) {
this.$message.warning("请完善信息");
return false;
}
if (formName == "form" || formName == "apply") { if (formName == "form" || formName == "apply") {
if (formName == "apply") { if (formName == "apply") {
console.log(this.apply); console.log(this.apply);
...@@ -1132,10 +1146,11 @@ ...@@ -1132,10 +1146,11 @@
} }
}; };
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
console.log(valid);
if (valid) { if (valid) {
if (formName == "form") {
}
if (formName == "form" && that.nclOne.length < 1) { if (formName == "form" && that.nclOne.length < 1) {
that.$message.warning(`请选择商标分类`); that.$message.warning(`请选择商标分类`);
return false; return false;
...@@ -1152,15 +1167,7 @@ ...@@ -1152,15 +1167,7 @@
if (formName == "order") { if (formName == "order") {
this.form.name = this.form.tmFormType == 5 ? this.form.name + '及图' : this.form.name; this.form.name = this.form.tmFormType == 5 ? this.form.name + '及图' : this.form.name;
this.savehistory(); this.savehistory();
var obj = {
tm: this.form,
apply: this.apply,
nclones: this.nclOne,
itemCode: this.itemCode,
channelParams: this.channelParams,
channelOrder: this.channelOrder,
channelUser: this.channelUser,
};
/* /*
if (!this.currentUser) { if (!this.currentUser) {
obj["step"] = this.step; obj["step"] = this.step;
...@@ -1176,6 +1183,22 @@ ...@@ -1176,6 +1183,22 @@
return false; return false;
} }
*/ */
console.log(this.$route.query.channelServiceNo, ">>>>>>>>>>>>>>>>>>>>>>>");
var channelOrderNo = this.$root.copyParams({ channelOrderNo: this.$route.query.channelOrderNo }, "get1688ChannelOrderInfo", "/action/tmOrder/springBoard", "yes", "yes");
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", channelOrderNo).then((d) => {
obj.channelOrderNo = d.channelOrderNo;
obj.channelUser = d.channelUser;
}).then(() => {
var obj = {
tm: that.form,
apply: that.apply,
nclones: that.nclOne,
itemCode: that.itemCode,
channelParams: that.channelParams,
channelOrder: that.channelOrder,
channelUser: that.channelUser,
};
var obj = this.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes"); var obj = this.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes");
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) { that.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d); console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d);
...@@ -1201,6 +1224,8 @@ ...@@ -1201,6 +1224,8 @@
that.$message.warning("操作失败"); that.$message.warning("操作失败");
}); });
})
} }
......
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