Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test

This commit is contained in:
woody 2025-09-29 11:16:35 +08:00
commit 0d5604acea
100 changed files with 241 additions and 243 deletions

2
i8n.js

File diff suppressed because one or more lines are too long

View File

@ -65,7 +65,7 @@ export function getRegistration(params) {
params params
}) })
} }
// 真实奖衔下拉选择列表 // 荣誉奖衔下拉选择列表
export function getAwardsListChiose(params) { export function getAwardsListChiose(params) {
return request({ return request({
url: '/system/manage/awards/awardsList', url: '/system/manage/awards/awardsList',
@ -73,7 +73,7 @@ export function getAwardsListChiose(params) {
params params
}) })
} }
// 真实奖衔下拉选择列表 // 荣誉奖衔下拉选择列表
export function getAwardsNewListChiose(params) { export function getAwardsNewListChiose(params) {
return request({ return request({
url: '/system/manage/awards/awards-list-new', url: '/system/manage/awards/awards-list-new',

View File

@ -349,7 +349,7 @@ export function messageSave(data) {
}) })
} }
// 真实奖衔新增 // 荣誉奖衔新增
export function awardsControlSave(data) { export function awardsControlSave(data) {
return request({ return request({
url: '/member/manage/awards-control/save-petition', url: '/member/manage/awards-control/save-petition',
@ -358,7 +358,7 @@ export function awardsControlSave(data) {
}) })
} }
// 真实奖衔修改 // 荣誉奖衔修改
export function awardsControlUp(data) { export function awardsControlUp(data) {
return request({ return request({
url: '/member/manage/awards-control/up-petition', url: '/member/manage/awards-control/up-petition',
@ -367,7 +367,7 @@ export function awardsControlUp(data) {
}) })
} }
// 真实奖衔删除 // 荣誉奖衔删除
export function awardsControlDel(data) { export function awardsControlDel(data) {
return request({ return request({
url: '/member/manage/awards-control/del-petition', url: '/member/manage/awards-control/del-petition',

View File

@ -65,7 +65,7 @@ export function getRegistration(params) {
params params
}) })
} }
// 真实奖衔下拉选择列表 // 荣誉奖衔下拉选择列表
export function getAwardsListChiose(params) { export function getAwardsListChiose(params) {
return request({ return request({
url: '/system/manage/retail-awards/awardsList', url: '/system/manage/retail-awards/awardsList',
@ -73,7 +73,7 @@ export function getAwardsListChiose(params) {
params params
}) })
} }
// 真实奖衔下拉选择列表 // 荣誉奖衔下拉选择列表
export function getAwardsNewListChiose(params) { export function getAwardsNewListChiose(params) {
return request({ return request({
url: '/system/manage/awards/awards-list-new', url: '/system/manage/awards/awards-list-new',

View File

@ -314,7 +314,7 @@ export function getMmeberAchieveList(params) {
}) })
} }
// 真实奖衔下拉 // 荣誉奖衔下拉
export function awardsList(params) { export function awardsList(params) {
return request({ return request({
url: '/system/manage/awards/awardsList', url: '/system/manage/awards/awardsList',
@ -323,7 +323,7 @@ export function awardsList(params) {
}) })
} }
// 真实奖衔列表 // 荣誉奖衔列表
export function awardsControlList(params) { export function awardsControlList(params) {
return request({ return request({
url: '/member/manage/awards-control/list', url: '/member/manage/awards-control/list',
@ -332,7 +332,7 @@ export function awardsControlList(params) {
}) })
} }
// 真实奖衔搜索 // 荣誉奖衔搜索
export function memberlist(params) { export function memberlist(params) {
return request({ return request({
url: '/member/manage/awards-control/memberlist', url: '/member/manage/awards-control/memberlist',
@ -350,7 +350,7 @@ export function batchType(params) {
}) })
} }
// 真实奖衔导入 // 荣誉奖衔导入
export function importData(data) { export function importData(data) {
return request({ return request({
url: '/member/manage/awards-control/importData', url: '/member/manage/awards-control/importData',
@ -404,7 +404,7 @@ export function policySelted(data) {
}) })
} }
// 真实奖衔确认 // 荣誉奖衔确认
export function affirm(data) { export function affirm(data) {
return request({ return request({
url: '/member/manage/awards-control/affirm', url: '/member/manage/awards-control/affirm',

View File

@ -41,7 +41,7 @@ export function getGradeRecordList(params) {
params params
}) })
} }
//真实奖衔分析 //荣誉奖衔分析
export function getUmbrellaAnalysisList(params) { export function getUmbrellaAnalysisList(params) {
return request({ return request({
url: '/report/manager/member-awards/analysis-list', url: '/report/manager/member-awards/analysis-list',
@ -50,7 +50,7 @@ export function getUmbrellaAnalysisList(params) {
}) })
} }
//真实奖衔分析穿透 //荣誉奖衔分析穿透
export function getUmbrellaAnalysisDetailList(params) { export function getUmbrellaAnalysisDetailList(params) {
return request({ return request({
url: '/report/manager/member-awards/analysis-details-list', url: '/report/manager/member-awards/analysis-details-list',

View File

@ -110,7 +110,7 @@ const zhCn = {
OnlineTime: "在线时间", OnlineTime: "在线时间",
distributor: "经销商", distributor: "经销商",
ModificationTimes: "修改次数", ModificationTimes: "修改次数",
RealAward: "真实奖衔", RealAward: "荣誉奖衔",
SettlementAward: "结算奖衔", SettlementAward: "结算奖衔",
SettlementAward2: "结算奖衔:", SettlementAward2: "结算奖衔:",
PleaseEnterTheSettlementAwardTitle: "请输入结算奖衔:", PleaseEnterTheSettlementAwardTitle: "请输入结算奖衔:",
@ -360,7 +360,7 @@ const zhCn = {
ModifyAwardTitle: "修改奖衔", ModifyAwardTitle: "修改奖衔",
ModifySettlementAwardTitle: "修改结算奖衔", ModifySettlementAwardTitle: "修改结算奖衔",
ModifyDeathUser: "死点激活", ModifyDeathUser: "死点激活",
ModifyTheRealAwardTitle: "修改真实奖衔", ModifyTheRealAwardTitle: "修改荣誉奖衔",
ModifyLevel: "修改等级", ModifyLevel: "修改等级",
ModifyRegistrationLevel: "修改注册等级", ModifyRegistrationLevel: "修改注册等级",
ModifyCountryName: "修改国家", ModifyCountryName: "修改国家",
@ -1876,7 +1876,7 @@ const zhCn = {
enter_user_registrationLevel: "请选择注册等级", enter_user_registrationLevel: "请选择注册等级",
enter_user_customer_type: "请选择用户类型", enter_user_customer_type: "请选择用户类型",
enter_user_settlementLevel: "请选择结算等级", enter_user_settlementLevel: "请选择结算等级",
enter_user_realAwardTitle: "请选择真实奖衔", enter_user_realAwardTitle: "请选择荣誉奖衔",
enter_user_settlementAward: "请选择结算奖衔", enter_user_settlementAward: "请选择结算奖衔",
enter_user_agentLevel: "请选择代理等级", enter_user_agentLevel: "请选择代理等级",
enter_user_distributor: "请选择经销商状态", enter_user_distributor: "请选择经销商状态",

View File

@ -381,21 +381,21 @@ export const constantRoutes = [
path: 'awardControl', path: 'awardControl',
name: 'AwardControl', name: 'AwardControl',
component: () => import('@/views/information/specialBusiness/awardControl'), component: () => import('@/views/information/specialBusiness/awardControl'),
meta: { title: '真实奖衔控制' }, meta: { title: '荣誉奖衔控制' },
hidden: true hidden: true
}, },
{ {
path: 'awardDetails', path: 'awardDetails',
name: 'AwardDetails', name: 'AwardDetails',
component: () => import('@/views/information/specialBusiness/awardDetails'), component: () => import('@/views/information/specialBusiness/awardDetails'),
meta: { title: '真实奖衔控制' }, meta: { title: '荣誉奖衔控制' },
hidden: true hidden: true
}, },
{ {
path: 'awardZxqc', path: 'awardZxqc',
name: 'AwardZxqc', name: 'AwardZxqc',
component: () => import('@/views/information/specialBusiness/awardZxqc'), component: () => import('@/views/information/specialBusiness/awardZxqc'),
meta: { title: '真实奖衔控制' }, meta: { title: '荣誉奖衔控制' },
hidden: true hidden: true
}, },
{ {
@ -2771,7 +2771,7 @@ export const constantRoutes = [
path: 'awardAnalysis', path: 'awardAnalysis',
name: 'AwardAnalysis', name: 'AwardAnalysis',
component: () => import('@/views/statistics/awardAnalysis'), component: () => import('@/views/statistics/awardAnalysis'),
meta: { title: '真实奖衔分析' } meta: { title: '荣誉奖衔分析' }
}, { }, {
path: 'gradeRecord', path: 'gradeRecord',
name: 'GradeRecord', name: 'GradeRecord',

View File

@ -116,7 +116,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="ruleForm.websiteType == 1" :span="4"> <el-col v-if="ruleForm.websiteType == 1" :span="4">
<el-form-item prop="awards" :label="'真实奖衔'"> <el-form-item prop="awards" :label="'荣誉奖衔'">
<el-select <el-select
v-model="ruleForm.awards" v-model="ruleForm.awards"
clearable clearable

View File

@ -180,7 +180,7 @@
<div v-else-if="scope.row.noticeGradeVOList.length==1"> {{ scope.row.noticeGradeVOList[0].gradeKeyVal }}</div> <div v-else-if="scope.row.noticeGradeVOList.length==1"> {{ scope.row.noticeGradeVOList[0].gradeKeyVal }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="200" prop="awardsVOList" :label="'真实奖衔'"> <el-table-column align="center" width="200" prop="awardsVOList" :label="'荣誉奖衔'">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.awardsVOList.length>2"> <div v-if="scope.row.awardsVOList.length>2">

View File

@ -93,7 +93,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-show="ruleForm.websiteType == 1"> <el-col :span="4" v-show="ruleForm.websiteType == 1">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"

View File

@ -55,7 +55,7 @@
<div class="divBox">{{ '会员编号' }}</div> <div class="divBox">{{ '会员编号' }}</div>
<div class="divBox">{{ '会员姓名' }}</div> <div class="divBox">{{ '会员姓名' }}</div>
<div class="divBox">{{ '注册等级' }}</div> <div class="divBox">{{ '注册等级' }}</div>
<div class="divBox">{{'真实奖衔'}}</div> <div class="divBox">{{'荣誉奖衔'}}</div>
</div> </div>
<div v-for="item in memberList" style="display: flex"> <div v-for="item in memberList" style="display: flex">
<div class="divBox tops overflow1" :title="item.memberCode">{{ item.memberCode }}</div> <div class="divBox tops overflow1" :title="item.memberCode">{{ item.memberCode }}</div>
@ -418,7 +418,7 @@ export default {
}) })
}, },
getData() { getData() {
// //
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows this.awardsList = res.rows
}) })

View File

@ -17,7 +17,7 @@
width="200px" width="200px"
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column align="center" prop="coachAlgebra" :label="'培育代数'"> <el-table-column align="center" prop="coachAlgebra" :label="'培育代数'">
<template slot-scope="scope"> <template slot-scope="scope">

View File

@ -122,7 +122,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -36,7 +36,7 @@
>{{ item.gradeName }}</el-checkbox> >{{ item.gradeName }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<div class="tit">{{ '真实奖衔' }}</div> <div class="tit">{{ '荣誉奖衔' }}</div>
<div class="xian" /> <div class="xian" />
<div class="pod"> <div class="pod">
<el-checkbox-group v-model="formData.pkAwardsList"> <el-checkbox-group v-model="formData.pkAwardsList">

View File

@ -105,7 +105,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"

View File

@ -146,7 +146,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
width="180" width="180"
> >
</el-table-column> </el-table-column>
@ -392,7 +392,7 @@ export default {
this.memberTypeList = res.data; this.memberTypeList = res.data;
}); });
}, },
// //
getAwardsListChiose() { getAwardsListChiose() {
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows; this.awardsList = res.rows;

View File

@ -108,7 +108,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="$t('真实奖衔')" :label="$t('荣誉奖衔')"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -49,7 +49,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="dnames" prop="dnames"
:label="'真实奖衔'" :label="'荣誉奖衔'"
width="auto" width="auto"
> >
</el-table-column> </el-table-column>

View File

@ -61,7 +61,7 @@
:label="'注册权限'" :label="'注册权限'"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" prop="pkAwardsVal" :label="'真实奖衔'"> <el-table-column align="center" prop="pkAwardsVal" :label="'荣誉奖衔'">
</el-table-column> </el-table-column>
<el-table-column align="center" prop="anames" :label="'直推范围'"> <el-table-column align="center" prop="anames" :label="'直推范围'">
</el-table-column> </el-table-column>
@ -152,7 +152,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select clearable v-model="form.pkAwards" placeholder=""> <el-select clearable v-model="form.pkAwards" placeholder="">
<el-option <el-option
v-for="item in pkAwardsList" v-for="item in pkAwardsList"
@ -299,7 +299,7 @@ export default {
updateShow: false, updateShow: false,
countryList: [], // countryList: [], //
gradeValueList: [], // gradeValueList: [], //
pkAwardsList: [], // pkAwardsList: [], //
censusValueList: [], // censusValueList: [], //
registerAuthorityList: [], // registerAuthorityList: [], //
gradeRangList: [], // gradeRangList: [], //
@ -308,7 +308,7 @@ export default {
gradeName: "", // gradeName: "", //
censusValue: "", // censusValue: "", //
startValue: "", //, startValue: "", //,
pkAwards: "", // pkAwards: "", //
registerAuthority: "", // registerAuthority: "", //
gradeRang: [], // gradeRang: [], //
gradeValue:"",// gradeValue:"",//
@ -326,7 +326,7 @@ export default {
{ required: true, message: "请输入注册金额", trigger: "blur" }, { required: true, message: "请输入注册金额", trigger: "blur" },
], ],
pkAwards: [ pkAwards: [
{ required: true, message: "请选择真实奖衔", trigger: "change" }, { required: true, message: "请选择荣誉奖衔", trigger: "change" },
], ],
registerAuthority: [ registerAuthority: [
{ required: true, message: "请选择注册权限", trigger: "change" }, { required: true, message: "请选择注册权限", trigger: "change" },
@ -392,7 +392,7 @@ export default {
}); });
}, },
// //
getAwardsListChiose() { getAwardsListChiose() {
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.pkAwardsList = res.rows; this.pkAwardsList = res.rows;

View File

@ -37,7 +37,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
width="180" width="180"
> >
</el-table-column> </el-table-column>

View File

@ -62,7 +62,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="dnames" prop="dnames"
:label="'真实奖衔'" :label="'荣誉奖衔'"
width="auto" width="auto"
> >
</el-table-column> </el-table-column>

View File

@ -94,7 +94,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -195,7 +195,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select v-model="form.pkAwards" clearable placeholder=""> <el-select v-model="form.pkAwards" clearable placeholder="">
<el-option <el-option
v-for="item in pkAwardsList" v-for="item in pkAwardsList"
@ -418,7 +418,7 @@ export default {
updateShow: false, updateShow: false,
countryList: [], // countryList: [], //
gradeValueList: [], // gradeValueList: [], //
pkAwardsList: [], // pkAwardsList: [], //
censusValueList: [], // censusValueList: [], //
registerAuthorityList: [], // registerAuthorityList: [], //
gradeRangList: [], // gradeRangList: [], //
@ -427,7 +427,7 @@ export default {
gradeName: '', // gradeName: '', //
censusValue: '', // censusValue: '', //
startValue: '', // , startValue: '', // ,
pkAwards: '', // pkAwards: '', //
registerAuthority: '', // registerAuthority: '', //
gradeRang: [], // gradeRang: [], //
gradeValue: '', // gradeValue: '', //
@ -453,7 +453,7 @@ export default {
{ required: true, message: '请输入注册金额', trigger: 'blur' } { required: true, message: '请输入注册金额', trigger: 'blur' }
], ],
pkAwards: [ pkAwards: [
{ required: true, message: '请选择真实奖衔', trigger: 'change' } { required: true, message: '请选择荣誉奖衔', trigger: 'change' }
], ],
registerAuthority: [ registerAuthority: [
{ required: true, message: '请选择注册权限', trigger: 'change' } { required: true, message: '请选择注册权限', trigger: 'change' }
@ -532,7 +532,7 @@ export default {
}) })
}, },
// //
getAwardsListChiose() { getAwardsListChiose() {
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.pkAwardsList = res.rows this.pkAwardsList = res.rows

View File

@ -52,7 +52,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -99,7 +99,7 @@
<el-table-column align="center" prop="phone" :label="'联系方式'" /> <el-table-column align="center" prop="phone" :label="'联系方式'" />
<el-table-column align="center" prop="registerGradeVal" :label="'注册等级'" /> <el-table-column align="center" prop="registerGradeVal" :label="'注册等级'" />
<el-table-column align="center" prop="settleGradeVal" :label="'结算等级'" /> <el-table-column align="center" prop="settleGradeVal" :label="'结算等级'" />
<el-table-column align="center" prop="awardsVal" :label="'真实奖衔'" /> <el-table-column align="center" prop="awardsVal" :label="'荣誉奖衔'" />
</el-table> </el-table>
</div> </div>
</div> </div>
@ -360,7 +360,7 @@ export default {
this.$router.push('/configManage/smsRecord/addSms?status=1&state=1') this.$router.push('/configManage/smsRecord/addSms?status=1&state=1')
}, },
getData() { getData() {
// //
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows this.awardsList = res.rows
}) })

View File

@ -377,7 +377,7 @@ export default {
}) })
}, },
getData() { getData() {
// //
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows this.awardsList = res.rows
}) })

View File

@ -94,7 +94,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column align="center" prop="vertexName" label="所属体系" /> <el-table-column align="center" prop="vertexName" label="所属体系" />
<el-table-column <el-table-column

View File

@ -251,7 +251,7 @@ export default {
}) })
}, },
getData() { getData() {
// //
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows this.awardsList = res.rows
}) })

