Commit 33a12c07 authored by chaiwei's avatar chaiwei

修改优化后提交

parent a66e0558
Pipeline #5830 canceled with stages
...@@ -92,6 +92,7 @@ export default { ...@@ -92,6 +92,7 @@ export default {
this.offsize = 1; this.offsize = 1;
this.pagesize = 10; this.pagesize = 10;
this.index = [1, 0, 0]; this.index = [1, 0, 0];
// window.localStorage.openId = "1234567"
if (window.localStorage.openId) { if (window.localStorage.openId) {
this.getUserInfo(window.localStorage.openId); this.getUserInfo(window.localStorage.openId);
} }
...@@ -120,6 +121,7 @@ export default { ...@@ -120,6 +121,7 @@ export default {
"/sign/info/hclc/query/by/openid?openId=" + "/sign/info/hclc/query/by/openid?openId=" +
openId; openId;
vm.hlsPopup.showLoading("请稍等"); vm.hlsPopup.showLoading("请稍等");
// vm.getData(); // vm.getData();
vm.$post(url).then(function(res) { vm.$post(url).then(function(res) {
vm.hlsPopup.hideLoading(); vm.hlsPopup.hideLoading();
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<p style="margin-top:3px">{{item.file_sign_name}}</p> <p style="margin-top:3px">{{item.file_sign_name}}</p>
</div> </div>
<button <button
style="float:right;margin-top:5px;background-color:#09bb07;color:#ffffff;width:50px;border-radius:3px" style="float:right;margin-top:5px;background-color:#09bb07;color:#ffffff;width:70px;border-radius:3px"
@click="downloadContract(item.attachment_id)" @click="downloadContract(item.attachment_id)"
>下载</button> >下载</button>
</div> </div>
...@@ -51,6 +51,16 @@ export default { ...@@ -51,6 +51,16 @@ export default {
mounted() { mounted() {
// this._initLoad() // this._initLoad()
}, },
activated(){
this.wxConfig();
if (this.$route.params.itemData) {
window.localStorage.SignDownloadData = JSON.stringify(
this.$route.params.itemData.sign_file_list
);
}
// console.log(JSON.parse(window.localStorage.unSignData));
this.data = JSON.parse(window.localStorage.SignDownloadData);
},
methods: { methods: {
// createSign() { // createSign() {
// let url = "http://sign.hitachics.com/core/r/api/app/fileViewSvc?attachment_id=13435&apiName=download&sysName=HCL_UPLOAD_FILE&access_token="+window.localStorage.access_token_rl // let url = "http://sign.hitachics.com/core/r/api/app/fileViewSvc?attachment_id=13435&apiName=download&sysName=HCL_UPLOAD_FILE&access_token="+window.localStorage.access_token_rl
......
...@@ -62,11 +62,11 @@ ...@@ -62,11 +62,11 @@
<list-item :item-height="80" v-if="myIndex == 1"> <list-item :item-height="80" v-if="myIndex == 1">
<!-- <div :key="index" :proportion="[5,1]" :show-arrow="true"> --> <!-- <div :key="index" :proportion="[5,1]" :show-arrow="true"> -->
<item style="margin-top:10px" v-for="(item,index) in signData" :key="index"> <item style="margin-top:10px" v-for="(item,index) in signData" :key="index">
<img <!-- <img
slot="left-icon" slot="left-icon"
src="../../../assets/electronicContract/contract-icon.png" src="../../../assets/electronicContract/contract-icon.png"
class="left-icon" class="left-icon"
/> /> -->
<div slot="name" class="text" style="width: 70%;font-size: 12px;"> <div slot="name" class="text" style="width: 70%;font-size: 12px;">
<div <div
class="cont-type" class="cont-type"
......
...@@ -32,26 +32,36 @@ export default { ...@@ -32,26 +32,36 @@ export default {
}, },
components: {}, components: {},
created() { created() {
this.wxConfig(); if(this.$route.params.itemData){
if(this.$route.params.itemData){ // console.log('33333333333',this.$route.params.itemData.un_sign_file_list)
window.localStorage.unSignData = JSON.stringify(this.$route.params.itemData.un_sign_file_list); window.localStorage.unSignData = JSON.stringify(this.$route.params.itemData.un_sign_file_list);
} }
// console.log(JSON.parse(window.localStorage.unSignData));
this.data = JSON.parse(window.localStorage.unSignData); this.data = JSON.parse(window.localStorage.unSignData);
console.log("22222222222", this.data); this.wxConfig();
this.offsize = 1; this.offsize = 1;
this.pagesize = 10; this.pagesize = 10;
this.index = [1, 0, 0]; this.index = [1, 0, 0];
}, },
mounted() { mounted() {
// this._initLoad() // this._initLoad()
},
activated(){
if(this.$route.params.itemData){
// console.log('33333333333',this.$route.params.itemData.un_sign_file_list)
window.localStorage.unSignData = JSON.stringify(this.$route.params.itemData.un_sign_file_list);
}
this.data = JSON.parse(window.localStorage.unSignData);
}, },
methods: { methods: {
createSign() { createSign() {
let goUrl = this.data[0].sign_url let goUrl = this.data[0].sign_url
if (goUrl) { if (goUrl) {
// //
this.hlsPopup.showLoading("请稍等"); // this.hlsPopup.showLoading("请稍等");
window.open(goUrl, "_self"); window.open(goUrl, "_self");
// let url = window.open('http://www.baidu.com','_self'); // let url = window.open('http://www.baidu.com','_self');
...@@ -66,43 +76,43 @@ export default { ...@@ -66,43 +76,43 @@ export default {
// 打开模态框 // 打开模态框
}, },
load_count: function() { // load_count: function() {
let vm = this; // let vm = this;
let url = process.env.basePath + "contract_count"; // let url = process.env.basePath + "contract_count";
let param = {}; // let param = {};
// hlsPopup.showLoadingWithoutBackdrop(); // // hlsPopup.showLoadingWithoutBackdrop();
vm.$post(url, param).then(function(res) { // vm.$post(url, param).then(function(res) {
vm.info = res; // vm.info = res;
vm.changeData(); // vm.changeData();
}); // });
}, // },
loadMore: function() { // loadMore: function() {
let vm = this; // let vm = this;
vm.offsize = vm.offsize + 1; // vm.offsize = vm.offsize + 1;
let url = process.env.basePath + "app_get_contract_selected"; // let url = process.env.basePath + "app_get_contract_selected";
let param = { // let param = {
offsize: vm.offsize, // offsize: vm.offsize,
searchInput: vm.searchCondition.input // searchInput: vm.searchCondition.input
}; // };
vm.$post(url, param).then(function(res) { // vm.$post(url, param).then(function(res) {
let returnData = []; // let returnData = [];
returnData = res.getContract_list; // returnData = res.getContract_list;
if (returnData.length === 0) { // if (returnData.length === 0) {
vm.$refs.scroll.update(true); // vm.$refs.scroll.update(true);
} else if (returnData.length > 0 && returnData.length < vm.pagesize) { // } else if (returnData.length > 0 && returnData.length < vm.pagesize) {
vum.forEach(returnData, function(data, index, array) { // vum.forEach(returnData, function(data, index, array) {
vm.con_list.push(array[index]); // vm.con_list.push(array[index]);
}); // });
vm.$refs.scroll.update(true); // vm.$refs.scroll.update(true);
} else if (returnData.length === vm.pagesize) { // } else if (returnData.length === vm.pagesize) {
vum.forEach(returnData, function(data, index, array) { // vum.forEach(returnData, function(data, index, array) {
vm.con_list.push(array[index]); // vm.con_list.push(array[index]);
}); // });
vm.$refs.scroll.update(false); // vm.$refs.scroll.update(false);
} // }
}); // });
}, // },
// goContractMainten: function (list) { // goContractMainten: function (list) {
// this.$router.push({ // this.$router.push({
// name: 'ContractSign', // name: 'ContractSign',
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<h-view class="public-style companyRegister" title="企业用户注册"> <h-view class="public-style companyRegister" title="企业用户注册">
<h-content v-if="status != '成功'"> <h-content v-if="status != '成功'">
<list-item class="reg-content"> <list-item class="reg-content">
<div class="repre-type" v-if="faceAuthStatus != 'SUCCESS'"> <!-- <div class="repre-type" v-if="faceAuthStatus != 'SUCCESS'">
<input type="radio" name="agent" v-model="agentType" @change="isAgent" value="Y" /> <input type="radio" name="agent" v-model="agentType" @change="isAgent" value="Y" />
代理店 代理店
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
@change="isAgent" @change="isAgent"
value="N" value="N"
/>非代理店 />非代理店
</div> </div>-->
<div class="repre-type" v-if="faceAuthStatus == 'SUCCESS'"> <!-- <div class="repre-type" v-if="faceAuthStatus == 'SUCCESS'">
代理店 代理店
<input type="radio" name="agent" v-model="agentType" @change="isAgent" value="Y" disabled/> <input type="radio" name="agent" v-model="agentType" @change="isAgent" value="Y" disabled/>
非代理店 非代理店
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
value="N" value="N"
disabled disabled
/> />
</div> </div>-->
<div class="repre-type" v-if="faceAuthStatus != 'SUCCESS' && agentType == 'Y'"> <div class="repre-type" v-if="faceAuthStatus != 'SUCCESS'">
<span>经办人类型:</span> <span>经办人类型:</span>
<input <input
type="radio" type="radio"
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
value="法定代表人" value="法定代表人"
/>法定代表人 />法定代表人
</div> </div>
<div class="repre-type" v-if="faceAuthStatus == 'SUCCESS' && agentType == 'Y'"> <div class="repre-type" v-if="faceAuthStatus == 'SUCCESS'">
<span>经办人类型:</span> <span>经办人类型:</span>
<input <input
type="radio" type="radio"
...@@ -260,25 +260,7 @@ ...@@ -260,25 +260,7 @@
<input type="text" class="edit" v-model="jbName" readonly /> <input type="text" class="edit" v-model="jbName" readonly />
</div> </div>
</div> </div>
<div class="info_list">
<div class="list_left" style="width:30%;">
<img
src="../../../assets/userRegister/phone.png"
alt
style="width:16px;height:16px;margin-right:5px;"
/>
手机号码:
</div>
<div class="list_right" style="width:70%;">
<input
type="text"
class="edit"
v-model="jbPhoneNumber"
@blur="goTop()"
placeholder="请输入手机号码"
/>
</div>
</div>
<div class="info_list" v-if="faceAuthStatus =='SUCCESS'"> <div class="info_list" v-if="faceAuthStatus =='SUCCESS'">
<div class="list_left" style="width:41%;"> <div class="list_left" style="width:41%;">
<img <img
...@@ -305,6 +287,25 @@ ...@@ -305,6 +287,25 @@
<input type="text" class="edit" v-model="jbIdNumber" readonly /> <input type="text" class="edit" v-model="jbIdNumber" readonly />
</div> </div>
</div> </div>
<div class="info_list">
<div class="list_left" style="width:30%;">
<img
src="../../../assets/userRegister/phone.png"
alt
style="width:16px;height:16px;margin-right:5px;"
/>
手机号码:
</div>
<div class="list_right" style="width:70%;">
<input
type="text"
class="edit"
v-model="jbPhoneNumber"
@blur="goTop()"
placeholder="请输入手机号码"
/>
</div>
</div>
<div style="margin: 10px 0 0 14px;color:#636363"> <div style="margin: 10px 0 0 14px;color:#636363">
<p>请上传身份证照片</p> <p>请上传身份证照片</p>
</div> </div>
...@@ -425,7 +426,7 @@ ...@@ -425,7 +426,7 @@
</h-content> </h-content>
<h-content v-if="status == '成功'"> <h-content v-if="status == '成功'">
<list-item class="reg-content"> <list-item class="reg-content">
<div class="repre-type"> <!-- <div class="repre-type">
<input <input
type="radio" type="radio"
name="agent" name="agent"
...@@ -443,8 +444,8 @@ ...@@ -443,8 +444,8 @@
value="N" value="N"
disabled disabled
/>非代理店 />非代理店
</div> </div>-->
<div class="repre-type" v-if="agentType == 'Y'"> <div class="repre-type">
<span>经办人类型:</span> <span>经办人类型:</span>
<input <input
type="radio" type="radio"
...@@ -586,31 +587,31 @@ ...@@ -586,31 +587,31 @@
<input type="text" class="edit" v-model="jbName" readonly /> <input type="text" class="edit" v-model="jbName" readonly />
</div> </div>
</div> </div>
<div class="info_list"> <div class="info_list">
<div class="list_left" style="width:30%;"> <div class="list_left" style="width:48%;">
<img <img
src="../../../assets/userRegister/phone.png" src="../../../assets/userRegister/idCard.png"
alt alt
style="width:16px;height:16px;margin-right:5px;" style="width:16px;height:16px;margin-right:5px;"
/> />
手机号码 经办人身份证号
</div> </div>
<div class="list_right" style="width:70%;"> <div class="list_right" style="width:52%;">
<input type="text" class="edit" v-model="jbPhoneNumber" readonly /> <input type="text" class="edit" v-model="jbIdNumber" readonly />
</div> </div>
</div> </div>
<div class="info_list"> <div class="info_list">
<div class="list_left" style="width:48%;"> <div class="list_left" style="width:30%;">
<img <img
src="../../../assets/userRegister/idCard.png" src="../../../assets/userRegister/phone.png"
alt alt
style="width:16px;height:16px;margin-right:5px;" style="width:16px;height:16px;margin-right:5px;"
/> />
经办人身份证号 手机号码
</div> </div>
<div class="list_right" style="width:52%;"> <div class="list_right" style="width:70%;">
<input type="text" class="edit" v-model="jbIdNumber" readonly /> <input type="text" class="edit" v-model="jbPhoneNumber" readonly />
</div> </div>
</div> </div>
<!-- <div style="margin: 10px 0 0 14px;color:#636363"> <!-- <div style="margin: 10px 0 0 14px;color:#636363">
...@@ -717,7 +718,7 @@ import { getUrlParam } from "@/scripts/utils"; ...@@ -717,7 +718,7 @@ import { getUrlParam } from "@/scripts/utils";
export default { export default {
data() { data() {
return { return {
agentType: "Y", // agentType: "Y",
staffType: "法定代表人", staffType: "法定代表人",
cardUp: require("../../../assets/userRegister/camear.png"), //身份证照片url cardUp: require("../../../assets/userRegister/camear.png"), //身份证照片url
busLic: require("../../../assets/userRegister/camear.png"), //营业执照照片url busLic: require("../../../assets/userRegister/camear.png"), //营业执照照片url
...@@ -780,13 +781,13 @@ export default { ...@@ -780,13 +781,13 @@ export default {
updated: function() {}, updated: function() {},
methods: { methods: {
// 是否是代理店 // 是否是代理店
isAgent() { // isAgent() {
console.log(this.agentType); // console.log(this.agentType);
// window.localStorage.agentType = this.agentType; // // window.localStorage.agentType = this.agentType;
if (this.agentType == "N") { // if (this.agentType == "N") {
this.staffType = "法定代表人"; // this.staffType = "法定代表人";
} // }
}, // },
// 调用微信接口的基础配置 // 调用微信接口的基础配置
wxConfig() { wxConfig() {
...@@ -827,9 +828,9 @@ export default { ...@@ -827,9 +828,9 @@ export default {
"hideOptionMenu" "hideOptionMenu"
] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2 ] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
}); });
wx.ready(function () { wx.ready(function() {
wx.hideOptionMenu(); wx.hideOptionMenu();
}) });
}); });
}, },
// 法人和其他人切换状态 // 法人和其他人切换状态
...@@ -1062,7 +1063,7 @@ export default { ...@@ -1062,7 +1063,7 @@ export default {
legalName: vm.legalRepresentativeName, legalName: vm.legalRepresentativeName,
legalIdNo: vm.legalRepresentativeCardNumber, legalIdNo: vm.legalRepresentativeCardNumber,
agentType: "1", agentType: "1",
dealerFlag: vm.agentType, // dealerFlag: vm.agentType,
redirectUrl: redirectUrl:
"http://sign.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=1" "http://sign.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=1"
}; };
...@@ -1127,7 +1128,6 @@ export default { ...@@ -1127,7 +1128,6 @@ export default {
legalName: vm.legalRepresentativeName1, legalName: vm.legalRepresentativeName1,
legalIdNo: vm.legalRepresentativeCardNumber1, legalIdNo: vm.legalRepresentativeCardNumber1,
agentType: "2", agentType: "2",
dealerFlag: vm.agentType,
redirectUrl: redirectUrl:
"http://sign.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=2" "http://sign.hitachics.com/www/#/UserRegister/CompanyRegister?Regstatus=2"
}; };
...@@ -1162,18 +1162,31 @@ export default { ...@@ -1162,18 +1162,31 @@ export default {
}, },
logout() { logout() {
let vm = this; let vm = this;
let url = process.env.rootPath + "/organizations/outerOrgans/delete"; hlsPopup.showConfirm({
let param = { title: "提示",
openId: window.localStorage.openId content: "请确认合同是否都已下载完成,注销后无法下载,请知悉,谢谢!",
}; onConfirm: function(index) {
vm.hlsPopup.showLoading("请稍等"); if (index === 1) {
vm.$post(url, param).then(function(res) { let url =
vm.hlsPopup.hideLoading(); process.env.rootPath + "/organizations/outerOrgans/delete";
if (res.code == 0) { let param = {
vm.$vux.toast.text(res.message, "middle"); openId: window.localStorage.openId
window.open("http://sign.hitachics.com/www/#/UserRegister", "_self"); };
} else { vm.hlsPopup.showLoading("请稍等");
vm.$vux.toast.text(res.message, "middle"); vm.$post(url, param).then(function(res) {
vm.hlsPopup.hideLoading();
if (res.code == 0) {
vm.$vux.toast.text(res.message, "middle");
window.open(
"http://sign.hitachics.com/www/#/UserRegister",
"_self"
);
} else {
vm.$vux.toast.text(res.message, "middle");
}
});
}
// console.log(index);
} }
}); });
}, },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<h-view class="public-style companyRegister" title="企业用户注册"> <h-view class="public-style companyRegister" title="企业用户注册">
<h-content> <h-content>
<list-item class="reg-content"> <list-item class="reg-content">
<div class="repre-type"> <!-- <div class="repre-type">
代理店 代理店
<input <input
type="radio" type="radio"
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
value="N" value="N"
disabled disabled
/> />
</div> </div>-->
<div class="repre-type" v-if="agentType == 'Y'"> <div class="repre-type">
<span>经办人类型:</span> <span>经办人类型:</span>
<input <input
type="radio" type="radio"
...@@ -296,8 +296,8 @@ export default { ...@@ -296,8 +296,8 @@ export default {
attachmentId: "", attachmentId: "",
orgAttachmentId: "", orgAttachmentId: "",
attachmentId1: "", attachmentId1: "",
orgAttachmentId1: "", orgAttachmentId1: ""
agentType: "" // agentType: ""
}; };
}, },
components: { components: {
...@@ -342,18 +342,31 @@ export default { ...@@ -342,18 +342,31 @@ export default {
}, },
logout() { logout() {
let vm = this; let vm = this;
let url = process.env.rootPath + "/organizations/outerOrgans/delete"; hlsPopup.showConfirm({
let param = { title: "提示",
openId: window.localStorage.openId content: "请确认合同是否都已下载完成,注销后无法下载,请知悉,谢谢!",
}; onConfirm: function(index) {
vm.hlsPopup.showLoading("请稍等"); if (index === 1) {
vm.$post(url, param).then(function(res) { let url =
vm.hlsPopup.hideLoading(); process.env.rootPath + "/organizations/outerOrgans/delete";
if (res.code == 0) { let param = {
vm.$vux.toast.text(res.message, "middle"); openId: window.localStorage.openId
window.open("http://sign.hitachics.com/www/#/UserRegister", "_self"); };
} else { vm.hlsPopup.showLoading("请稍等");
vm.$vux.toast.text(res.message, "middle"); vm.$post(url, param).then(function(res) {
vm.hlsPopup.hideLoading();
if (res.code == 0) {
vm.$vux.toast.text(res.message, "middle");
window.open(
"http://sign.hitachics.com/www/#/UserRegister",
"_self"
);
} else {
vm.$vux.toast.text(res.message, "middle");
}
});
}
console.log(index);
} }
}); });
}, },
...@@ -396,11 +409,11 @@ export default { ...@@ -396,11 +409,11 @@ export default {
"hideOptionMenu" "hideOptionMenu"
] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2 ] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
}); });
wx.ready(function () { wx.ready(function() {
wx.hideOptionMenu(); wx.hideOptionMenu();
}) });
}); });
}, }
}, },
created() { created() {
this.wxConfig(); this.wxConfig();
...@@ -408,7 +421,7 @@ export default { ...@@ -408,7 +421,7 @@ export default {
var agentType = data.agentType; var agentType = data.agentType;
console.log(data); console.log(data);
if (agentType == 1) { if (agentType == 1) {
this.agentType = data.dealerFlag; // this.agentType = data.dealerFlag;
this.organizationName = data.name; this.organizationName = data.name;
this.socialCode = data.idNo; this.socialCode = data.idNo;
this.legalRepresentativeName = data.legalName; this.legalRepresentativeName = data.legalName;
...@@ -429,7 +442,7 @@ export default { ...@@ -429,7 +442,7 @@ export default {
"&apiName=download&sysName=HCL_UPLOAD_FILE&access_token=" + "&apiName=download&sysName=HCL_UPLOAD_FILE&access_token=" +
window.localStorage.access_token_rl; window.localStorage.access_token_rl;
} else if (agentType == 2) { } else if (agentType == 2) {
this.agentType = data.dealerFlag; // this.agentType = data.dealerFlag;
this.staffType = "组织其他员工"; this.staffType = "组织其他员工";
this.jbName = data.agentName; this.jbName = data.agentName;
this.jbPhoneNumber = data.mobile; this.jbPhoneNumber = data.mobile;
......
...@@ -93,25 +93,33 @@ export default { ...@@ -93,25 +93,33 @@ export default {
imgUrl: vm.cardUp imgUrl: vm.cardUp
}); });
}, },
// 注销
logout() { logout() {
let vm = this; let vm = this;
let url = process.env.rootPath + "/accounts/outerAccounts/delete"; hlsPopup.showConfirm({
let param = { title: "签名成功",
openId: window.localStorage.openId content: "请确认合同是否都已下载完成,注销后无法下载,请知悉,谢谢!",
}; onConfirm: function(index) {
vm.hlsPopup.showLoading("请稍等"); if (index === 1) {
vm.$post(url, param).then(function(res) { let url = process.env.rootPath + "/accounts/outerAccounts/delete";
vm.hlsPopup.hideLoading(); let param = {
if (res.code == 0) { openId: window.localStorage.openId
vm.$vux.toast.text(res.message, "middle"); };
window.open( vm.hlsPopup.showLoading("请稍等");
"http://sign.hitachics.com/www/#/UserRegister", vm.$post(url, param).then(function(res) {
"_self" vm.hlsPopup.hideLoading();
); if (res.code == 0) {
} else { vm.$vux.toast.text(res.message, "middle");
vm.$vux.toast.text(res.message, "middle"); window.open(
"http://sign.hitachics.com/www/#/UserRegister",
"_self"
);
} else {
vm.$vux.toast.text(res.message, "middle");
}
});
}
} }
// vm.$vux.toast.text(res.message, "middle");
}); });
}, },
// 调用微信接口的基础配置 // 调用微信接口的基础配置
......
This diff is collapsed.
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