Skip to content

G
gs1
Commit faa86da2 by Jianli Ou
Options

bug处理

parent 214e424d
Showing with 97 additions and 48 deletions
src/App.vue
......@@ -11,8 +11,4 @@
.el-input__inner::-webkit-input-placeholder {
color: #888 !important
}
.el-cascader .el-input .el-input__inner {
background-color: rgba(0, 0, 0, 0);
border-width: 0;
}
</style>
src/axios/module/myManage.js
......@@ -82,6 +82,10 @@ const updateTycpdmFirmInfo = (params = {}) => {
const tycpdmFirmInfoNoAuth = (params = {}) => {
return POST(`${Prefix}/office/tycpdmfirm/authApi/findByUserName`, params)
}
// 企业信息（申请条码卡号的系统成员）
const findFirmInfoXT = (params = {}) => {
return POST(`${Prefix}/office/tycpdmfirm/api/findFirmInfoXT`, params)
}
// 获取验证码（修改手机号）
const getVerificationCode = (params = {}) => {
return POST(`${Prefix}/office/member/api/getVerificationCode`, params)
......@@ -110,6 +114,7 @@ export default {
redirectGLN,
updateTycpdmFirmInfo,
tycpdmFirmInfoNoAuth,
findFirmInfoXT,
getVerificationCode,
updatePhone
}
src/utils/codeTable.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/MyManage/SystemMember/companyInfo.vue
......@@ -28,18 +28,18 @@
message: '不能为空',
}]"
>
<el-select v-model="form.political" :disabled="true" @change="politicalChangeEvent" placeholder="请选择" class="smallselect" style="width: 100% !important;">
<el-option v-for="item in AdministrativeDivisionCode" :label="item.label" :value="item.value" :key="item.value"></el-option>
</el-select>
<el-input placeholder="请输入注册地址" :disabled="true" v-model="form.registerAddress" class="input-with-select">
<el-cascader
slot="prepend" placeholder="请选择" class="smallselect" style="margin: -10px -20px;"
v-model="form.political"
:disabled="true"
:options="cascadeRegion"
:props="{ expandTrigger: 'hover', label: 'label', value: 'code' }"
size="medium"
@change="politicalChangeEvent"></el-cascader>
<!-- <el-select v-model="form.political" @change="politicalChangeEvent" slot="prepend" placeholder="请选择" class="smallselect">-->
<!-- <el-option v-for="item in AdministrativeDivisionCode" :label="item.label" :value="item.value" :key="item.value"></el-option>-->
<!-- </el-select>-->
<!-- <el-cascader-->
<!-- slot="prepend" placeholder="请选择" class="smallselect" style="margin: -10px -20px;"-->
<!-- v-model="form.political"-->
<!-- :disabled="true"-->
<!-- :options="cascadeRegion"-->
<!-- :props="{ expandTrigger: 'hover', label: 'label', value: 'code' }"-->
<!-- size="medium"-->
<!-- @change="politicalChangeEvent"></el-cascader>-->
</el-input>
</el-form-item>
<el-form-item label='注册地址(英文)：'
......@@ -74,7 +74,7 @@
required: false,
message: '不能为空',
}]">
<el-input v-model='form.postcode1' :disabled="true" autocomplete='off' placeholder="请输入办公地址邮政编码"></el-input>
<el-input v-model='form.postcode1' :disabled="true" autocomplete='off' placeholder=""></el-input>
</el-form-item>
<el-form-item label='统一社会信用代码：'
......@@ -189,9 +189,7 @@
:rules="[{
required: false,
message: '不能为空',
},
{ validator:checkMobileReg },
{ validator:checkMobile, trigger:'blur' },]">
}]">
<el-input v-model='form.contactmanMp' :disabled="true" autocomplete='off' placeholder="请输入手机"></el-input>
</el-form-item>
<el-form-item label='传真：'
......@@ -204,10 +202,6 @@
:rules="[{
required: false,
message: '不能为空',
},
{ type: 'email',
message: '请输入正确的邮箱地址',
trigger: ['blur', 'change']
}]">
<el-input v-model='form.contactmanEmail' :disabled="true" autocomplete='off' placeholder="请输入E-mail"></el-input>
</el-form-item>
......@@ -339,7 +333,19 @@ export default {
this.branchList.length > 0 && (this.form.branchCode = this.branchList[0].value)
},
async getTycpdmFirmInfo() {
const result = await this.$api.myManage.tycpdmFirmInfoNoAuth({name: this.memberInfo.username})
let result = {}
if (this.loginInfo.carno) {
result = await this.$api.myManage.findFirmInfoXT({carno: this.loginInfo.carno})
// 对申请条码的系统成员的企业信息进行处理（两个接口 findFirmInfoXT 和 tycpdmFirmInfoNoAuth 返回的数据有所区别）
!result.data['contactmanEmail'] && (result.data['contactmanEmail'] = result.data['email'])
!result.data['contactmanFax'] && (result.data['contactmanFax'] = result.data['fax'])
!result.data['contactmanCtqh'] && (result.data['contactmanCtqh'] = '')
!result.data['contactmanTele'] && (result.data['contactmanTele'] = '')
!result.data['contactmanMp'] && (result.data['contactmanMp'] = ' ')
Object.keys(result.data).forEach(key => !result.data[key.toLowerCase()] && (result.data[key.toLowerCase()] = result.data[key]))
} else {
result = await this.$api.myManage.tycpdmFirmInfoNoAuth({name: this.memberInfo.username})
}
const tycpdmFirmInfo = result.data
this.initFormData(tycpdmFirmInfo)
},
......@@ -349,6 +355,8 @@ export default {
},
initFormData(tycpdmFirmInfo) {
this.form.political = [tycpdmFirmInfo.political]
this.form.political = window.CodeTable.getRegionLabelByCode(this.form.political)
console.log(window.CodeTable.getRegionLabelByCode(this.form.political))
this.politicalChangeEvent()
Object.keys(this.form).forEach(key => {
if (['political'].indexOf(key) < 0) {
......
src/views/MyManage/SystemMember/index.vue
......@@ -11,8 +11,8 @@
<p class="content-title">商品条码相关业务</p>
<p><i class="bi bi-check-circle-fill"></i>您已成为中国物品编码中心系统成员！</p>
<p style="padding-left:24px">您可以——前往<a @click="redirectYWDT">网上业务大厅</a> 办理商品条码续展，变更，子公司备案等业务！</p>
<p style="padding-left:24px">您可以——前往<a @click="redirectGDS">中国商品信息服务平台 </a> 办理以下业务：</p>
<div class="p-list">
<p v-if="loginInfo.carno" style="padding-left:24px">您可以——前往<a @click="redirectGDS">中国商品信息服务平台 </a> 办理以下业务：</p>
<div v-if="loginInfo.carno" class="p-list">
<p style="padding-left:24px">产品信息通报——一键获取商品条码，无需自行编制；满足信息通报的法规要求，建立条码档案。</p>
<p style="padding-left:24px">微信共享——共享产品信息至微信，实现对外扫码查询。</p>
<p style="padding-left:24px">易码追溯——进行产品质量安全追溯，提升产品信誉度。</p>
......
src/views/MyManage/UnVerify/changePhone.vue
......@@ -82,19 +82,30 @@ export default {
}
const result = await this.$api.myManage.updatePhone(form)
if (result.success) {
this.resetInfo()
this.$message.success('保存成功')
} else {
this.$message.error(result.returnMsg)
}
},
resetInfo() {
clearInterval(this.timer);
this.time = 60;
this.hasSent = false;
this.$refs['ruleForm'].resetFields()
location.reload()
},
async sendValidateCode() {
if (this.form.mobile === '') {
this.$message({type: 'error', message: '请输入手机号码'});
} else {
const result = await this.$api.myManage.getVerificationCode({phone: this.form.mobile, userName: this.memberInfo.username})
if (result.success) {
this.$message.success('验证码已发送')
this.$message({
message: '验证码已发送，五分钟内有效！同一手机号每日最多操作三次！用一个ip每日最多操作十次！',
type: 'success',
duration: 8000
});
} else {
this.$message.error(result.returnMsg)
return
......
src/views/MyManage/UnVerify/vendor.vue
......@@ -46,14 +46,14 @@
message: '不能为空',
}]"
>
<el-cascader
placeholder="请选择" style="width: 100%;"
v-model="form.political"
:options="cascadeRegion"
:props="{ expandTrigger: 'hover', label: 'label', value: 'code' }"
size="medium"
@change="politicalChangeEvent"></el-cascader>
<el-input placeholder="请输入注册地址" v-model="form.registerAddress" class="input-with-select">
<el-cascader
slot="prepend" placeholder="请选择" class="smallselect" style="margin: -10px -20px;"
v-model="form.political"
:options="cascadeRegion"
:props="{ expandTrigger: 'hover', label: 'label', value: 'code' }"
size="medium"
@change="politicalChangeEvent"></el-cascader>
<!-- <el-select v-model="form.political" @change="politicalChangeEvent" slot="prepend" placeholder="请选择" class="smallselect">-->
<!-- <el-option v-for="item in AdministrativeDivisionCode" :label="item.label" :value="item.value" :key="item.value"></el-option>-->
<!-- </el-select>-->
......@@ -471,6 +471,7 @@ export default {
this.dialogVisible = false
},
politicalChangeEvent() {
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])
......@@ -562,8 +563,17 @@ export default {
await this.getTycpdmFirmInfo()
},
initFormData(tycpdmFirmInfo) {
this.form.political = [tycpdmFirmInfo.political]
this.politicalChangeEvent()
// 注册地址级联回显数据处理
if (['11', '12', '31', '50'].indexOf(tycpdmFirmInfo.political.substr(0, 2)) >= 0) {
// 四个直辖市
this.form.political = [tycpdmFirmInfo.political.substr(0, 2) + '0000', tycpdmFirmInfo.political]
} else {
this.form.political = [tycpdmFirmInfo.political.substr(0, 2) + '0000', tycpdmFirmInfo.political.substr(0, 4) + '00', tycpdmFirmInfo.political]
}
this.branchList = window.CodeTable.getBranches(tycpdmFirmInfo.branchcode)
this.branchList.length > 0 && (this.form.branchCode = this.branchList[0].value)
Object.keys(this.form).forEach(key => {
if (['political'].indexOf(key) < 0) {
this.form[key] = tycpdmFirmInfo[key.toLowerCase()]
......
src/views/MyManage/UnVerify/vendorModify.vue
......@@ -33,15 +33,16 @@
message: '不能为空',
}]"
>
<el-cascader
:disabled="true"
style="width: 100%;"
placeholder="请选择"
v-model="form.political"
:options="cascadeRegion"
:props="{ expandTrigger: 'hover', label: 'label', value: 'code' }"
size="medium"
@change="politicalChangeEvent"></el-cascader>
<el-input :disabled="true" placeholder="请输入注册地址" v-model="form.registerAddress" class="input-with-select">
<el-cascader
:disabled="true"
slot="prepend" placeholder="请选择" class="smallselect" style="margin: -10px -20px;"
v-model="form.political"
:options="cascadeRegion"
:props="{ expandTrigger: 'hover', label: 'label', value: 'code' }"
size="medium"
@change="politicalChangeEvent"></el-cascader>
<!-- <el-select v-model="form.political" @change="politicalChangeEvent" slot="prepend" placeholder="请选择" class="smallselect">-->
<!-- <el-option v-for="item in AdministrativeDivisionCode" :label="item.label" :value="item.value" :key="item.value"></el-option>-->
<!-- </el-select>-->
......@@ -415,6 +416,7 @@ export default {
this.dialogVisible = false
},
politicalChangeEvent() {
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])
......@@ -474,8 +476,19 @@ export default {
await this.getTycpdmFirmInfo()
},
initFormData(tycpdmFirmInfo) {
this.form.political = [tycpdmFirmInfo.political]
this.politicalChangeEvent()
// 注册地址级联回显数据处理
if (['11', '12', '31', '50'].indexOf(tycpdmFirmInfo.political.substr(0, 2)) >= 0) {
// 四个直辖市
this.form.political = [tycpdmFirmInfo.political.substr(0, 2) + '0000', tycpdmFirmInfo.political]
} else {
this.form.political = [tycpdmFirmInfo.political.substr(0, 2) + '0000', tycpdmFirmInfo.political.substr(0, 4) + '00', tycpdmFirmInfo.political]
}
if (this.status === 2) {
this.branchList = window.CodeTable.getBranches(tycpdmFirmInfo.branchcode)
this.branchList.length > 0 && (this.form.branchCode = this.branchList[0].value)
} else {
this.politicalChangeEvent()
}
Object.keys(this.form).forEach(key => {
if (['political'].indexOf(key) < 0) {
this.form[key] = tycpdmFirmInfo[key.toLowerCase()]
......
src/views/MyManage/index.vue
......@@ -247,8 +247,14 @@ export default {
if (this.loginInfo.userType !== 3) { // 业务大厅用户不展示厂商实名认证菜单
this.routerList[1].children = this.routerList[1].children.filter(item => item.index !== 1)
}
if (this.loginInfo.isXT === 1 && !this.loginInfo.carno) { // 未申请条码卡的系统成员没有商品条码在线注册菜单
this.routerList[1].children = this.routerList[1].children.filter(item => item.name !== '商品条码在线注册')
}
if (this.loginInfo.userType === 1) { // 手机号登陆用户不能有修改手机号菜单
this.routerList[2].children = this.routerList[2].children.filter(item => item.name !== '修改手机号码')
}
this.routerList[0].link = '/MyManage/SystemMember/index'
if (this.loginInfo.carno) { // 申请条码卡的系统成员有企业信息菜单
if (this.loginInfo.isXT === 1 && this.loginInfo.carno) { // 申请条码卡的系统成员有企业信息菜单
this.routerList[2].children.push({
id: uuid("gs_nav"),
name: "企业信息",
......
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