View File

@ -158,11 +158,11 @@
"value": "memberName" "value": "memberName"
}, },
{ {
"label": "变更前真实奖衔", "label": "变更前荣誉奖衔",
"value": "oldValue" "value": "oldValue"
}, },
{ {
"label": "变更后真实奖衔", "label": "变更后荣誉奖衔",
"value": "newValue" "value": "newValue"
}, },
{ {
@ -183,11 +183,11 @@
"value": "memberName" "value": "memberName"
}, },
{ {
"label": "变更前历史最高真实奖衔", "label": "变更前历史最高荣誉奖衔",
"value": "oldValue" "value": "oldValue"
}, },
{ {
"label": "变更后历史最高真实奖衔", "label": "变更后历史最高荣誉奖衔",
"value": "newValue" "value": "newValue"
} }
] ]
@ -603,7 +603,6 @@
"label": "政策币扣除比例", "label": "政策币扣除比例",
"value": "deductMoney" "value": "deductMoney"
} }
] ]
}, },
{ {
@ -618,7 +617,7 @@
"value": "memberName" "value": "memberName"
}, },
{ {
"label": "真实奖衔", "label": "荣誉奖衔",
"value": "realAwardsKeyVal" "value": "realAwardsKeyVal"
}, },
{ {
@ -663,7 +662,7 @@
"value": "memberName" "value": "memberName"
}, },
{ {
"label": "真实奖衔", "label": "荣誉奖衔",
"value": "realAwardsKeyVal" "value": "realAwardsKeyVal"
}, },
{ {
@ -708,7 +707,7 @@
"value": "memberName" "value": "memberName"
}, },
{ {
"label": "真实奖衔", "label": "荣誉奖衔",
"value": "realAwardsKeyVal" "value": "realAwardsKeyVal"
}, },
{ {
@ -902,7 +901,8 @@
"value": "newValue" "value": "newValue"
} }
] ]
}, { },
{
"id": 137, "id": 137,
"textList": [ "textList": [
{ {
@ -935,7 +935,7 @@
"value": "memberName" "value": "memberName"
}, },
{ {
"label": "真实奖衔", "label": "荣誉奖衔",
"value": "awardTransactionVal" "value": "awardTransactionVal"
}, },
{ {
@ -956,7 +956,7 @@
"value": "memberName" "value": "memberName"
}, },
{ {
"label": "真实奖衔", "label": "荣誉奖衔",
"value": "awardTransactionVal" "value": "awardTransactionVal"
}, },
{ {
@ -977,7 +977,7 @@
"value": "memberName" "value": "memberName"
}, },
{ {
"label": "真实奖衔", "label": "荣誉奖衔",
"value": "awardTransactionVal" "value": "awardTransactionVal"
}, },
{ {
@ -998,7 +998,7 @@
"value": "memberName" "value": "memberName"
}, },
{ {
"label": "真实奖衔", "label": "荣誉奖衔",
"value": "awardVal" "value": "awardVal"
}, },
{ {
@ -1019,7 +1019,7 @@
"value": "memberName" "value": "memberName"
}, },
{ {
"label": "真实奖衔", "label": "荣誉奖衔",
"value": "awardVal" "value": "awardVal"
}, },
{ {
@ -1365,7 +1365,6 @@
"label": "退单编号", "label": "退单编号",
"value": "orderCode" "value": "orderCode"
} }
] ]
}, },
{ {
@ -1498,7 +1497,8 @@
{ {
"label": "产品业绩(PV)", "label": "产品业绩(PV)",
"value": "achievement" "value": "achievement"
},{ },
{
"label": "产品业绩(BV)", "label": "产品业绩(BV)",
"value": "assAchievement" "value": "assAchievement"
}, },
@ -1506,8 +1506,6 @@
"label": "操作", "label": "操作",
"value": "action" "value": "action"
} }
] ]
}, },
{ {
@ -1642,7 +1640,7 @@
"value": "jsVal" "value": "jsVal"
}, },
{ {
"label": "真实奖衔", "label": "荣誉奖衔",
"value": "zsVal" "value": "zsVal"
}, },
{ {
@ -1708,7 +1706,7 @@
"value": "jsVal" "value": "jsVal"
}, },
{ {
"label": "真实奖衔", "label": "荣誉奖衔",
"value": "zsVal" "value": "zsVal"
}, },
{ {
@ -2067,7 +2065,6 @@
"label": "充值已购买次数", "label": "充值已购买次数",
"value": "num" "value": "num"
} }
] ]
}, },
{ {
@ -2085,7 +2082,6 @@
"label": "充值未购买次数", "label": "充值未购买次数",
"value": "num" "value": "num"
} }
] ]
}, },
{ {
@ -2234,7 +2230,8 @@
"value": "actExplain" "value": "actExplain"
} }
] ]
}, { },
{
"id": 739, "id": 739,
"textList": [ "textList": [
{ {
@ -2254,7 +2251,8 @@
"value": "actExplain" "value": "actExplain"
} }
] ]
}, { },
{
"id": 740, "id": 740,
"textList": [ "textList": [
{ {
@ -2337,7 +2335,8 @@
"value": "actExplain" "value": "actExplain"
} }
] ]
},{ },
{
"id": 749, "id": 749,
"textList": [ "textList": [
{ {
@ -2357,7 +2356,8 @@
"value": "actExplain" "value": "actExplain"
} }
] ]
},{ },
{
"id": 750, "id": 750,
"textList": [ "textList": [
{ {
@ -2377,7 +2377,8 @@
"value": "actExplain" "value": "actExplain"
} }
] ]
},{ },
{
"id": 751, "id": 751,
"textList": [ "textList": [
{ {
@ -2855,7 +2856,8 @@
{ {
"label": "资质8", "label": "资质8",
"value": "aptitude8" "value": "aptitude8"
}, { },
{
"label": "证书", "label": "证书",
"value": "certificate" "value": "certificate"
} }
@ -2912,7 +2914,6 @@
"label": "纳税人登记号", "label": "纳税人登记号",
"value": "taxpayerid" "value": "taxpayerid"
} }
] ]
}, },
{ {
@ -2934,7 +2935,6 @@
"label": "BV", "label": "BV",
"value": "orderAssAchieve" "value": "orderAssAchieve"
} }
], ],
"textList2": [ "textList2": [
{ {
@ -2953,7 +2953,6 @@
"label": "BV", "label": "BV",
"value": "orderAssAchieve" "value": "orderAssAchieve"
} }
] ]
}, },
{ {
@ -3019,5 +3018,4 @@
} }
] ]
} }
] ]

