Skip to content

Z
zhichan
Commit e0a2a009 by 刘泽奇
Options

123

parent 9121d8bc
Showing with 44 additions and 164 deletions
igirl-channel-web/app/front/entry/public/css/pagecom.css
This source diff could not be displayed because it is too large. You can view the blob instead.
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.css
...@@ -474,8 +474,4 @@ ...@@ -474,8 +474,4 @@
.jdindentdetail-diag .el-dialog__header { .jdindentdetail-diag .el-dialog__header {
border-bottom: 1px solid #E8E8E8; border-bottom: 1px solid #E8E8E8;
padding: 0;
font-size: 24px;
height: 92px;
line-height: 92px;
} }
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html
...@@ -571,16 +571,17 @@ ...@@ -571,16 +571,17 @@
<div style="clear:both;"></div> <div style="clear:both;"></div>
<el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="公司名称" <el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="公司名称"
style="width:493px;float:left;padding-right:50px;" prop="name"> style="width:493px;float:left;padding-right:50px;" prop="name">
<gsb-selectentjd v-if="currentUser" allowcreate="true" showhistory="true" <gsb-selectentjd v-if="currentUser" allowcreate="true" showhistory="false"
@historychange="historyapplierchange" @change="applierChange" size="medium" @change="applierChange" size="medium" v-model="apply.name"
v-model="apply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true" refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true"
isFilter="true" refModel="tool" labelField="entName" valueField="entName" refModel="tool" labelField="entName" valueField="entName"
style="position:relative;width:100%;" placeHolder="请输入选择公司名称"></gsb-selectentjd> style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd>
<gsb-selectentjd v-if="!currentUser" frombrowser="true" allowcreate="true" <gsb-selectentjd v-if="!currentUser" frombrowser="true" allowcreate="true"
showhistory="true" @historychange="historyapplierchange" @change="applierChange" showhistory="false" @change="applierChange" size="medium" v-model="apply.name"
size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName" refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true"
autoComplete="true" isFilter="true" refModel="tool" labelField="entName" refModel="tool" labelField="entName" valueField="entName"
valueField="entName" style="position:relative;width:100%;" placeHolder="请输入选择公司名称"> style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
</gsb-selectentjd> </gsb-selectentjd>
</el-form-item> </el-form-item>
<el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名" <el-form-item v-if="apply.customerType==\'person\'" label-width="140px" label="姓名"
......
igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -562,6 +562,7 @@ ...@@ -562,6 +562,7 @@
}); });
} }
if (obj.flag == "colorizedPicUrl") { if (obj.flag == "colorizedPicUrl") {
this.$root.getReq("/web/toolCtl/adjustTMSize", { "key": obj.key }).then(function (d) { this.$root.getReq("/web/toolCtl/adjustTMSize", { "key": obj.key }).then(function (d) {
that.loading1 = false; that.loading1 = false;
that.loading2 = false; that.loading2 = false;
...@@ -587,9 +588,10 @@ ...@@ -587,9 +588,10 @@
} }
if (obj.flag == "yyzz") { if (obj.flag == "yyzz") {
var word2pic = { word: this.form.name }; console.log(obj, "oooooooooooooooooooooooooooooooo");
var word2pic = this.$root.copyParams(word2pic, "pic2pdf", "/action/tmTools/springBoard"); var pic2pdf = { "key": obj.result };
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", word2pic).then(function (d) { var pic2pdf = this.$root.copyParams(pic2pdf, "pic2pdf", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", pic2pdf).then(function (d) {
that.loading1 = false; that.loading1 = false;
that.loading2 = false; that.loading2 = false;
that.loading3 = false; that.loading3 = false;
...@@ -613,9 +615,9 @@ ...@@ -613,9 +615,9 @@
}) })
} }
if (obj.flag == "sfz") { if (obj.flag == "sfz") {
var word2pic = { word: this.form.name }; var sfz = { "key": obj.result };
var word2pic = this.$root.copyParams(word2pic, "pic2pdf", "/action/tmTools/springBoard"); var sfz = this.$root.copyParams(sfz, "pic2pdf", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", word2pic).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", sfz).then(function (d) {
that.loading1 = false; that.loading1 = false;
that.loading2 = false; that.loading2 = false;
that.loading3 = false; that.loading3 = false;
...@@ -639,7 +641,7 @@ ...@@ -639,7 +641,7 @@
}) })
} }
if (obj.flag == "wts") { if (obj.flag == "wts") {
var adjustWTSSize = { "key": obj.key }; var adjustWTSSize = { "key": obj.result };
var adjustWTSSize = this.$root.copyParams(adjustWTSSize, "adjustWTSSize", "/action/tmTools/springBoard"); var adjustWTSSize = this.$root.copyParams(adjustWTSSize, "adjustWTSSize", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", adjustWTSSize).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", adjustWTSSize).then(function (d) {
that.loading1 = false; that.loading1 = false;
...@@ -950,7 +952,7 @@ ...@@ -950,7 +952,7 @@
} }
var that = this; var that = this;
this.loading = true; this.loading = true;
var word2pic = { word: this.form.name }; var word2pic = { "key": this.form.name };
var word2pic = this.$root.copyParams(word2pic, "word2pic", "/action/tmTools/springBoard"); var word2pic = this.$root.copyParams(word2pic, "word2pic", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", word2pic).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", word2pic).then(function (d) {
if (d.status == 0) { if (d.status == 0) {
...@@ -1099,31 +1101,18 @@ ...@@ -1099,31 +1101,18 @@
this.apply.identityCardPic = ""; this.apply.identityCardPic = "";
} }
}, },
applierChange(){ applierChange(v){
var getEntregistryByCompanyName = { companyName: this.apply.name }; obj = { companyName: this.apply.name };
var getEntregistryByCompanyName = this.$root.copyParams(getEntregistryByCompanyName, "getEntregistryByCompanyName", "/action/tmTools/springBoard"); var obj = this.$root.copyParams(obj, "getEntregistryByCompanyName", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", getEntregistryByCompanyName).then(d => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => {
if (d.creditCode && d.creditCode != "") { console.log(d, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
this.apply.applyAddr = d.businessAddress; if (d.creditCode && d.creditCode != "") {
this.apply.code = d.creditCode; this.apply.applyAddr = d.businessAddress;
} this.apply.code = d.creditCode;
}); }
this.findOneByCustomerName();
},
findOneByCustomerName(){
var that = this;
this.$root.getReq("/web/trademark/tmqueryCtl/findOneByCustomerName", { name: this.apply.name }).then(d => {
if (d && d.code == 1 && d.data) {
if (d.data.businessLicensePic) {
this.apply.businessLicensePic = d.data.businessLicensePic;
}
if (d.data.identityCardPic) {
this.apply.identityCardPic = d.data.identityCardPic;
}
}
}); });
}, },
setKey(name, flag){ setKey(name, flag){
name = name.substring(name.length - 5); name = name.substring(name.length - 5);
var myDate = new Date(); var myDate = new Date();
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
style="position: fixed;width:100%;z-index:999;background-color:black;top:0;left:0;right:0;bottom: 0;opacity: 0.5;"> style="position: fixed;width:100%;z-index:999;background-color:black;top:0;left:0;right:0;bottom: 0;opacity: 0.5;">
</div> </div>
<div style="position:fixed;height:400px;top:20%;left:20%;right:25%;z-index: 9999;background-color:white;"> <div style="position:fixed;height:400px;top:20%;left:20%;right:25%;z-index: 9999;background-color:white;">
<div style="width:80%;margin:0 auto;box-sizing: border-box;"> <div style="width:80%;margin:0 auto;box-sizing: border-box;padding-top: 20px;">
<h4 style="text-align:left;margin-left:2%;">上传资料</h4> <h4 style="text-align:left;margin-left:2%;margin-bottom: 10px;">上传资料</h4>
<div style="padding:20px 0;text-align: center"> <div style="padding:20px 0;text-align: center">
<el-form ref="stuff" :model="stuff" class="demo-ruleForm" label-width="0"> <el-form ref="stuff" :model="stuff" class="demo-ruleForm" label-width="0">
<el-form-item style="float:left;width:25%;text-align:center" label=""> <el-form-item style="float:left;width:25%;text-align:center" label="">
......
igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -312,6 +312,7 @@ ...@@ -312,6 +312,7 @@
}, },
uploadsuccess(obj){ uploadsuccess(obj){
var that = this; var that = this;
console.log(obj, `xxxxxxxxxxxxxxxxxxxxxxxx`);
if (this.loadingKey == 1) { if (this.loadingKey == 1) {
that.loading1 = true; that.loading1 = true;
} else if (this.loadingKey == 2) { } else if (this.loadingKey == 2) {
...@@ -323,7 +324,10 @@ ...@@ -323,7 +324,10 @@
} }
if (obj.flag == "yyzz") { if (obj.flag == "yyzz") {
this.$root.getReq("/web/toolCtl/pic2pdf", { "key": obj.key }).then(function (d) { console.log(this.form);
var pic2pdf = { "key": obj.result };
var pic2pdf = this.$root.copyParams(pic2pdf, "pic2pdf", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", pic2pdf).then(function (d) {
that.loading1 = false; that.loading1 = false;
that.loading2 = false; that.loading2 = false;
that.loading3 = false; that.loading3 = false;
...@@ -347,8 +351,9 @@ ...@@ -347,8 +351,9 @@
}) })
} }
if (obj.flag == "sfz") { if (obj.flag == "sfz") {
var sfz = { word: this.form.name };
this.$root.getReq("/web/toolCtl/pic2pdf", { "key": obj.key }).then(function (d) { var sfz = this.$root.copyParams(sfz, "pic2pdf", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", sfz).then(function (d) {
that.loading1 = false; that.loading1 = false;
that.loading2 = false; that.loading2 = false;
that.loading3 = false; that.loading3 = false;
...@@ -371,7 +376,9 @@ ...@@ -371,7 +376,9 @@
}) })
} }
if (obj.flag == "wts") { if (obj.flag == "wts") {
this.$root.getReq("/web/toolCtl/adjustWTSSize", { "key": obj.key }).then(function (d) { var adjustWTSSize = { "key": obj.result };
var adjustWTSSize = this.$root.copyParams(adjustWTSSize, "adjustWTSSize", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", adjustWTSSize).then(function (d) {
that.loading1 = false; that.loading1 = false;
that.loading2 = false; that.loading2 = false;
that.loading3 = false; that.loading3 = false;
...@@ -404,119 +411,6 @@ ...@@ -404,119 +411,6 @@
that.stuff.descUrl = obj.result that.stuff.descUrl = obj.result
} }
}, },
setKey(name, flag){
name = name.substring(name.length - 5);
var myDate = new Date();
var key = "zc_" + flag + Math.round(Math.random() * 10000) + myDate.getTime() + myDate.getFullYear() + myDate.getMonth() + myDate.getDate() + ".jpg";
this.$refs[flag].d.key = key;
},
btnvisbleMethod(row, btn){
if (btn.key == "invoiceapply") {
if (row.orderPayStatus == "yfk" && row.invoiceApplyStatus == "1" && row.isIinvoice == 1) {
return true;
} else {
return false;
}
}
if (btn.key == "mydetail") {
if (row.sveItemCode == "zzsbzc" || row.sveItemCode == "dlrfzzc" || row.sveItemCode == "dbsbzc") {
return true;
} else {
return false;
}
}
if (btn.key == "myicpdetail") {
if (row.sveItemCode == "CP201910231025EaQM0b") {
return true;
} else {
return false;
}
}
if (btn.key == "myedit") {
if (row.orderPayStatus == "ddqx" || row.orderPayStatus == "tkclz" || row.orderPayStatus == "ytk") {
return false;
} else if (row.sveItemCode == "dlrfzzc" && (row.orderStatus == "1" || row.orderStatus == "2" || row.orderStatus == "3" || row.orderStatus == "4" || row.orderStatus == "6")) {
return true;
} else if (row.sveItemCode == "zzsbzc" && (row.orderStatus == "1" || row.orderStatus == "2" || row.orderStatus == "3" || row.orderStatus == "4" || row.orderStatus == "6")) {
return true;
} else if (row.sveItemCode == "dbsbzc" && (row.orderStatus == "1" || row.orderStatus == "2" || row.orderStatus == "3" || row.orderStatus == "4" || row.orderStatus == "6")) {
return true;
} else {
return false;
}
}
if (btn.key == "ptsjedit") {
if (row.orderSource == "ptsj" && row.orderPayStatus == "dfk" && this.currentUser && row.createuser_id == this.currentUser.id) {
return true;
} else {
return false;
}
}
if (btn.key == "topay") {
if (row.orderPayStatus == "dfk") {
return true;
} else {
return false;
}
}
if (btn.key == "cancelorder") {
if ((row.sveItemCode == "dlrfzzc" || row.sveItemCode == "zzsbzc" || row.sveItemCode == "dbsbzc") && row.orderPayStatus == "dfk") {
return true;
} else {
return false;
}
}
if (btn.key == "uploadstuff") {
if (row.orderPayStatus == "ddqx" || row.orderPayStatus == "tkclz" || row.orderPayStatus == "ytk") {
return false;
} else if ((row.sveItemCode == "dlrfzzc" || row.sveItemCode == "zzsbzc" || row.sveItemCode == "dbsbzc") && (row.orderStatus == "1" || row.orderStatus == "2" || row.orderStatus == "3" || row.orderStatus == "4" || row.orderStatus == "6")) {
return true;
} else {
return false;
}
}
if (btn.key == "mydelete") {
if (row.orderPayStatus == "dfk" && row.createuser_id == this.currentUser.id) {
return true;
} else {
return false;
}
}
return true;
},
onColFormater(row, column, cellvalue, index){
if (column.property == "created_at") {
var date = new Date(row["created_at"]);
var time = date.toLocaleDateString();
return time;
}
if (column.property == "customerinfo.name") {
if (!row.customerinfo) {
return "---";
} else {
return row.customerinfo.name;
}
}
if (column.property == "name") {
if (!row["name"]) {
return "---";
} else {
return row.name;
}
}
if (column.property == "nclOneCodesNum") {
if (!row["nclOneCodesNum"]) {
return "---";
} else {
return row.nclOneCodesNum;
}
}
return cellvalue;
},
error(err){ error(err){
this.$message.warning(`上传失败，请重新上传`); this.$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