Skip to content

G
gs1
Commit 7efbb5df by Lyan
Options

个人中心bug修改

parent 8057eef9
Showing with 175 additions and 29 deletions
src/axios/fetch.js
......@@ -66,8 +66,9 @@ function fetch(options) {
if (ResponseCode.success.indexOf(code) !== -1) {
// console.log(resData, '响应数据的拦截2');
resolve(resData)
} else if (checkResponseCodeTokenError(code)) {
if (getToken()) {
} else if (code==401) {
// } else if (checkResponseCodeTokenError(code)) {
// if (getToken()) {
window.localStorage.clear()
removeToken()
......@@ -82,7 +83,7 @@ function fetch(options) {
}, 500)
}
})
}
// }
} else if (checkResponseCodeAuthUnPermitted(code)) {
// if (window.location.pathname !== "/404") {
// window.location.href = "/404"
......
src/utils/codeTable.js
......@@ -3,7 +3,9 @@ window.CodeTable || (window.CodeTable = {})
const EconomicCategoryCode = {"head":[{"type":"string","label":"label"},{"type":"number","label":"value"}],"body":[["内资","100"],["国有全资","110"],["集体全资","120"],["股份合作","130"],["联营","140"],["国有联营","141"],["集体联营","142"],["国有与集体联营","143"],["其它联营","149"],["有限责任（公司）","150"],["国有独资（公司）","151"],["其它有限责任（公司）","159"],["股份有限（公司）","160"],["私有","170"],["私有独资","171"],["私有合伙","172"],["私营有限责任（公司）","173"],["私营股份有限（公司）","174"],["个体经济","175"],["其它私有","179"],["其它内资","190"],["港、澳、台投资","200"],["内地和港、澳、台合资","210"],["内地和港、澳、台合作","220"],["港、澳、台独资","230"],["港、澳、台投资股份有限公司","240"],["其它港、澳、台投资","290"],["国外投资","300"],["中外合资","310"],["中外合作","320"],["外资","330"],["国外投资股份有限（公司）","340"],["其它国外投资","390"],["其它","900"]]}
const EconomicCategoryCodeHandle = EconomicCategoryCode.body.map(item => ({label: item[0], value: item[1]}))
window.CodeTable.EconomicCategoryCodeHandle = EconomicCategoryCodeHandle
window.CodeTable.getEconomicCategoryCodeHandle = (code) => {
return (EconomicCategoryCodeHandle.find(item => String(item.value) === String(code)) || {label: '--'}).label
}
//*************************************************************************
//国民经济行业分类代码
......@@ -11,6 +13,9 @@ const NationalIndustryClassificationCode = {"head":[{"type":"string","label":"la
// 适用element选择框（列表对象数据）
const NationalIndustryClassificationCodeHandle = NationalIndustryClassificationCode.body.map(item => ({label: item[0], value: item[1]}))
window.CodeTable.NationalIndustryClassificationCodeHandle = NationalIndustryClassificationCodeHandle
window.CodeTable.getNationalIndustryClassificationCodeHandle = (code) => {
return (NationalIndustryClassificationCodeHandle.find(item => String(item.value) === String(code)) || {label: '--'}).label
}
window.CodeTable.NationalIndustryClassificationCodeCategory = NationalIndustryClassificationCode.body.filter(item => ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'].indexOf(item[1]) >= 0).sort((a, b) => { return a[1].charCodeAt(0) - b[1].charCodeAt(0) })
const findCategory = function (code, length, arr) {
......
src/views/MyManage/Admin/certificationDetail.vue
......@@ -54,7 +54,7 @@
<el-button class="plain-with-border" v-if="reset">重置</el-button>
</div>
<el-image
id="image"
ref="image"
style="width: 10px; height: 10px;opacity: 0;"
:src="url"
:preview-src-list="srcList">
......@@ -443,9 +443,16 @@ export default {
},
showImage(form) {
const result = this.$api.myManage.tycpdmfirmReturnFile(form)
if(result){
this.url = result
this.srcList = [result]
document.getElementById('image').click()
this.$refs.image.clickHandler()
}else{
this.$message.error(result.returnMsg)
}
// document.getElementById('image').click()
},
getBranchLabel(branchCode) {
return (this.branchList.find(item => item.value === branchCode) || {label: '--'}).label
......@@ -498,9 +505,19 @@ export default {
this.branchCode = this.detailInfo.branchcode
this.subCenterName = this.getBranchLabel(this.branchCode)
const filterFields = ['firmbusinesslicensefile', 'firmArchivesfile']
this.entInfoFields.forEach(item => (item.key && filterFields.indexOf(item.key) < 0) && (item.value = this.detailInfo[item.key]))
this.entInfoFields.forEach(item => {
if (item.key && filterFields.indexOf(item.key) < 0) {
if (item.key === 'dm') {
item.value = window.CodeTable.getEconomicCategoryCodeHandle(this.detailInfo['dm'])
}else if (item.key === 'tjdm') {
item.value = window.CodeTable.getNationalIndustryClassificationCodeHandle(this.detailInfo['tjdm'])
} else {
item.value = this.detailInfo[item.key]
}
}
})
this.handlerInfoFields.forEach(item => {
if (item.key && filterFields.indexOf(item.key) < 0) {
if (item.key === 'contactmanctqh') {
......
src/views/MyManage/Admin/checkSearchTable.vue
......@@ -200,6 +200,7 @@ export default {
},
handleEntNameCheck(row) {
console.log(row)
this.checkDetail = row
},
getIcon(status) {
status = status.logoutFlag
......
src/views/MyManage/Admin/pathredirth.vue 0 → 100644
<template>
</template>
<script>
export default {
name: "index"
}
</script>
<style scoped>
</style>
src/views/MyManage/SystemMember/companyInfo.vue
......@@ -355,6 +355,7 @@ export default {
await this.getTycpdmFirmInfo()
},
initFormData(tycpdmFirmInfo) {
this.form.political = [tycpdmFirmInfo.political]
this.form.political = window.CodeTable.getRegionLabelByCode(this.form.political)
console.log(window.CodeTable.getRegionLabelByCode(this.form.political))
......
src/views/MyManage/SystemMember/index.vue
......@@ -115,7 +115,7 @@ export default {
}
},
initIsShowGDS() {
if (this.loginInfo.carno) this.isShowGDS = true // 有条码卡号可以进行GDS跳转
if (this.loginInfo.carno && this.loginInfo.carno!=='') this.isShowGDS = true // 有条码卡号可以进行GDS跳转
if (this.loginInfo.isQY) this.isShowGDS = true // 官网用户已进行实名厂商认证可以进行GDS跳转
}
},
......
src/views/MyManage/UnVerify/index.vue
......@@ -140,13 +140,16 @@
</template>
<script>
export default {
name: "index",
data () {
return {
isShowGDS: false,
memberInfo: {},
tycpdmFirmInfo: {},
tycpdmFirmInfo: {
logoutFlag:null
},
loginInfo: {
carno: '', // 条码卡号
id: 16, // 用户ID
......@@ -158,39 +161,51 @@ export default {
}
},
methods: {
//业务大厅跳转
async redirectYWDT() {
const params = {userType: this.loginInfo.userType, id: this.loginInfo.id}
const result = await this.$api.myManage.redirectYWDT(params)
if (result.success) {
// window.open(result.data, '_black')
window.open(result.data, '_blank')
} else {
this.$message.error(result.returnMsg)
}
},
// 跳转
async redirectGDS() {
const params = {userType: this.loginInfo.userType, id: this.loginInfo.id, carno: this.loginInfo.carno}
const result = await this.$api.myManage.redirectGDS(params)
if (result.success) {
// window.open(result.data, '_black')
window.open(result.data, '_blank')
} else {
this.$message.error(result.returnMsg)
}
},
// 跳转
async redirectGLN() {
const result = await this.$api.myManage.redirectGLN()
if (result.success) {
// window.open(result.data, '_black')
window.open(result.data, '_blank')
} else {
this.$message.error(result.returnMsg)
}
},
// 初始化实名认证显示内容
initIsShowGDS() {
if (this.loginInfo.carno) this.isShowGDS = true // 有条码卡号可以进行GDS跳转
if (this.loginInfo.isQY) this.isShowGDS = true // 官网用户已进行实名厂商认证可以进行GDS跳转
},
async getTycpdmFirmInfo() {
const result = await this.$api.myManage.tycpdmFirmInfoNoAuth({name: this.memberInfo.username})
if(result.data){
this.tycpdmFirmInfo = result.data
}else{
this.tycpdmFirmInfo.logoutFlag=null
}
},
async getMemberInfo() {
this.memberInfo = (await this.$api.myManage.memberInfo({id: this.loginInfo.id})).data
......@@ -199,6 +214,7 @@ export default {
},
mounted() {
this.loginInfo = JSON.parse(localStorage.getItem('loginInfo'))
console.log(this.loginInfo)
this.initIsShowGDS()
this.getMemberInfo()
}
......
src/views/MyManage/UnVerify/realNameTable.vue
......@@ -145,13 +145,17 @@ export default {
return {
loginInfo: {},
memberInfo: {},
tycpdmFirmInfo: {}
tycpdmFirmInfo: {},
registerAddStr:''
}
},
methods: {
async getTycpdmFirmInfo() {
const result = await this.$api.myManage.tycpdmFirmInfo({userName: this.memberInfo.username})
this.tycpdmFirmInfo = result.data.data
// this.registerAddStr = window.CodeTable.getRegionLabelByCode(result.data.data.political)
this.tycpdmFirmInfo.dm=window.CodeTable.getEconomicCategoryCodeHandle(result.data.data.dm)
this.tycpdmFirmInfo.tjdm=window.CodeTable.getNationalIndustryClassificationCodeHandle(result.data.data.tjdm)
},
async getMemberInfo() {
this.memberInfo = (await this.$api.myManage.memberInfo({id: this.loginInfo.id})).data
......
src/views/MyManage/UnVerify/uploadvendor.vue
......@@ -23,6 +23,7 @@
</div>
</div>
</div>
<el-image
id="image"
style="width: 10px; height: 10px;opacity: 0;"
......@@ -98,9 +99,11 @@ export default {
this.$message.error('文件不存在')
} else {
const result = this.$api.myManage.tycpdmfirmReturnFile(form)
console.log(result)
this.imagePreview.url = result
this.imagePreview.srcList = [result]
if (document.getElementById('image')) document.getElementById('image').click()
window.open(this.imagePreview.url,'_blank')
// if (document.getElementById('image')) document.getElementById('image').click()
}
},
async getTycpdmFirmInfo() {
......
src/views/MyManage/UnVerify/vendor.vue
......@@ -8,7 +8,7 @@
</div>
<div class="content">
<div class="title">
{{status === 2 ? '变更厂商实名认证信息' : '厂商实名认证——填写实名信息'}}
{{status == 2 ? '变更厂商实名认证信息' : '厂商实名认证——填写实名信息'}}
<a v-if="status !== 2" href="/MyManage/UnVerify/index">返回我的首页</a>
<a v-else href="/MyManage/UnVerify/vendorModify">修改企业信息</a>
</div>
......@@ -32,6 +32,7 @@
message: '不能为空',
}]">
<el-input v-model='form.firmName' autocomplete='off' placeholder="请输入企业中文名称"></el-input>
<span class="form-item-tip form-item-tip2">若厂商已为系统成员，请直接使用条码卡账号登录，无需再次实名认证！</span>
</el-form-item>
<el-form-item label='企业名称(英文)：'
prop='firmName1'
......@@ -50,6 +51,7 @@
placeholder="请选择" style="width: 100%;"
v-model="form.political"
:options="cascadeRegion"
:show-all-levels="false"
:props="{ expandTrigger: 'hover', label: 'label', value: 'code' }"
size="medium"
@change="politicalChangeEvent"></el-cascader>
......@@ -65,9 +67,13 @@
required: true,
message: '不能为空',
}]">
<el-select v-model="form.branchCode" :disabled="status === 2" placeholder="请选择所属分支机构" >
<el-select v-model="form.branchCode" placeholder="请选择所属分支机构" >
<!-- <el-select v-model="form.branchCode" :disabled="status === 2" placeholder="请选择所属分支机构" > -->
<el-option v-for="item in branchList" :label="item.label" :value="item.value" :key="item.value"></el-option>
</el-select>
<ul class="branchListStyle" :style="{'margin-top':marginTop}">
<li v-for="(item,i) in branchList" :key="i" ><a :href="`/Org/BranchMsg?branchCode=${item.value}`" target="_blank">{{item.label}}</a></li>
</ul>
</el-form-item>
<el-form-item label='注册地址(英文)：'
prop='registerAddress1'
......@@ -89,7 +95,11 @@
message: '不能为空',
}]">
<el-input v-model='form.address' autocomplete='off' placeholder="请输入办公地址"></el-input>
<span class="form-item-tip">
<el-checkbox @change="changeAdress">同上注册地址</el-checkbox>
</span>
</el-form-item>
<el-form-item label='办公地址(英文)：'
prop='address1'
>
......@@ -292,12 +302,18 @@
<t-j-dm-select @cancel="dialogVisible = false" :initSelect="form.TJDm" @confirm="confirmEvent"/>
</div>
</el-dialog>
<el-image
ref="image"
id="image"
style="width: 10px; height: 10px;opacity: 0;"
lazy
fit="scale-down"
style="width: 90%; margin:0 5%"
:src="imagePreview.url"
:preview-src-list="imagePreview.srcList">
</el-image>
</div>
</template>
......@@ -411,7 +427,8 @@ export default {
branchList: [],
AdministrativeDivisionCode: window.CodeTable.AdministrativeDivisionCodeHandle,
EconomicCategoryCode: window.CodeTable.EconomicCategoryCodeHandle,
NationalIndustryClassificationCode: window.CodeTable.NationalIndustryClassificationCodeHandle
NationalIndustryClassificationCode: window.CodeTable.NationalIndustryClassificationCodeHandle,
marginTop:'10px'
}
},
methods: {
......@@ -451,6 +468,7 @@ export default {
_form.political = this.form.political[this.form.political.length - 1]
_form.contactmanTele = this.form.contactmanCtqh.substr(this.form.contactmanCtqh.indexOf('-')+1)
_form.contactmanCtqh = this.form.contactmanCtqh.substr(0, this.form.contactmanCtqh.indexOf('-'))
_form.registerAddress=window.CodeTable.getRegionLabelByCode(_form.political)+this.form.registerAddress
this.saveTycpdmFirmInfo(_form)
} else {
return false;
......@@ -471,11 +489,16 @@ export default {
this.dialogVisible = false
},
politicalChangeEvent() {
if (this.status === 2) return
// if (this.status === 2) return
console.log(this.form.political)
this.form.branchCode = ''
this.branchList = window.CodeTable.getBranches(this.form.political[this.form.political.length - 1])
this.branchList.length > 0 && (this.form.branchCode = this.branchList[0].value)
if(this.branchList.length > 1){
this.marginTop='-3px'
}else{
this.marginTop='10px'
}
},
async upload(form) {
this.uploading = true
......@@ -521,7 +544,9 @@ export default {
const result = this.$api.myManage.tycpdmfirmReturnFile(form)
this.imagePreview.url = result
this.imagePreview.srcList = [result]
if (document.getElementById('image')) document.getElementById('image').click()
// this.$refs.image.clickHandler()
window.open(this.imagePreview.url,'_blank')
// if (document.getElementById('image')) document.getElementById('image').click()
}
},
async saveTycpdmFirmInfo(form) {
......@@ -544,6 +569,7 @@ export default {
if (tycpdmFirmInfo.logoutFlag === -1) { // logoutFlag如果为null表示未提交书面材料
this.form.fid = tycpdmFirmInfo.fid
this.form.id = tycpdmFirmInfo.id
this.status = result.data.status
this.initFormData(tycpdmFirmInfo)
// await this.$router.replace({path: '/MyManage/UnVerify/uploadvendor'}) // 第二步没有提交是可以修改第一步的实名信息的
......@@ -580,6 +606,21 @@ export default {
}
})
this.form.contactmanCtqh = tycpdmFirmInfo['contactmanctqh'] + '-' + tycpdmFirmInfo['contactmantele']
let registerStr=window.CodeTable.getRegionLabelByCode(tycpdmFirmInfo['political'])
this.form.registerAddress=this.form.registerAddress.slice(registerStr.length)
},
changeAdress(e){
if(e){
console.log(this.form.political)
let registerStr=window.CodeTable.getRegionLabelByCode(this.form.political[this.form.political.length - 1])+this.form.registerAddress
this.form.address = registerStr;
this.form.address1 = this.form.registerAddress1;
this.form.postcode1 = this.form.postcode;
}else{
this.form.address='';
this.form.address1='';
this.form.postcode1='';
}
}
},
mounted() {
......@@ -589,7 +630,8 @@ export default {
destroyed() {
const fileElement = document.getElementById('file')
fileElement && document.body.removeChild(fileElement)
}
},
}
</script>
......@@ -747,10 +789,44 @@ export default {
}
.form-item-tip {
position: absolute;
margin: 10px 0 0 5px;
margin:10px 0 0 5px;
width: 200px;
line-height: 26px;
font-size: 13px;
color: #F56C6C;
}
/deep/.el-checkbox__label{
font-size: 13px;
color: #F56C6C;
}
.branchListStyle{
display: inline-block;
position: absolute;
margin:10px 0 0 25px;
width: 200px;
line-height: 26px;
font-size: 13px;
color: #F56C6C;
li{
list-style-type: disc;
}
a{
color: #F56C6C;
}
}
.form-item-tip2{
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
&:hover{
cursor: pointer;
margin:0px 0 0 5px;
width: 250px;
white-space:normal;
word-wrap: break-word;
word-break: break-all;
}
}
</style>
<style lang="scss" scoped>
......
src/views/MyManage/UnVerify/vendorstatus.vue
......@@ -2,7 +2,7 @@
<div class="container2">
<div class="content">
<div class="title">厂商实名认证——审核状态 <a href="/MyManage/UnVerify/index">返回我的首页</a></div>
<div class="title">{{status == 2 ? '变更厂商实名认证——审核状态' : '厂商实名认证——审核状态'}} <a href="/MyManage/UnVerify/index">返回我的首页</a></div>
<div class="content-list">
<p >
<span>1.填写实名信息</span>
......@@ -13,7 +13,7 @@
<div class="cnt">
<div class="fail" v-if="tycpdmFirmInfo.logoutFlag === 2">
<img src="../../../assets/image/mymanage/fail.png" alt="">
<span>很抱歉！您未通过中国物品编码中心实名认证。以下为您所在的 <a href="#" target="_blank">分支机构</a> 审核意见：</span>
<span>很抱歉！您未通过中国物品编码中心实名认证{{status == 2 ? '变更' : ''}} 。以下为您所在的 <a href="#" target="_blank">分支机构</a> 审核意见：</span>
<p>{{tycpdmFirmInfo.approveContent}}</p>
<p class="btn-p">
<el-button @click="modifyInfoBtn" type="primary" style="width: 192px">重新修改企业资料</el-button>
......@@ -36,7 +36,8 @@ export default {
return {
loginInfo: {},
memberInfo: {},
tycpdmFirmInfo: {}
tycpdmFirmInfo: {},
status: 0, // 1: 新增 2: 变更
}
},
methods: {
......@@ -46,6 +47,7 @@ export default {
async getTycpdmFirmInfo() {
const result = await this.$api.myManage.tycpdmFirmInfo({userName: this.memberInfo.username})
this.tycpdmFirmInfo = result.data.data
this.status = result.data.status
},
async getMemberInfo() {
this.memberInfo = (await this.$api.myManage.memberInfo({id: this.loginInfo.id})).data
......
src/views/News/Ecommerce/detail.vue
......@@ -8,9 +8,16 @@
</div>
<div class="content_box" v-html="newsInfo.content" v-if="newsInfo.content"></div>
<div class="videoStyle" v-if="preTitle === '在线视频'">
<video class="video" controls width="100%" height="100%" >
<!-- <video class="video" controls width="100%" height="100%" >
<source :src="newsInfo.wavname" type="video/mp4">
</video>
</video> -->
<video
controls="controls"
:src="newsInfo.wavname"
width="100%"
height="100%"
webkit-playsinline=""
></video>
</div>
<div class="source_box">{{newsInfo && newsInfo.source ? newsInfo.source : ''}}</div>
......
src/views/News/Ecommerce/index.vue
......@@ -30,8 +30,8 @@ export default {
children: [
{
name: "物品编码标识技术",
path: "",
active: "",
path: "/News/ECommerce",
active: "ECommerce",
},
{
name: "采用GS1统一物品编码的好处",
......
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