View File

@ -30,7 +30,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select clearable <el-select clearable
:placeholder="'请选择'" :placeholder="'请选择'"
v-model="select.pkAward"> v-model="select.pkAward">
@ -190,7 +190,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="awardTransactionVal" prop="awardTransactionVal"
:label="'真实奖衔'"> :label="'荣誉奖衔'">
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="vertexName" prop="vertexName"

View File

@ -727,7 +727,7 @@ export default {
memberName: '', // memberName: '', //
phone: '', // phone: '', //
changeNumber: '', // changeNumber: '', //
pkAwards: '', // pkAwards: '', //
vertexId: '', // vertexId: '', //
teamId: '', // teamId: '', //
registerAuthority: '', // registerAuthority: '', //
@ -753,7 +753,7 @@ export default {
// //
isActive: false, isActive: false,
total: 0, total: 0,
awardsList: [], // awardsList: [], //
vertexList: [], // vertexList: [], //
memberteamList: [], // memberteamList: [], //
registerList: [], // registerList: [], //
@ -971,7 +971,7 @@ export default {
this.vertexList = res.data this.vertexList = res.data
}) })
}, },
// //
getAwardsListChiose() { getAwardsListChiose() {
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows this.awardsList = res.rows

View File

@ -31,7 +31,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="当月奖衔"> <el-form-item label="荣誉奖衔">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -112,7 +112,7 @@
<el-table-column align="center" prop="memberCode" label="会员编号" /> <el-table-column align="center" prop="memberCode" label="会员编号" />
<el-table-column align="center" prop="memberName" label="会员姓名" /> <el-table-column align="center" prop="memberName" label="会员姓名" />
<el-table-column align="center" prop="phone" label="联系方式" /> <el-table-column align="center" prop="phone" label="联系方式" />
<el-table-column align="center" prop="awardsName" label="当月奖衔" /> <el-table-column align="center" prop="awardsName" label="荣誉奖衔" />
<el-table-column <el-table-column
align="center" align="center"
@ -184,7 +184,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50,
}, },
awardsList: [], // awardsList: [], //
vertexList: [], // vertexList: [], //
gradeRangList: [], // gradeRangList: [], //
total: 0, total: 0,

View File

@ -33,7 +33,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
v-model="queryParams.pkAwards" v-model="queryParams.pkAwards"
clearable clearable
@ -219,7 +219,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -418,7 +418,7 @@ export default {
changed: false changed: false
}, },
{ {
name: '真实奖衔控制', name: '荣誉奖衔控制',
path: 'awardControl', path: 'awardControl',
changed: false changed: false
}, },
@ -453,7 +453,7 @@ export default {
isActive: false, isActive: false,
total: 0, total: 0,
gradeRangList: [], // gradeRangList: [], //
awardsList: [], // awardsList: [], //
vertexList: [], // vertexList: [], //
memberteamList: [], // memberteamList: [], //
registerList: [], // registerList: [], //
@ -561,7 +561,7 @@ export default {
getvertexValue().then((res) => { getvertexValue().then((res) => {
this.vertexList = res.data this.vertexList = res.data
}) })
// //
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows this.awardsList = res.rows
}) })

View File

@ -402,7 +402,7 @@ export default {
menuList: [ menuList: [
{ {
id: 0, id: 0,
text: '真实奖衔', text: '荣誉奖衔',
checked: false, checked: false,
key: 'realAwards' key: 'realAwards'
}, },
@ -414,13 +414,13 @@ export default {
}, },
{ {
id: 2, id: 2,
text: '当月奖衔', text: '荣誉奖衔',
checked: false, checked: false,
key: 'dividendAward' key: 'dividendAward'
}, },
{ {
id: 3, id: 3,
text: '当月奖衔', text: '荣誉奖衔',
checked: false, checked: false,
key: 'extremeAwards' key: 'extremeAwards'
}, },

View File

@ -448,7 +448,7 @@ export default {
// //
isActive: false, isActive: false,
total: 0, total: 0,
awardsList: [], // awardsList: [], //
vertexList: [], // vertexList: [], //
memberteamList: [], // memberteamList: [], //
registerList: [], // registerList: [], //
@ -619,7 +619,7 @@ export default {
this.vertexList = res.data this.vertexList = res.data
}) })
}, },
// //
getAwardsListChiose() { getAwardsListChiose() {
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows this.awardsList = res.rows

View File

@ -821,7 +821,7 @@ export default {
changed: false changed: false
}, },
{ {
name: '真实奖衔控制', name: '荣誉奖衔控制',
path: 'awardControl', path: 'awardControl',
changed: false changed: false
}, },

View File

@ -36,7 +36,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select <el-select
v-model="select.pkAwards" v-model="select.pkAwards"
clearable clearable
@ -147,7 +147,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
label="真实奖衔" label="荣誉奖衔"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -344,7 +344,7 @@ export default {
changed: false changed: false
}, },
{ {
name: '真实奖衔控制', name: '荣誉奖衔控制',
path: 'awardControl', path: 'awardControl',
changed: false changed: false
}, },
@ -400,7 +400,7 @@ export default {
getvertexValue().then((res) => { getvertexValue().then((res) => {
this.vertexList = res.data this.vertexList = res.data
}) })
// //
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows this.awardsList = res.rows
}) })

View File

@ -17,7 +17,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" style="margin-left: 0px"> <el-col :span="4" style="margin-left: 0px">
<el-form-item :label="'真实奖衔'" prop="status"> <el-form-item :label="'荣誉奖衔'" prop="status">
<el-select v-model="select.realAwards" clearable> <el-select v-model="select.realAwards" clearable>
<el-option <el-option
v-for="item in awardsList" v-for="item in awardsList"
@ -66,7 +66,7 @@
</el-col> </el-col>
<el-col :span="4" style="margin-left: 0px"> <el-col :span="4" style="margin-left: 0px">
<el-form-item :label="'当月奖衔'" prop="status"> <el-form-item :label="'荣誉奖衔'" prop="status">
<el-select v-model="select.extremeAwards" clearable> <el-select v-model="select.extremeAwards" clearable>
<el-option <el-option
v-for="item in awardsList" v-for="item in awardsList"
@ -192,7 +192,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="realAwardsKeyVal" prop="realAwardsKeyVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -207,7 +207,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="extremeAwardsKeyVal" prop="extremeAwardsKeyVal"
:label="'当月奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -332,7 +332,7 @@ export default {
changed: false changed: false
}, },
{ {
name: '真实奖衔控制', name: '荣誉奖衔控制',
path: 'awardControl', path: 'awardControl',
changed: false changed: false
}, },
@ -430,7 +430,7 @@ export default {
this.download( this.download(
'/member/manage/awards-control/export', '/member/manage/awards-control/export',
Object.assign({}, this.queryParams, this.select), Object.assign({}, this.queryParams, this.select),
`真实奖衔控制${new Date().getTime()}.xlsx` `荣誉奖衔控制${new Date().getTime()}.xlsx`
) )
}) })
}, },

View File

@ -11,7 +11,7 @@
* @Date: 2023-02-23 15:59:57 * @Date: 2023-02-23 15:59:57
--> -->
<template> <template>
<el-dialog :title="'真实奖衔控制'" <el-dialog :title="'荣誉奖衔控制'"
:visible.sync="isAward" :visible.sync="isAward"
width="80%" width="80%"
:before-close="handleClose" :before-close="handleClose"
@ -143,7 +143,7 @@
<el-table-column align="center" <el-table-column align="center"
width="140" width="140"
prop="realAwardsKeyVal" prop="realAwardsKeyVal"
:label="'真实奖衔'"> :label="'荣誉奖衔'">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.realAwards" <el-select v-model="scope.row.realAwards"
:disabled="select.addAwards == 2" :disabled="select.addAwards == 2"
@ -188,7 +188,7 @@
<el-table-column align="center" <el-table-column align="center"
width="140" width="140"
prop="extremeAwardsKeyVal" prop="extremeAwardsKeyVal"
:label="'当月奖衔'"> :label="'荣誉奖衔'">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.extremeAwards" <el-select v-model="scope.row.extremeAwards"
:disabled="select.addAwards == 2" :disabled="select.addAwards == 2"
@ -355,7 +355,7 @@ export default {
menuList: [ menuList: [
{ {
id: 0, id: 0,
text: '真实奖衔', text: '荣誉奖衔',
checked: false, checked: false,
key: 'realAwards', key: 'realAwards',
}, },
@ -367,13 +367,13 @@ export default {
}, },
{ {
id: 2, id: 2,
text: '当月奖衔', text: '荣誉奖衔',
checked: false, checked: false,
key: 'dividendAward', key: 'dividendAward',
}, },
{ {
id: 3, id: 3,
text: '当月奖衔', text: '荣誉奖衔',
checked: false, checked: false,
key: 'extremeAwards', key: 'extremeAwards',
}, },

View File

@ -238,11 +238,11 @@ export default {
this.allData.addAwards = this.$route.query.addAwards this.allData.addAwards = this.$route.query.addAwards
this.allData.processType = this.$route.query.processType this.allData.processType = this.$route.query.processType
if (this.allData.addAwards == 0) { if (this.allData.addAwards == 0) {
this.titTex = '真实奖衔控制新增会员如下' this.titTex = '荣誉奖衔控制新增会员如下'
} else if (this.allData.addAwards == 1) { } else if (this.allData.addAwards == 1) {
this.titTex = '真实奖衔控制修改会员如下' this.titTex = '荣誉奖衔控制修改会员如下'
} else if (this.allData.addAwards == 2) { } else if (this.allData.addAwards == 2) {
this.titTex = '真实奖衔控制删除会员如下' this.titTex = '荣誉奖衔控制删除会员如下'
} }
this.allData.approvalBusiness = this.$route.query.businessType this.allData.approvalBusiness = this.$route.query.businessType
this.getSignData([this.allData.approvalBusiness]) this.getSignData([this.allData.approvalBusiness])

View File

@ -441,10 +441,10 @@
align="center" align="center"
width="150" width="150"
prop="pkAwards" prop="pkAwards"
label="真实奖衔" label="荣誉奖衔"
> >
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<div>真实奖衔</div> <div>荣誉奖衔</div>
<el-select <el-select
v-model="changeData.pkAwards" v-model="changeData.pkAwards"
:placeholder="'请选择'" :placeholder="'请选择'"

View File

@ -502,13 +502,13 @@
align="center" align="center"
width="150" width="150"
prop="pkAwards" prop="pkAwards"
label="真实奖衔" label="荣誉奖衔"
> >
<template <template
slot="header" slot="header"
slot-scope="scope" slot-scope="scope"
> >
<div>真实奖衔</div> <div>荣誉奖衔</div>
<el-select <el-select
v-model="changeData.pkAwards" v-model="changeData.pkAwards"
:placeholder="'请选择'" :placeholder="'请选择'"

View File

@ -40,7 +40,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="真实奖衔"> <el-form-item label="荣誉奖衔">
<el-input clearable <el-input clearable
v-model="select.pkAwards"></el-input> v-model="select.pkAwards"></el-input>
</el-form-item> </el-form-item>
@ -156,7 +156,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="pkAwardKeyVal" prop="pkAwardKeyVal"
label="真实奖衔"> label="荣誉奖衔">
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="backAmount" prop="backAmount"

View File

@ -138,7 +138,7 @@
</el-col> </el-col>
<!-- 第三行 --> <!-- 第三行 -->
<el-col :span="4"> <el-col :span="4">
<el-form-item required :label="'真实奖衔'" prop="userAwards"> <el-form-item required :label="'荣誉奖衔'" prop="userAwards">
<el-select v-model="form.userAwards" clearable> <el-select v-model="form.userAwards" clearable>
<el-option <el-option
v-for="item in pkAwardsList" v-for="item in pkAwardsList"
@ -682,7 +682,7 @@ export default {
changed: false changed: false
}, },
{ {
name: '真实奖衔控制', name: '荣誉奖衔控制',
path: 'awardControl', path: 'awardControl',
changed: false changed: false
}, },
@ -710,7 +710,7 @@ export default {
azname: '', // azname: '', //
memberName: '', // memberName: '', //
phone: '', // phone: '', //
userAwards: '', // userAwards: '', //
userAwards: '', // userAwards: '', //
zclx: '1', // zclx: '1', //
backfillPrice: '', // backfillPrice: '', //
@ -770,7 +770,7 @@ export default {
presaleStatusList: [], // presaleStatusList: [], //
yesornoList: [], // yesornoList: [], //
cardTypeList: [], // cardTypeList: [], //
pkAwardsList: [], // pkAwardsList: [], //
gradeAllList: [], // gradeAllList: [], //
placeDeptList: [], // placeDeptList: [], //
countryAllList: [], // / countryAllList: [], // /

View File

@ -54,7 +54,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsVal" prop="awardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
width="180" width="180"
> >
</el-table-column> </el-table-column>
@ -148,7 +148,7 @@ export default {
}, },
], ],
gradeRangList: [], // gradeRangList: [], //
awardsList: [], // awardsList: [], //
vertexList: [], // vertexList: [], //
memberteamList: [], // memberteamList: [], //
delList: [], delList: [],
@ -166,7 +166,7 @@ export default {
getgradeRanglist().then((res) => { getgradeRanglist().then((res) => {
this.gradeRangList = res.data; this.gradeRangList = res.data;
}); });
// //
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows; this.awardsList = res.rows;
}); });

View File

@ -41,7 +41,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
v-model="queryParams.pkAwards" v-model="queryParams.pkAwards"
clearable clearable
@ -118,7 +118,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -456,7 +456,7 @@ export default {
changed: false changed: false
}, },
{ {
name: '真实奖衔控制', name: '荣誉奖衔控制',
path: 'awardControl', path: 'awardControl',
changed: false changed: false
}, },

View File

@ -401,7 +401,7 @@ export default {
changed: false changed: false
}, },
{ {
name: '真实奖衔控制', name: '荣誉奖衔控制',
path: 'awardControl', path: 'awardControl',
changed: false changed: false
}, },

View File

@ -72,7 +72,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsVal" prop="awardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -459,7 +459,7 @@ export default {
changed: false changed: false
}, },
{ {
name: '真实奖衔控制', name: '荣誉奖衔控制',
path: 'awardControl', path: 'awardControl',
changed: false changed: false
}, },

View File

@ -451,7 +451,7 @@ export default {
changed: false changed: false
}, },
{ {
name: '真实奖衔控制', name: '荣誉奖衔控制',
path: 'awardControl', path: 'awardControl',
changed: false changed: false
}, },

View File

@ -20,7 +20,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select <el-select
v-model="queryParams.pkAwards" v-model="queryParams.pkAwards"
clearable clearable
@ -196,7 +196,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsVal" prop="awardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -582,7 +582,7 @@ export default {
changed: false changed: false
}, },
{ {
name: '真实奖衔控制', name: '荣誉奖衔控制',
path: 'awardControl', path: 'awardControl',
changed: false changed: false
}, },

View File

@ -80,7 +80,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'当月奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select <el-select
v-model="select.pkAwards" v-model="select.pkAwards"
clearable clearable
@ -197,7 +197,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'当月奖衔'" :label="'荣誉奖衔'"
width="180" width="180"
/> />
<el-table-column <el-table-column
@ -363,7 +363,7 @@ export default {
} }
], ],
gradeRangList: [], // gradeRangList: [], //
awardsList: [], // awardsList: [], //
vertexList: [], // vertexList: [], //
memberteamList: [], // memberteamList: [], //
delList: [], delList: [],
@ -381,7 +381,7 @@ export default {
getgradeRanglist().then((res) => { getgradeRanglist().then((res) => {
this.gradeRangList = res.data this.gradeRangList = res.data
}) })
// //
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows this.awardsList = res.rows
}) })

View File

@ -23,7 +23,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select v-model="select.pkAwards" <el-select v-model="select.pkAwards"
clearable clearable
placeholder=""> placeholder="">
@ -162,7 +162,7 @@
align="center" align="center"
prop="pkAwardsStr" prop="pkAwardsStr"
width="130" width="130"
:label="'真实奖衔'" /> :label="'荣誉奖衔'" />
<el-table-column align="center" <el-table-column align="center"
prop="resettleLevel" prop="resettleLevel"
width="130" width="130"

View File

@ -86,7 +86,7 @@
<el-checkbox class="flexed_l" <el-checkbox class="flexed_l"
:disabled="lookOver" :disabled="lookOver"
@change="getCheckTit($event,2)" @change="getCheckTit($event,2)"
v-model="ruleForm.checked2">{{'真实奖衔'}}</el-checkbox> v-model="ruleForm.checked2">{{'荣誉奖衔'}}</el-checkbox>
<el-checkbox-group v-model="ruleForm.realList" <el-checkbox-group v-model="ruleForm.realList"
:disabled="lookOver" :disabled="lookOver"
@change="getCheck"> @change="getCheck">

View File

@ -61,7 +61,7 @@
</div> </div>
<div class="flexed"> <div class="flexed">
<el-checkbox class="flexed_l" @change="getCheckTit($event, 2)" <el-checkbox class="flexed_l" @change="getCheckTit($event, 2)"
v-model="ruleForm.checked2">{{ '真实奖衔' }}</el-checkbox> v-model="ruleForm.checked2">{{ '荣誉奖衔' }}</el-checkbox>
<el-checkbox-group v-model="ruleForm.realList" @change="getCheck"> <el-checkbox-group v-model="ruleForm.realList" @change="getCheck">
<el-checkbox v-for="item in awardsList" :key="item.pkId" :label="item.pkId">{{ item.awardsName <el-checkbox v-for="item in awardsList" :key="item.pkId" :label="item.pkId">{{ item.awardsName
}}</el-checkbox> }}</el-checkbox>

View File

@ -86,7 +86,7 @@
<el-checkbox class="flexed_l" <el-checkbox class="flexed_l"
:disabled="lookOver" :disabled="lookOver"
@change="getCheckTit($event,2)" @change="getCheckTit($event,2)"
v-model="ruleForm.checked2">{{'真实奖衔'}}</el-checkbox> v-model="ruleForm.checked2">{{'荣誉奖衔'}}</el-checkbox>
<el-checkbox-group v-model="ruleForm.realList" <el-checkbox-group v-model="ruleForm.realList"
:disabled="lookOver" :disabled="lookOver"
@change="getCheck"> @change="getCheck">

View File

@ -93,7 +93,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>

View File

@ -122,7 +122,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column align="center" prop="legalRightOldVal" label="升级前权益"> <el-table-column align="center" prop="legalRightOldVal" label="升级前权益">

View File

@ -81,7 +81,7 @@
<div class="flexed"> <div class="flexed">
<el-checkbox class="flexed_l" <el-checkbox class="flexed_l"
@change="getCheckTit($event,2)" @change="getCheckTit($event,2)"
v-model="ruleForm.checked2">{{'真实奖衔'}}</el-checkbox> v-model="ruleForm.checked2">{{'荣誉奖衔'}}</el-checkbox>
<el-checkbox-group v-model="ruleForm.realList" <el-checkbox-group v-model="ruleForm.realList"
@change="getCheck"> @change="getCheck">
<el-checkbox v-for="item in awardsList" <el-checkbox v-for="item in awardsList"

View File

@ -87,7 +87,7 @@
class="flexed_l" class="flexed_l"
@change="getCheckTit($event, 2)" @change="getCheckTit($event, 2)"
v-model="ruleForm.checked2" v-model="ruleForm.checked2"
>{{'真实奖衔'}}</el-checkbox >{{'荣誉奖衔'}}</el-checkbox
> >
<el-checkbox-group <el-checkbox-group
v-model="ruleForm.realList" v-model="ruleForm.realList"

View File

@ -35,7 +35,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -129,7 +129,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -549,7 +549,7 @@ export default {
// }); // });
}, },
getOthers() { getOthers() {
// //
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows; this.awardsList = res.rows;
}); });

View File

@ -91,7 +91,7 @@
class="flexed_l" class="flexed_l"
@change="getCheckTit($event, 2)" @change="getCheckTit($event, 2)"
v-model="ruleForm.checked2" v-model="ruleForm.checked2"
>{{ '真实奖衔' }}</el-checkbox >{{ '荣誉奖衔' }}</el-checkbox
> >
<el-checkbox-group <el-checkbox-group
v-model="ruleForm.realList" v-model="ruleForm.realList"

View File

@ -86,7 +86,7 @@
:disabled="lookOver" :disabled="lookOver"
class="flexed_l" class="flexed_l"
@change="getCheckTit($event, 2)" @change="getCheckTit($event, 2)"
>{{'真实奖衔'}}</el-checkbox> >{{'荣誉奖衔'}}</el-checkbox>
<el-checkbox-group <el-checkbox-group
v-model="ruleForm.realList" v-model="ruleForm.realList"
:disabled="lookOver" :disabled="lookOver"

View File

@ -54,7 +54,7 @@
<tr style="border-top:0"> <tr style="border-top:0">
<td colspan="4">{{'活动图片'}}</td> <td colspan="4">{{'活动图片'}}</td>
<td colspan="4">{{'活动名称'}}</td> <td colspan="4">{{'活动名称'}}</td>
<td colspan="4">{{'真实奖衔'}}</td> <td colspan="4">{{'荣誉奖衔'}}</td>
<td colspan="4">{{ '价格' }}(¥)</td> <td colspan="4">{{ '价格' }}(¥)</td>
<td colspan="4">{{ '数量' }}</td> <td colspan="4">{{ '数量' }}</td>

View File

@ -57,7 +57,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select clearable v-model="select.pkAwards"> <el-select clearable v-model="select.pkAwards">
<el-option <el-option
v-for="item in awardsChioseList" v-for="item in awardsChioseList"
@ -150,7 +150,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsStr" prop="awardsStr"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"

View File

@ -80,7 +80,7 @@
<div class="flexed"> <div class="flexed">
<el-checkbox class="flexed_l" <el-checkbox class="flexed_l"
@change="getCheckTit($event,2)" @change="getCheckTit($event,2)"
v-model="ruleForm.checked2">{{'真实奖衔'}}</el-checkbox> v-model="ruleForm.checked2">{{'荣誉奖衔'}}</el-checkbox>
<el-checkbox-group v-model="ruleForm.realList" <el-checkbox-group v-model="ruleForm.realList"
@change="getCheck"> @change="getCheck">
<el-checkbox v-for="item in awardsList" <el-checkbox v-for="item in awardsList"

View File

@ -86,7 +86,7 @@
<el-checkbox class="flexed_l" <el-checkbox class="flexed_l"
:disabled="lookOver" :disabled="lookOver"
@change="getCheckTit($event,2)" @change="getCheckTit($event,2)"
v-model="ruleForm.checked2">{{'真实奖衔'}}</el-checkbox> v-model="ruleForm.checked2">{{'荣誉奖衔'}}</el-checkbox>
<el-checkbox-group v-model="ruleForm.realList" <el-checkbox-group v-model="ruleForm.realList"
:disabled="lookOver" :disabled="lookOver"
@change="getCheck"> @change="getCheck">

View File

@ -126,7 +126,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="awardsVal" prop="awardsVal"
:label="'真实奖衔'"> :label="'荣誉奖衔'">
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="vertexName" prop="vertexName"

View File

@ -98,7 +98,7 @@
:disabled="lookOver" :disabled="lookOver"
@change="getCheckTit($event, 2)" @change="getCheckTit($event, 2)"
v-model="ruleForm.checked2" v-model="ruleForm.checked2"
>{{ '真实奖衔' }}</el-checkbox >{{ '荣誉奖衔' }}</el-checkbox
> >
<el-checkbox-group <el-checkbox-group
v-model="ruleForm.realList" v-model="ruleForm.realList"

View File

@ -91,7 +91,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column

View File

@ -33,7 +33,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select <el-select
v-model="select.pkAwards" v-model="select.pkAwards"
clearable clearable
@ -211,7 +211,7 @@
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
width="130" width="130"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"

View File

@ -34,7 +34,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select <el-select
v-model="select.pkAwards" v-model="select.pkAwards"
clearable clearable
@ -240,7 +240,7 @@
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
width="130" width="130"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"

View File

@ -300,7 +300,7 @@
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
width="130" width="130"
:label="'当月奖衔'" :label="'荣誉奖衔'"
/> />
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- v-for="item in menuList"--> <!-- v-for="item in menuList"-->

View File

@ -42,7 +42,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'当月奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select <el-select
v-model="queryParams.pkAwards" v-model="queryParams.pkAwards"
clearable clearable
@ -182,7 +182,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'当月奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -244,7 +244,7 @@ export default {
moren: 'awardAnalysis', moren: 'awardAnalysis',
topList: [ topList: [
{ {
name: '当月奖衔分析', name: '荣誉奖衔分析',
path: 'awardAnalysis' path: 'awardAnalysis'
} }
], ],
@ -314,7 +314,7 @@ export default {
{ {
...this.queryParams ...this.queryParams
}, },
`${'当月奖衔分析'}${new Date().getTime()}.xlsx` `${'荣誉奖衔分析'}${new Date().getTime()}.xlsx`
) )
} else { } else {
this.download( this.download(
@ -322,7 +322,7 @@ export default {
{ {
...this.queryParams ...this.queryParams
}, },
`${'当月奖衔分析'}${new Date().getTime()}.xlsx` `${'荣誉奖衔分析'}${new Date().getTime()}.xlsx`
) )
} }
}) })

View File

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="现真实奖衔" prop="pkAwards"> <el-form-item label="现荣誉奖衔" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -30,7 +30,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="原真实奖衔" prop="oldPkAwards"> <el-form-item label="原荣誉奖衔" prop="oldPkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -124,7 +124,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -100,7 +100,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -91,7 +91,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'"> :label="'荣誉奖衔'">
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="vertexName" prop="vertexName"

View File

@ -33,7 +33,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select v-model="select.pkAwards" <el-select v-model="select.pkAwards"
clearable clearable
:placeholder="'请选择'"> :placeholder="'请选择'">
@ -133,7 +133,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'"> :label="'荣誉奖衔'">
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="vertexName" prop="vertexName"

View File

@ -25,7 +25,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -191,7 +191,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -92,7 +92,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -105,7 +105,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>

View File

@ -52,7 +52,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select clearable <el-select clearable
:placeholder="'请选择'" :placeholder="'请选择'"
v-model="select.pkAwards"> v-model="select.pkAwards">
@ -144,7 +144,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'"> :label="'荣誉奖衔'">
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="vertexName" prop="vertexName"

View File

@ -52,7 +52,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select clearable <el-select clearable
:placeholder="'请选择'" :placeholder="'请选择'"
v-model="select.pkAwards"> v-model="select.pkAwards">
@ -144,7 +144,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'"> :label="'荣誉奖衔'">
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="vertexName" prop="vertexName"

View File

@ -79,7 +79,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -228,7 +228,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -122,7 +122,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>

View File

@ -25,7 +25,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -190,7 +190,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -26,7 +26,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
v-model="queryParams.pkAwards" v-model="queryParams.pkAwards"
clearable clearable
@ -162,7 +162,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"

View File

@ -63,7 +63,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'当月奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
v-model="queryParams.pkAwards" v-model="queryParams.pkAwards"
clearable clearable
@ -197,7 +197,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
label="当月奖衔" label="荣誉奖衔"
/> />
<el-table-column <el-table-column
align="center" align="center"

View File

@ -31,7 +31,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -117,7 +117,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -41,7 +41,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -206,7 +206,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -26,7 +26,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -191,7 +191,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -26,7 +26,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="oldLevel"> <el-form-item :label="'荣誉奖衔'" prop="oldLevel">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"

View File

@ -42,7 +42,7 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -213,7 +213,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -458,7 +458,7 @@ export default {
day = day >= 10 ? day : "0" + day; // day = day >= 10 ? day : "0" + day; //
return year + "-" + month + "-" + day + " "; return year + "-" + month + "-" + day + " ";
}, },
// //
getData() { getData() {
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows; this.awardsList = res.rows;

View File

@ -36,7 +36,7 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'"> <el-form-item :label="'荣誉奖衔'">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -204,7 +204,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -546,7 +546,7 @@ export default {
day = day >= 10 ? day : "0" + day; // day = day >= 10 ? day : "0" + day; //
return year + "-" + month + "-" + day + " "; return year + "-" + month + "-" + day + " ";
}, },
// //
getData() { getData() {
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows; this.awardsList = res.rows;

View File

@ -90,7 +90,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -290,7 +290,7 @@ export default {
`${this.$t("伞下直推新增业绩")}${new Date().getTime()}.xlsx` `${this.$t("伞下直推新增业绩")}${new Date().getTime()}.xlsx`
); );
}, },
// //
// getData() { // getData() {
// getAwardsListChiose().then((res) => { // getAwardsListChiose().then((res) => {
// this.awardsList = res.rows; // this.awardsList = res.rows;

View File

@ -110,7 +110,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'"> :label="'荣誉奖衔'">
</el-table-column> </el-table-column>
<el-table-column align="center" <el-table-column align="center"
prop="orderAmount" prop="orderAmount"

View File

@ -126,7 +126,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -349,7 +349,7 @@ export default {
day = day >= 10 ? day : "0" + day; // day = day >= 10 ? day : "0" + day; //
return year + "-" + month + "-" + day + " "; return year + "-" + month + "-" + day + " ";
}, },
// //
getData() { getData() {
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.awardsList = res.rows; this.awardsList = res.rows;

View File

@ -41,7 +41,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -191,7 +191,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -37,7 +37,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -202,7 +202,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -37,7 +37,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
<el-select <el-select
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
@ -202,7 +202,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="awardsName" prop="awardsName"
:label="'真实奖衔'" :label="'荣誉奖衔'"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -377,7 +377,7 @@ export default {
changed: false changed: false
}, },
{ {
menuName: '真实奖衔', menuName: '荣誉奖衔',
routeName: 'pkAwardsVal', routeName: 'pkAwardsVal',
changed: false changed: false
}, },
@ -523,7 +523,7 @@ export default {
changed: false changed: false
}, },
{ {
menuName: '真实奖衔', menuName: '荣誉奖衔',
routeName: 'pkAwardsStr', routeName: 'pkAwardsStr',
changed: false changed: false
}, },
@ -718,7 +718,7 @@ export default {
changed: false changed: false
}, },
{ {
menuName: '真实奖衔', menuName: '荣誉奖衔',
routeName: 'awardsVal', routeName: 'awardsVal',
changed: false changed: false
}, },
@ -847,7 +847,7 @@ export default {
changed: false changed: false
}, },
{ {
menuName: '真实奖衔', menuName: '荣誉奖衔',
routeName: 'pkAwardsVal', routeName: 'pkAwardsVal',
changed: false changed: false
}, },
@ -911,7 +911,7 @@ export default {
changed: false changed: false
}, },
{ {
menuName: '修改真实奖衔', menuName: '修改荣誉奖衔',
routeName: 'change_awards', routeName: 'change_awards',
changed: false changed: false
}, },
@ -1330,7 +1330,7 @@ export default {
changed: false changed: false
}, },
{ {
menuName: '真实奖衔', menuName: '荣誉奖衔',
routeName: 'pkAwardsVal', routeName: 'pkAwardsVal',
changed: false changed: false
}, },

View File

@ -24,7 +24,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="teamCode"> <el-form-item :label="'荣誉奖衔'" prop="teamCode">
<el-select v-model="queryParams.awardsId" clearable :placeholder="'请选择'"> <el-select v-model="queryParams.awardsId" clearable :placeholder="'请选择'">
<el-option <el-option
v-for="item,index in awardsList" v-for="item,index in awardsList"
@ -86,7 +86,7 @@
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column align="center" prop="thegrade" width="150" :label="'会员等级'" /> <el-table-column align="center" prop="thegrade" width="150" :label="'会员等级'" />
<el-table-column align="center" prop="theaward" width="150" :label="'真实奖衔'" /> <el-table-column align="center" prop="theaward" width="150" :label="'荣誉奖衔'" />
<el-table-column align="center" prop="roles" width="150" :label="'会员权限'" /> <el-table-column align="center" prop="roles" width="150" :label="'会员权限'" />
<el-table-column align="center" prop="themenus" width="800" :label="'菜单名称'" :show-overflow-tooltip="true"/> <el-table-column align="center" prop="themenus" width="800" :label="'菜单名称'" :show-overflow-tooltip="true"/>
<el-table-column align="center" prop="creationTime" :label="'创建日期'" width="200" /> <el-table-column align="center" prop="creationTime" :label="'创建日期'" width="200" />
@ -163,7 +163,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50,
gradeId: '', // gradeId: '', //
awardsId: '', // awardsId: '', //
menuId: '', // menuId: '', //
creationTime: [] // creationTime: [] //
}, },
@ -296,7 +296,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50,
gradeId: '', // gradeId: '', //
awardsId: '', // awardsId: '', //
menuId: '', // menuId: '', //
creationTime: [] // creationTime: [] //
} }