3
0
Fork 0

Compare commits

..

No commits in common. "04a5f057c25960c4438f6f48b033c43045155859" and "8f9732b6be3cf6984757305e87fb1919f939933e" have entirely different histories.

17 changed files with 948 additions and 813 deletions

View File

@ -2,4 +2,4 @@
ENV = 'development'
VUE_APP_BASE_API = '/prod-api'
VUE_APP_ADDRESS1 = 'http://bl-app.beida777.com/#/'
VUE_APP_ADDRESS1 = 'http://t-app.beida777.com/#/'

View File

@ -3,5 +3,4 @@ ENV = 'production'
# base api
VUE_APP_BASE_API = '/prod-api'
VUE_APP_ADDRESS1 = 'http://bl-app.beida777.com/#/'
VUE_APP_ADDRESS1 = 'http://t-app.beida777.com/#/'

View File

@ -2,7 +2,7 @@
"name": "vue-admin-template",
"version": "4.4.0",
"description": "A vue admin template with Element UI & axios & iconfont & permission control & lint",
"author": "windsword",
"author": "Pan <panfree23@gmail.com>",
"scripts": {
"dev": "vue-cli-service serve",
"build:prod": "vue-cli-service build",

View File

@ -248,9 +248,3 @@ export function approvalStatus(params) {
})
}
export function getCompanyAreaList() {
return request({
url: '/system/api/area/get-area-by-parentId?parentId=0',
method: 'get'
})
}

View File

@ -17,7 +17,7 @@ export function login(data) {
export function getInfo() {
return request({
url: '/system/manage/user/get-info',
method: 'get'
method: 'get',
})
}
// 管理员是否登录短信验证
@ -63,14 +63,14 @@ export function userCountryList(params) {
export function changeList(id) {
return request({
url: '/system/manage/user-country/change/' + id,
method: 'post'
method: 'post',
})
}
// 切换系统类型
export function changeSystemList(id) {
return request({
url: '/system/manage/system-type/change/' + id,
method: 'post'
method: 'post',
})
}
// 切换语言
@ -81,3 +81,11 @@ export function languages(params) {
params
})
}
// 切换语言
export function systemTypeList(params) {
return request({
url: '/system/manage/system-type/list',
method: 'get',
params
})
}

View File

@ -267,7 +267,7 @@
:label="'产品数量'"
/>
<!-- <el-table-column align="center" prop="barCode" :label="'追溯编号'" /> -->
<el-table-column align="center" prop="barCode" :label="'追溯编号'" />
<el-table-column
align="center"
prop="orderCode"

View File

@ -5,7 +5,7 @@
<breadcrumb class="breadcrumb-container" />
<div class="right-menu">
<div v-if="user.userType != 9" class="check">
<div class="check" v-if="user.userType != 9">
<!-- <el-select v-model="languageItem"
@change="setLanguage"
popper-class="selectCls"
@ -16,19 +16,32 @@
:value="item.value">
</el-option>
</el-select> -->
<el-select
v-model="systemItem"
@change="setSystem"
popper-class="selectCls"
size="mini"
>
<el-option
v-for="item in systemTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-dropdown trigger="click" placement="bottom-start">
<div class="kuang">
<div class="dropdown_i">
<img :src="ruleForm.nationalFlag2" alt="">
<img :src="ruleForm.nationalFlag2" alt="" />
<div>{{ ruleForm.name }}</div>
</div>
<i slot="suffix" class="el-icon-arrow-down" />
<i slot="suffix" class="el-icon-arrow-down"></i>
</div>
<el-dropdown-menu slot="dropdown" class="dropdown-container">
<el-dropdown-item v-for="(item, i) in countryList" :key="i">
<div class="dropdown_i" @click="handleClick(item)">
<img :src="item.nationalFlag2" alt="">
<img :src="item.nationalFlag2" alt="" />
<div>{{ item.name }}</div>
</div>
</el-dropdown-item>
@ -58,102 +71,114 @@
</template>
<script>
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
import { Message } from 'element-ui'
import { mapGetters } from "vuex";
import Breadcrumb from "@/components/Breadcrumb";
import Hamburger from "@/components/Hamburger";
import { Message } from "element-ui";
import {
userCountryList,
changeList,
languages,
changeSystemList
} from '@/api/user'
changeSystemList,
systemTypeList,
} from "@/api/user";
export default {
components: {
Breadcrumb,
Hamburger
Hamburger,
},
computed: {
...mapGetters(['sidebar', 'avatar', 'user'])
...mapGetters(["sidebar", "avatar", "user"]),
},
data() {
return {
countryList: [],
ruleForm: {
pkCountry: '',
nationalFlag2: '',
name: ''
pkCountry: "",
nationalFlag2: "",
name: "",
},
languageList: [],
languageItem: 0,
systemItem: ''
}
systemItem: "",
systemTypeList: [],
};
},
mounted() {
const that = this
let that = this;
setTimeout(() => {
//
that.getJScountry()
that.getJScountry();
//
that.getLanguages()
that.getSystem()
}, 10)
that.getLanguages();
that.getSystem();
}, 10);
this.systemItem = localStorage.getItem('systemItem') || 2
this.systemItem = localStorage.getItem("systemItem") || 2;
},
methods: {
getJScountry() {
userCountryList().then((res) => {
this.countryList = res.data
this.ruleForm.pkCountry = this.user.pkCountry
this.countryList = res.data;
this.ruleForm.pkCountry = this.user.pkCountry;
this.countryList.forEach((item) => {
if (item.pkCountry == this.ruleForm.pkCountry) {
this.ruleForm.nationalFlag2 = item.nationalFlag2
this.ruleForm.name = item.name
this.ruleForm.nationalFlag2 = item.nationalFlag2;
this.ruleForm.name = item.name;
}
})
})
});
});
},
getSystem() {
systemTypeList().then((res) => {
res.data.forEach((item) => {
if (item.value == localStorage.getItem("systemItem")) {
this.systemItem = item.value;
}
});
this.systemTypeList = res.data;
});
},
getLanguages() {
languages().then((res) => {
res.data.forEach((item) => {
if (item.field == localStorage.getItem('lang')) {
this.languageItem = item.value
if (item.field == localStorage.getItem("lang")) {
this.languageItem = item.value;
}
})
});
if (
localStorage.getItem('lang') == undefined ||
localStorage.getItem('lang') == 'undefined'
localStorage.getItem("lang") == undefined ||
localStorage.getItem("lang") == "undefined"
) {
localStorage.setItem('lang', 'zh-CN')
localStorage.setItem("lang", "zh-CN");
}
this.languageList = res.data
})
this.languageList = res.data;
});
},
handleClick(item) {
this.ruleForm.nationalFlag2 = item.nationalFlag2
this.ruleForm.name = item.name
this.ruleForm.nationalFlag2 = item.nationalFlag2;
this.ruleForm.name = item.name;
changeList(item.pkCountry).then((res) => {
this.$store.dispatch('user/getInfo').then((response) => {
this.$router.go(0)
})
})
this.$store.dispatch("user/getInfo").then((response) => {
this.$router.go(0);
});
});
},
changeSelection(e) {},
setSystem(e) {
console.log(e, 'eeee')
this.systemItem = e
console.log(e, "eeee");
this.systemItem = e;
changeSystemList(e).then((res) => {
if (res.code == 200) {
Message({
message: res.msg,
type: 'success'
})
localStorage.setItem('systemItem', e)
location.reload()
type: "success",
});
localStorage.setItem("systemItem", e);
location.reload();
}
})
});
},
// setLanguage(e) {
// this.languageList.forEach((item) => {
@ -172,20 +197,20 @@ export default {
// this.$router.push(`/login?redirect=${this.$route.fullPath}`)
// },
async logout() {
this.$confirm('确定注销并退出系统吗?', this.$t('w_0034'), {
confirmButtonText: this.$t('w_0035'),
cancelButtonText: this.$t('ENU_P_TYPE0'),
type: 'warning'
this.$confirm("确定注销并退出系统吗?", this.$t("w_0034"), {
confirmButtonText: this.$t("w_0035"),
cancelButtonText: this.$t("ENU_P_TYPE0"),
type: "warning",
})
.then(() => {
this.$store.dispatch('user/LogOut').then(() => {
this.$router.push(`/login?redirect=${this.$route.fullPath}`)
this.$store.dispatch("user/LogOut").then(() => {
this.$router.push(`/login?redirect=${this.$route.fullPath}`);
});
})
})
.catch(() => {})
}
}
}
.catch(() => {});
},
},
};
</script>
<style lang="scss" scoped>

View File

@ -7,10 +7,10 @@
<el-col :span="4">
<el-form-item :label="'会员编号'" prop="memberCode">
<el-input
v-model="queryParams.memberCode"
clearable
v-model="queryParams.memberCode"
:placeholder="'请输入'"
/>
></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
@ -20,36 +20,36 @@
clearable
placeholder=""
>
<el-option label="是" value="0" />
<el-option label="否" value="1" />
<el-option label="是" value="0"></el-option>
<el-option label="否" value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="签呈来源">
<el-select
v-model="queryParams.source"
clearable
:placeholder="'请选择'"
v-model="queryParams.source"
>
<el-option
v-for="item in sourceList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('收益区域')" prop="accountStatus">
<el-cascader
v-model="address"
clearable
@change="flChange"
v-model="address"
:options="areaData"
:placeholder="'请选择省市区'"
:props="regionParams"
@change="flChange"
/>
</el-form-item>
</el-col>
@ -80,7 +80,7 @@
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-col :span="8">
<el-form-item :label="$t('生效结束时间')" prop="creationTime">
<el-date-picker
v-model="effectiveTime"
@ -91,15 +91,18 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="changeTime2"
/>
>
</el-date-picker>
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="4">
<div class="searchbox">
<el-button class="my_search" @click="research()">
{{ '搜索' }}</el-button>
{{ '搜索' }}</el-button
>
<el-button class="my_reset" @click="reChongzhi">
{{ '重置' }}</el-button>
{{ '重置' }}</el-button
>
</div>
</el-col>
</el-row>
@ -109,25 +112,27 @@
<div class="maintop">
<div class="mainbtn">
<el-button
v-hasButtons="['memberRetailRegionAdd']"
size="small"
style="background-color: #48b2fd"
class="thebtn1"
v-hasButtons="['memberRetailRegionAdd']"
@click="addRules"
>{{ '添加' }}</el-button>
>{{ '添加' }}</el-button
>
<el-button
v-hasButtons="['memberRetailRegionExport']"
size="small"
v-hasButtons="['memberRetailRegionExport']"
class="thebtn2"
@click="handleExport"
>
{{ '导出' }}</el-button>
{{ '导出' }}</el-button
>
</div>
</div>
<div class="maintable">
<el-table
v-loading="loading"
:data="tableData"
v-loading="loading"
height="730px"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
@ -181,37 +186,35 @@
align="center"
prop="creationTime"
:label="$t('创建时间')"
width="160"
/>
<el-table-column
align="center"
prop="modifiedTime"
:label="$t('修改时间')"
width="160"
/>
<!-- <el-table-column
<el-table-column
align="center"
prop="effectiveEndDate"
:label="$t('生效结束时间')"
/> -->
/>
<el-table-column align="center" :label="'操作'" width="150">
<template slot-scope="scope">
<el-button
v-has-buttons="['memberRetailRegionUpdate']"
class="colors"
type="text"
size="small"
style="color: #ffad41"
v-has-buttons="['memberRetailRegionUpdate']"
@click.native.prevent="updateShow(scope.row)"
>
{{ $t("修改") }}
</el-button>
<el-button
v-has-buttons="['memberRetailRegionDel']"
class="colors"
type="text"
size="small"
style="color: #c73030"
v-has-buttons="['memberRetailRegionDel']"
@click.native.prevent="delRole(scope.row)"
>
{{ '删除' }}
@ -232,34 +235,34 @@
<el-form ref="forms" :rules="rules" :model="table" label-width="100px">
<el-form-item :label="$t('会员编号')" prop="memberCode">
<el-input
v-model="table.memberCode"
style="width: 460px"
clearable
:disabled="types == 2 ? true : false"
:placeholder="'请输入'"
v-model="table.memberCode"
@input="getmemberinfo"
/>
:placeholder="'请输入'"
></el-input>
</el-form-item>
<el-form-item :label="$t('收益区域')" prop="addressd">
<el-cascader
v-model="table.addressd"
:disabled="areaDataFilter.length === 0"
style="width: 460px"
:options="areaDataFilter"
@change="flChange1"
v-model="table.addressd"
:options="areaData"
:placeholder="'请选择省市区'"
:props="regionParams"
@change="flChange1"
/>
</el-form-item>
<!-- <el-form-item :label="$t('生效结束时间')" prop="addressd">
<el-form-item :label="$t('生效结束时间')" prop="addressd">
<el-date-picker
v-model="table.effectiveEndDate"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
@change="changeTime3"
/>
</el-form-item> -->
>
</el-date-picker>
</el-form-item>
<div style="padding-top: 30px; display: flex; justify-content: center">
<el-button
type="text"
@ -267,7 +270,8 @@
class="button-style"
@click="handleClose"
>
{{ '取消' }}</el-button>
{{ '取消' }}</el-button
>
<el-button
v-preventReClick="3000"
type="text"
@ -292,20 +296,20 @@
</template>
<script>
import topBar from '@/components/topBar'
import { getbdmenuList, getPubenumsList } from '@/api/system'
import { getgradeRanglist, getAwardsListChiose } from '@/api/level'
import * as con from '@/api/configManage.js'
import * as api from '@/api/manage.js'
import { Message } from 'element-ui'
import { deleteAgreement } from '@/api/configManage'
import ImageUpload from '@/components/ImageUpload'
import { areaList } from '@/api/site'
import topBar from "@/components/topBar";
import { getbdmenuList, getPubenumsList } from "@/api/system";
import { getgradeRanglist, getAwardsListChiose } from "@/api/level";
import * as con from "@/api/configManage.js";
import * as api from "@/api/manage.js";
import { Message } from "element-ui";
import { deleteAgreement } from "@/api/configManage";
import ImageUpload from "@/components/ImageUpload";
import { areaList } from "@/api/site";
export default {
name: 'Qxpz',
name: "Qxpz",
components: {
topBar,
ImageUpload
ImageUpload,
},
data() {
return {
@ -314,293 +318,253 @@ export default {
effectiveTime: [],
sourceList: [],
regionParams: {
label: 'name',
value: 'id',
children: 'children',
expandTrigger: 'hover'
label: "name",
value: "id",
children: "children",
expandTrigger: "hover",
},
title: '添加',
forms: '',
forms: "",
pickerOptions: {
disabledDate(time) {
const now = new Date()
now.setHours(0, 0, 0, 0) // Reset to start of today
return time.getTime() < now.getTime() // Disable only dates before today
}
const now = new Date();
now.setHours(0, 0, 0, 0); // Reset to start of today
return time.getTime() < now.getTime(); // Disable only dates before today
},
},
rules: {
memberCode: [
{ required: true, message: '请选择发布位置', trigger: 'blur' }
]
{ required: true, message: '请选择发布位置', trigger: "blur" },
],
},
table: {
memberCode: '',
pkMember: '',
addressd: ['', '', ''],
effectiveEndDate: ''
memberCode: "",
pkMember: "",
addressd: ["", "", ""],
effectiveEndDate: "",
},
ruleShow: false,
moren: 'memberRetailRegion',
moren: "memberRetailRegion",
topList: [
{
name: this.$t('收益区域配置'),
path: 'memberRetailRegion'
}
name: this.$t("收益区域配置"),
path: "memberRetailRegion",
},
],
defaultParams: {
label: 'label',
value: 'value',
children: 'enumList'
label: "label",
value: "value",
children: "enumList",
},
multipleSelection: [],
queryParams: {
pageNum: 1,
pageSize: 50,
effective: '0'
effective: "0",
},
gradeRangList: [],
awardsList: [],
statusList: [
{ name: '立即发送', id: '1' },
{ name: '定时发送', id: '2' }
{ name: '立即发送', id: "1" },
{ name: '定时发送', id: "2" },
],
statusList1: [
{ name: '未发送', id: '0' },
{ name: '已发送', id: '1' }
{ name: '未发送', id: "0" },
{ name: '已发送', id: "1" },
],
menuOptions: [],
loading: false,
tableData: [],
total: 0,
types: '',
formId: '',
types: "",
formId: "",
getPostionList: [],
address: '',
address: "",
areaData: [],
pkIds: '',
memberInfo: {}
}
},
computed: {
// BL30720213
areaDataFilter() {
if (!this.memberInfo || Object.keys(this.memberInfo).length === 0 || ![60, 70, 80].includes(this.memberInfo.pkSettleGradeValue)) {
return []
}
console.log(this.memberInfo.pkSettleGradeValue, 'memberInfo')
if ([60, 70].includes(this.memberInfo.pkSettleGradeValue)) {
return this.areaData
}
const list = this.areaData.map(item => {
const province = item
let city = null
if (province.children && province.children.length > 0) {
city = province.children.map(child => {
return {
...child,
children: null
}
})
}
return {
...province,
children: city
}
})
return list
}
pkIds: "",
};
},
created() {
this.research()
this.getsignSource()
this.getAllArea()
this.research();
this.getsignSource();
this.getAllArea();
},
methods: {
handleExport() {
this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
type: "warning",
}).then((_) => {
this.download(
'/member/manage/cu-member-retail-region/export',
"/member/manage/cu-member-retail-region/export",
{ ...this.queryParams },
`${this.$t('会员收益区域配置')}}${new Date().getTime()}.xlsx`
)
})
`${this.$t("会员收益区域配置")}}${new Date().getTime()}.xlsx`
);
});
},
getmemberinfo(member) {
con.getQueryMemberInfo({ memberCode: member }).then((res) => {
if (res.code === 200) {
this.table.pkMember = res.data.pkId
this.memberInfo = res.data
} else {
this.memberInfo = {}
}
})
this.table.pkMember = res.data.pkId;
});
},
getAllArea() {
areaList().then((res) => {
this.areaData = res.data
})
this.areaData = res.data;
});
},
flChange(value) {
this.queryParams.county = ''
this.queryParams.province = ''
this.queryParams.city = ''
this.queryParams.county = "";
this.queryParams.province = "";
this.queryParams.city = "";
this.queryParams.province = value[0]
this.queryParams.city = value[1]
this.queryParams.county = value[2]
this.queryParams.province = value[0];
this.queryParams.city = value[1];
this.queryParams.county = value[2];
},
flChange1(value) {
this.table.county = ''
this.table.province = ''
this.table.city = ''
this.table.province = value[0]
this.table.city = value[1]
this.table.county = value[2]
this.table.county = "";
this.table.province = "";
this.table.city = "";
this.table.province = value[0];
this.table.city = value[1];
this.table.county = value[2];
},
getsignSource() {
api.noticeWebsiteType().then((res) => {
this.sourceList = res.data
})
this.sourceList = res.data;
});
},
addRules() {
this.types = 1
this.ruleShow = true
this.title = '添加'
this.types = 1;
this.ruleShow = true;
this.title = '添加';
},
submitBtn() {
//
this.ruleSubmit()
this.ruleSubmit();
},
updateShow(item) {
this.getmemberinfo(item.memberCode)
this.types = 2
this.title = '修改'
this.table = item
let arr = [item.province + '', item.city + '']
if (item.county && item.county !== -1) {
arr.push(item.county + '')
}
arr = arr.filter((item) => item != '')
this.$set(this.table, 'addressd', arr)
this.$forceUpdate()
console.log(this.table.addressd, 'table')
this.pkIds = item.pkId
this.ruleShow = true
this.types = 2;
this.title = '修改';
this.table = item;
let arr = [item.province + "", item.city + "", (item.county || "") + ""];
arr = arr.filter((item) => item != "");
this.$set(this.table, "addressd", arr);
this.$forceUpdate();
console.log(this.table.addressd, "table");
this.pkIds = item.pkId;
this.ruleShow = true;
},
delRole(item) {
this.$confirm(this.$t('确认要删除该配置吗?'), '提示', {
this.$confirm(this.$t("确认要删除该配置吗?"), '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
type: "warning",
}).then(() => {
con.delRetailRegion(item.pkId).then((res) => {
if (res.code === 200) {
Message({
message: res.msg,
type: 'success'
})
this.research()
type: "success",
});
this.research();
} else {
Message({
message: res.msg,
type: 'error'
})
type: "error",
});
}
})
})
});
});
},
ruleSubmit() {
const datas = {}
const that = this
this.$refs['forms'].validate((valid) => {
const datas = {};
const that = this;
this.$refs["forms"].validate((valid) => {
if (!valid) {
return false
return false;
} else {
if (this.types === 1) {
datas.pkMember = this.table.pkMember
datas.province = this.table.addressd[0]
datas.city = this.table.addressd[1]
datas.county = this.table.addressd[2]
datas.effectiveEndDate = this.table.effectiveEndDate
datas.pkMember = this.table.pkMember;
datas.province = this.table.addressd[0];
datas.city = this.table.addressd[1];
datas.county = this.table.addressd[2];
datas.effectiveEndDate = this.table.effectiveEndDate;
con.retailRegionAdd(datas).then((res) => {
if (res.code === 200) {
Message({
message: res.msg,
type: 'success'
})
that.ruleShow = false
type: "success",
});
that.ruleShow = false;
that.table = {
pkMember: '',
addressd: ['', '', '']
pkMember: "",
addressd: ["", "", ""],
};
that.research();
}
that.research()
}
})
});
}
if (this.types === 2) {
datas.pkMember = this.table.pkMember
datas.pkId = this.pkIds
datas.province = this.table.addressd[0]
datas.city = this.table.addressd[1]
datas.county = this.table.addressd[2]
datas.effectiveEndDate = this.table.effectiveEndDate
datas.pkMember = this.table.pkMember;
datas.pkId = this.pkIds;
datas.province = this.table.addressd[0];
datas.city = this.table.addressd[1];
datas.county = this.table.addressd[2];
datas.effectiveEndDate = this.table.effectiveEndDate;
con.retailRegionUpdate(datas).then((res) => {
if (res.code === 200) {
Message({
message: res.msg,
type: 'success'
})
that.ruleShow = false
type: "success",
});
that.ruleShow = false;
that.table = {
pkMember: '',
addressd: ['', '', '']
pkMember: "",
addressd: ["", "", ""],
};
that.research();
}
that.research()
}
})
});
}
}
})
});
},
statusChange(value) {
if (this.table.status.length > 1) {
this.table.status.splice(0, 1)
this.table.status.splice(0, 1);
}
},
handleClose() {
this.ruleShow = false
this.ruleShow = false;
this.table = {
pkMember: '',
addressd: ['', '', '']
}
pkMember: "",
addressd: ["", "", ""],
};
},
changeBox(row) {
console.error(row)
console.error(row);
},
addFrom() {},
addRule() {},
changeTime(value) {
this.queryParams.startDate = value[0] ? value[0] : ''
this.queryParams.endDate = value[1] ? value[1] : ''
this.queryParams.startDate = value[0] ? value[0] : "";
this.queryParams.endDate = value[1] ? value[1] : "";
},
changeTime1(value) {
this.queryParams.startDateModify = value[0] ? value[0] : ''
this.queryParams.endDateModify = value[1] ? value[1] : ''
this.queryParams.startDateModify = value[0] ? value[0] : "";
this.queryParams.endDateModify = value[1] ? value[1] : "";
},
changeTime2(value) {
this.queryParams.effectiveStaDateStr = value[0] ? value[0] : ''
this.queryParams.effectiveEndDateStr = value[1] ? value[1] : ''
this.queryParams.effectiveStaDateStr = value[0] ? value[0] : "";
this.queryParams.effectiveEndDateStr = value[1] ? value[1] : "";
},
changeTime3(value) {
this.table.effectiveEndDate = value
this.table.effectiveEndDate = value;
},
disabledDates(time) {
const now = new Date() //
const now = new Date(); //
const currentDateTime = new Date(
now.getFullYear(),
now.getMonth(),
@ -608,30 +572,30 @@ export default {
now.getHours(),
now.getMinutes(),
now.getSeconds()
)
return time.getTime() < currentDateTime.getTime() //
);
return time.getTime() < currentDateTime.getTime(); //
},
handleChangeMunu(value) {
console.log('🌈', value[value.length - 1])
this.queryParams.menuId = value[value.length - 1]
console.log("🌈", value[value.length - 1]);
this.queryParams.menuId = value[value.length - 1];
},
//
getPubenumsList() {
getPubenumsList().then((res) => {
this.menuOptions = res.data
})
this.menuOptions = res.data;
});
},
//
getgradeRanglist() {
getgradeRanglist().then((res) => {
this.gradeRangList = res.data
})
this.gradeRangList = res.data;
});
},
//
getAwardsListChiose() {
getAwardsListChiose().then((res) => {
this.awardsList = res.rows
})
this.awardsList = res.rows;
});
},
research() {
// //
@ -639,27 +603,27 @@ export default {
// this.queryParams.creationTimeStart = this.queryParams.creationTime[0];
// this.queryParams.creationTimeEnd = this.queryParams.creationTime[1];
// }
this.loading = true
this.loading = true;
con.getRetailRegionList(this.queryParams).then((res) => {
this.tableData = res.rows
this.total = res.total
this.loading = false
})
this.tableData = res.rows;
this.total = res.total;
this.loading = false;
});
},
reChongzhi() {
this.queryParams = {
pageNum: 1,
pageSize: 50
}
this.modifiedTime = []
this.modifiedTime1 = []
this.effectiveTime = []
this.address = []
this.research()
pageSize: 50,
};
this.modifiedTime = [];
this.modifiedTime1 = [];
this.effectiveTime = [];
this.address = [];
this.research();
},
handleSelectionChange(val) {
this.multipleSelection = val
this.multipleSelection = val;
},
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
// if (columnIndex === 0) {
@ -678,14 +642,14 @@ export default {
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
return 'warning-row'
return "warning-row";
} else if (rowIndex % 2 == 0) {
return 'success-row'
return "success-row";
}
return ''
}
}
}
return "";
},
},
};
</script>
<style lang="scss" scoped>
::v-deep .el-upload--picture-card {

View File

@ -366,72 +366,70 @@
{{ '确认' }}</el-button>
</div>
</div>
<!-- 产品弹框 -->
<!-- <el-dialog-->
<!-- :title="'添加'"-->
<!-- :visible.sync="dialogVisible"-->
<!-- :close-on-click-modal="false"-->
<!-- width="50%"-->
<!-- center-->
<!-- :before-close="handleClose1"-->
<!-- >-->
<!-- <div class="cpHeight">-->
<!-- <el-row>-->
<!-- <el-col :span="22">-->
<!-- <el-input-->
<!-- v-model="select.query"-->
<!-- clearable-->
<!-- :placeholder="'请输入'"-->
<!-- prefix-icon="el-icon-search"-->
<!-- @keyup.enter.native="getProduct"-->
<!-- />-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <el-button type="primary" size="small" @click="getProduct">-->
<!-- {{ '搜索' }}</el-button>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <div style="height: 10px" />-->
<!-- <el-table-->
<!-- ref="multipleTable"-->
<!-- :data="productList"-->
<!-- height="500px"-->
<!-- style="width: 100%"-->
<!-- :header-cell-style="{ background: '#EEEEEE' }"-->
<!-- :row-class-name="tableRowClassName"-->
<!-- @select-all="onSelectAll"-->
<!-- @select="selected"-->
<!-- >-->
<!-- <el-table-column type="selection" width="55" />-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- prop="productName"-->
<!-- :label="'产品名称'"-->
<!-- />-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- prop="productCode"-->
<!-- :label="'产品编号'"-->
<!-- />-->
<!-- <el-table-column align="center" prop="unitStr" :label="'单位'" />-->
<!-- </el-table>-->
<!-- </div>-->
<!-- <pagination-->
<!-- v-show="total > 0"-->
<!-- :total="total"-->
<!-- :page.sync="queryParams.pageNum"-->
<!-- :limit.sync="queryParams.pageSize"-->
<!-- @pagination="getProduct"-->
<!-- />-->
<!-- <span slot="footer" class="dialog-footer">-->
<!-- <el-button @click="handleClose1">{{ '取消' }}</el-button>-->
<!-- <el-button type="primary" @click="sureProduct">{{-->
<!-- '确认'-->
<!-- }}</el-button>-->
<!-- </span>-->
<!-- </el-dialog>-->
<el-dialog
:title="'添加'"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
width="50%"
center
:before-close="handleClose1"
>
<div class="cpHeight">
<el-row>
<el-col :span="22">
<el-input
v-model="select.query"
clearable
:placeholder="'请输入'"
prefix-icon="el-icon-search"
@keyup.enter.native="getProduct"
/>
</el-col>
<el-col :span="2">
<el-button type="primary" size="small" @click="getProduct">
{{ '搜索' }}</el-button>
</el-col>
</el-row>
<div style="height: 10px" />
<el-table
ref="multipleTable"
:data="productList"
height="500px"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName"
@select-all="onSelectAll"
@select="selected"
>
<el-table-column type="selection" width="55" />
<el-table-column
align="center"
prop="productName"
:label="'产品名称'"
/>
<el-table-column
align="center"
prop="productCode"
:label="'产品编号'"
/>
<el-table-column align="center" prop="unitStr" :label="'单位'" />
</el-table>
</div>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getProduct"
/>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose1">{{ '取消' }}</el-button>
<el-button type="primary" @click="sureProduct">{{
'确认'
}}</el-button>
</span>
</el-dialog>
<!-- 规格 -->
<el-dialog
:title="'添加'"
@ -660,8 +658,8 @@ export default {
this.getProductCode()
//
this.getSort()
// //
// this.getProduct()
//
this.getProduct()
},
methods: {
sureProduct() {
@ -684,12 +682,12 @@ export default {
opProduct() {
this.dialogVisible = true
},
// getProduct() {
// api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
// this.productList = res.rows
// this.total = res.total
// })
// },
getProduct() {
api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
this.productList = res.rows
this.total = res.total
})
},
getRepurchaseType() {
api.repurchaseType().then((res) => {
this.repurchaseTypeList = res.data

View File

@ -824,7 +824,7 @@ export default {
this.getTransportType()
//
this.getRepurchaseType()
// this.getProduct()
this.getProduct()
},
methods: {
sureProduct() {
@ -847,12 +847,12 @@ export default {
opProduct() {
this.dialogVisible = true
},
// getProduct() {
// api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
// this.productList = res.rows
// this.total = res.total
// })
// },
getProduct() {
api.productFind1(Object.assign({}, this.queryParams, this.select)).then((res) => {
this.productList = res.rows
this.total = res.total
})
},
getRepurchaseType() {
api.repurchaseType().then((res) => {
this.repurchaseTypeList = res.data

View File

@ -2,68 +2,84 @@
<div class="page1">
<topBar
v-if="topList.length > 0"
:top-list="topList"
:topList="topList"
:moren="moren"
/>
></topBar>
<div class="thetopbox">
<el-form ref="form" :model="queryParams" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item :label="'会员编号'" prop="memberCode">
<el-input v-model="queryParams.memberCode" clearable />
<el-input clearable v-model="queryParams.memberCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'会员姓名'" prop="name">
<el-input v-model="queryParams.memberName" clearable />
<el-input clearable v-model="queryParams.memberName"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'结算等级'" prop="pkRegisterGrade">
<el-select
v-model="queryParams.pkRegisterGrade"
clearable
:placeholder="'请选择'"
v-model="queryParams.pkRegisterGrade"
>
<el-option
v-for="item in gradeRangList"
:key="item.pkId"
:label="item.gradeName"
:value="item.pkId"
/>
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards">
<el-select
clearable
:placeholder="'请选择'"
v-model="queryParams.pkAwards"
>
<el-option
v-for="item in awardsList"
:key="item.pkId"
:label="item.awardsName"
:value="item.pkId"
></el-option>
</el-select>
<!-- <el-input clearable v-model="queryParams.pkAwards"></el-input> -->
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'隶属体系'" prop="vertexId">
<el-select
v-model="queryParams.vertexId"
clearable
:placeholder="'请选择'"
v-model="queryParams.vertexId"
>
<el-option
v-for="item in vertexList"
:key="item.pkId"
:label="item.vertexName"
:value="item.pkId"
/>
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'隶属团队'" prop="teamId">
<el-select
v-model="queryParams.teamId"
clearable
:placeholder="'请选择'"
v-model="queryParams.teamId"
>
<el-option
v-for="item in memberTeamList"
:key="item.pkId"
:label="item.teamName"
:value="item.pkId"
/>
></el-option>
</el-select>
</el-form-item>
</el-col>
@ -71,42 +87,43 @@
<el-row>
<el-col :span="4">
<el-form-item :label="'变更次数'" prop="code">
<el-input v-model="queryParams.editNumber" clearable />
<el-input clearable v-model="queryParams.editNumber"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'联系方式'" prop="code">
<el-input v-model="queryParams.phone" clearable />
<el-input clearable v-model="queryParams.phone"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'服务中心编号'" prop="centerMemberCode">
<el-input
v-model="queryParams.centerMemberCode"
clearable
/>
v-model="queryParams.centerMemberCode"
></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'服务中心姓名'" prop="centerMemberName">
<el-input
v-model="queryParams.centerMemberName"
clearable
/>
v-model="queryParams.centerMemberName"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'创建日期'" prop="code">
<el-date-picker
v-model="queryParams.time1"
@change="changeTime1"
type="datetimerange"
range-separator="——"
:start-placeholder="'开始日期'"
:end-placeholder="'结束日期'"
value-format="yyyy-MM-dd HH:mm:ss"
:unlink-panels="true"
@change="changeTime1"
/>
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
@ -116,6 +133,7 @@
<el-col :span="8">
<el-form-item :label="'支付日期'" prop="code">
<el-date-picker
@change="changeTime2"
v-model="queryParams.time2"
type="datetimerange"
range-separator="——"
@ -123,8 +141,8 @@
:end-placeholder="'结束日期'"
value-format="yyyy-MM-dd HH:mm:ss"
:unlink-panels="true"
@change="changeTime2"
/>
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
@ -134,14 +152,15 @@
<el-col :span="4">
<div class="searchbox">
<el-button class="searchbtn" @click="getBusinessList">
{{ '搜索' }}</el-button>
{{ '搜索' }}</el-button
>
<el-button @click="reChongzhi"> {{ '重置' }}</el-button>
</div>
</el-col>
<div class="openClose" @click="changeActive">
<i
:class="isActive ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
/>
></i>
<div>{{ isActive ? '点击收起' : '点击展开' }}</div>
</div>
</el-row>
@ -150,14 +169,16 @@
<div class="maintop">
<div class="mainbtn">
<el-button
v-hasButtons="['BasicBusinessImport']"
size="small"
class="thebtn1"
@click="handleImport"
class="thebtn1"
v-hasButtons="['BasicBusinessImport']"
>
{{ '导入' }}</el-button
>
{{ '导入' }}</el-button>
<el-button size="small" class="thebtn2" @click="importTemplate">
{{ '下载模板' }}</el-button>
{{ '下载模板' }}</el-button
>
</div>
</div>
<div class="main">
@ -170,19 +191,20 @@
:row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column
align="center"
prop="memberCode"
:label="'会员编号'"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="newMemberName"
:label="'变更会员姓名'"
>
<template slot-scope="scope">
<el-input v-model="scope.row.newMemberName" />
<el-input v-model="scope.row.newMemberName"></el-input>
</template>
</el-table-column>
<el-table-column
@ -192,101 +214,115 @@
:label="'变更联系方式'"
>
<template slot-scope="scope">
<el-input v-model="scope.row.newPhone" clearable />
<el-input clearable v-model="scope.row.newPhone"></el-input>
</template>
</el-table-column>
<!-- <el-table-column
min-width="210px"
<el-table-column
min-width="130px"
align="center"
prop="areaId"
label="分公司所属省份"
prop="endValidityDate"
:label="$t('奖衔有效期')"
>
<template slot-scope="scope">
<el-select
v-model="scope.row.areaId"
placeholder="请选择分公司所属省份"
style="width: 200px;"
:disabled="!areaIdCanSelect"
<el-date-picker
v-model="scope.row.endValidityDate"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
clearable
>
<el-option
v-for="area in areaList"
:key="area.pkId"
:label="area.name"
:value="area.pkId"
/>
</el-select>
</el-date-picker>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column
align="center"
prop="memberName"
:label="'会员姓名'"
/>
<el-table-column align="center" prop="phone" :label="'联系方式'" />
>
</el-table-column>
<el-table-column align="center" prop="phone" :label="'联系方式'">
</el-table-column>
<el-table-column
align="center"
prop="pkRegisterGradeVal"
:label="'结算等级'"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="pkAwardsVal"
:label="'真实奖衔'"
>
</el-table-column>
<el-table-column
align="center"
prop="vertexName"
:label="'隶属体系'"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="teamName"
:label="'隶属团队'"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="centerMemberCode"
:label="'服务中心编号'"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="centerMemberName"
:label="'服务中心姓名'"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="creationTime"
:label="'创建日期'"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="payTime"
:label="'支付日期'"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="editNumber"
:label="'变更次数'"
/>
>
</el-table-column>
</el-table>
</div>
</div>
<div class="main">
<div
class="main_content"
v-for="(item, index) in handleBusinessList"
:key="index"
class="main_content"
>
<el-form ref="form" style="width: 100%;" :model="form" label-width="130px">
<el-form ref="form" :model="form" label-width="130px">
<!-- <el-checkbox-group v-model="item.wowList">
<el-checkbox> -->
<el-form-item :label="item.editTypeName">
<!-- 单选 -->
<el-checkbox-group
v-if="item.buttonType == 1"
v-model="item.businessValueList"
:max="1"
v-model="item.businessValueList"
>
<el-checkbox
v-for="aitem in item.enumEntityList"
:key="aitem.value"
:label="aitem.value"
>{{ aitem.label }}</el-checkbox>
>{{ aitem.label }}</el-checkbox
>
</el-checkbox-group>
<!-- 多选 -->
@ -298,20 +334,23 @@
v-for="aitem in item.enumEntityList"
:key="aitem.value"
:label="aitem.value"
>{{ aitem.label }}</el-checkbox>
>{{ aitem.label }}</el-checkbox
>
</el-checkbox-group>
<!-- 输入框 -->
<el-input
v-if="item.buttonType == 3"
v-model="item.businessValueList[0]"
type="number"
style="width: 150px"
v-model="item.businessValueList[0]"
>
<i slot="suffix">%</i>
</el-input>
</el-form-item>
<!-- </el-checkbox>
</el-checkbox-group> -->
</el-form>
</div>
</div>
@ -319,12 +358,13 @@
<div style="margin: 0 auto">
<el-button class="thebtn"> {{ '取消' }}</el-button>
<el-button
v-hasButtons="['BasicBusinessConfirm']"
type="primary"
class="thebtn"
@click="saveDate"
v-hasButtons="['BasicBusinessConfirm']"
>
{{ '确认' }}</el-button
>
{{ '确认' }}</el-button>
</div>
</div>
<el-dialog
@ -346,20 +386,24 @@
align="center"
prop="memberCode"
:label="'会员编号'"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="errorMsg"
:label="'报错信息'"
/>
>
</el-table-column>
</el-table>
</div>
<div class="footer" style="text-align: center">
<div style="margin: 0 auto">
<el-button class="thebtn" @click="errorShow = false">
{{ '取消' }}</el-button>
{{ '取消' }}</el-button
>
<el-button type="primary" class="thebtn" @click="errorShow = false">
{{ '确认' }}</el-button>
{{ '确认' }}</el-button
>
</div>
</div>
</el-dialog>
@ -384,16 +428,17 @@
:auto-upload="false"
drag
>
<i class="el-icon-upload" />
<i class="el-icon-upload"></i>
<div class="el-upload__text">
{{ '将文件拖到此处,或' }}
<em>{{ '点击上传' }}</em>
</div>
<div slot="tip" class="el-upload__tip">
<div class="el-upload__tip" slot="tip">
<el-link type="info" style="font-size: 12px" @click="importTemplate">
{{ '下载模板' }}</el-link>
{{ '下载模板' }}</el-link
>
</div>
<div slot="tip" class="el-upload__tip" style="color: red">
<div class="el-upload__tip" style="color: red" slot="tip">
{{ '提示仅允许导入“xls”或“xlsx”格式文件' }}
</div>
</el-upload>
@ -410,36 +455,35 @@
</template>
<script>
import topBar from '@/components/topBar/checked'
import { getToken } from '@/utils/auth'
import { getRouters } from '@/api/settle'
import topBar from "@/components/topBar/checked";
import { getToken } from "@/utils/auth";
import { getRouters } from "@/api/settle";
import {
getHandleBusinessEnum,
getBusinessList,
businessCheck,
getCompanyAreaList
} from '@/api/business'
import { getAwardsListChiose, getgradeRanglist } from '@/api/level'
import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
} from "@/api/business";
import { getAwardsListChiose, getgradeRanglist } from "@/api/level";
import { getvertexValue, getmemberTeamList } from "@/api/financialCase";
export default {
name: 'Jcyw',
name: "Jcyw",
components: {
topBar
topBar,
},
data() {
return {
moren: 'jcyw',
moren: "jcyw",
topList: [
{
name: '基础业务',
path: 'jcyw',
url: 'BasicBusiness'
path: "jcyw",
url: "BasicBusiness",
},
{
name: '订单业务',
path: 'ddyw',
url: 'OrderBusiness'
}
path: "ddyw",
url: "OrderBusiness",
},
// {
// name: "",
// path: "shyw",
@ -452,28 +496,26 @@ export default {
multipleSelection: [],
wowList: [],
queryParams: {
memberCode: '',
memberName: '',
pkAwards: '',
vertexId: '',
teamId: '',
editNumber: '',
phone: '',
centerMemberCode: '',
centerMemberName: '',
startDate: '',
endDate: '',
startDatePay: '',
endDatePay: '',
memberCode: "",
memberName: "",
pkAwards: "",
vertexId: "",
teamId: "",
editNumber: "",
phone: "",
centerMemberCode: "",
centerMemberName: "",
startDate: "",
endDate: "",
startDatePay: "",
endDatePay: "",
time1: [],
time2: []
time2: [],
},
tableData: [],
//
isActive: false,
form: {
areaId: ''
},
form: {},
handleBusinessList: [],
errorShow: false,
errorData: [],
@ -485,31 +527,24 @@ export default {
//
open: false,
//
title: '',
title: "",
//
isUploading: false,
//
updateSupport: 0,
//
headers: { Authorization: 'Bearer ' + getToken() },
headers: { Authorization: "Bearer " + getToken() },
//
url:
process.env.VUE_APP_BASE_API +
'/member/manage/handle-business/importData'
"/member/manage/handle-business/importData",
},
areaList: []
}
},
computed: {
areaIdCanSelect() {
return this.handleBusinessList.find(item => item.editTypeKey == 'change_settlement_grade')?.businessValueList?.[0] == 155
}
};
},
created() {
this.getBusinessList()
this.getHandleBusinessEnum()
this.getUserRoute()
this.getCompanyAreaList()
this.getBusinessList();
this.getHandleBusinessEnum();
this.getUserRoute();
},
methods: {
//
@ -518,190 +553,168 @@ export default {
res.data.forEach((item) => {
this.topList.forEach((items) => {
if (item.routeName == items.url) {
this.$set(items, 'changed', true)
this.$set(items, "changed", true);
}
})
})
})
},
getCompanyAreaList() {
getCompanyAreaList().then((res) => {
this.areaList = res.data || []
console.log(this.areaList, 'this.areaList')
})
});
});
});
},
checkRadio(value) {},
//
//
importTemplate() {
this.download(
'/member/manage/handle-business/download-template',
"/member/manage/handle-business/download-template",
{},
`${'基础业务办理'}-${new Date().getTime()}.xlsx`
)
);
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = '基础业务'
this.upload.open = true
this.upload.title = '基础业务';
this.upload.open = true;
},
//
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true
this.upload.isUploading = true;
},
//
handleFileSuccess(response, file, fileList) {
var fileName = response.fileName
if (fileName != undefined && fileName != '') {
var fileName = response.fileName;
if (fileName != undefined && fileName != "") {
}
if (response.code == 200) {
this.tableData = response.data
this.upload.open = false
this.upload.isUploading = false
this.$refs.upload.clearFiles()
this.tableData = response.data;
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert(response.msg, '导入结果', {
dangerouslyUseHTMLString: true
})
dangerouslyUseHTMLString: true,
});
} else if (response.code == 504) {
this.upload.open = false
this.upload.isUploading = false
this.$refs.upload.clearFiles()
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
var errorMsg = response.data.map((item) => item.memberCode).join(',')
var errorMsg = response.data.map((item) => item.memberCode).join(",");
this.$alert(errorMsg + response.msg, '导入结果', {
dangerouslyUseHTMLString: true
})
dangerouslyUseHTMLString: true,
});
} else {
this.upload.open = false
this.upload.isUploading = false
this.$refs.upload.clearFiles()
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert(response.msg, '导入结果', {
dangerouslyUseHTMLString: true
})
dangerouslyUseHTMLString: true,
});
}
},
//
handleExceed() {
this.upload.isUploading = false
this.msgInfo('仅可上传一个文件哦')
this.upload.isUploading = false;
this.msgInfo('仅可上传一个文件哦');
},
//
submitFileForm() {
this.$refs.upload.submit()
this.$refs.upload.submit();
},
//
//
saveDate() {
// console.log("🌈", this.handleBusinessList);
if (this.multipleSelection.length > 0) {
const settlementGrade = this.handleBusinessList.find(item => item.editTypeKey == 'change_settlement_grade')
if (settlementGrade.businessValueList?.[0] == 155) {
const needSelection = this.multipleSelection.filter(item => !item.areaId)
if (needSelection.length > 0) {
this.$message({
message: '请选择分公司所属省份',
type: 'warning'
})
return
}
} else {
this.multipleSelection.forEach(item => {
item.areaId = ''
})
}
businessCheck({
businessMemberList: this.multipleSelection,
handleBusinessList: this.handleBusinessList
handleBusinessList: this.handleBusinessList,
}).then((res) => {
if (res.code == 200) {
this.$message({
message: res.msg,
type: 'success'
})
type: "success",
});
this.$router.push({
path: '/information/business/shyw',
path: "/information/business/shyw",
query: {
data: JSON.stringify(res.data),
handleBusinessList: JSON.stringify(this.handleBusinessList)
}
})
handleBusinessList: JSON.stringify(this.handleBusinessList),
},
});
} else if (res.code == 504 && res.data) {
this.errorShow = true
this.errorData = res.data
this.errorShow = true;
this.errorData = res.data;
}
})
});
} else {
this.$message({
message: '至少选择一条数据',
type: 'warning'
})
type: "warning",
});
}
},
changeTime1(val) {
this.queryParams.startDate = val[0]
this.queryParams.endDate = val[1]
this.queryParams.startDate = val[0];
this.queryParams.endDate = val[1];
},
changeTime2(val) {
this.queryParams.startDatePay = val[0]
this.queryParams.endDatePay = val[1]
this.queryParams.startDatePay = val[0];
this.queryParams.endDatePay = val[1];
},
getBusinessList() {
getBusinessList(this.queryParams).then((res) => {
this.tableData = res.rows
})
this.tableData = res.rows;
});
},
getHandleBusinessEnum() {
//
//
getHandleBusinessEnum().then((res) => {
res.data.forEach((ele) => {
ele.businessValueList = []
ele.wowList = []
})
this.handleBusinessList = res.data
})
ele.businessValueList = [];
ele.wowList = [];
});
this.handleBusinessList = res.data;
});
getgradeRanglist().then((res) => {
this.gradeRangList = res.data
})
this.gradeRangList = res.data;
});
getAwardsListChiose().then((res) => {
this.awardsList = res.rows
})
this.awardsList = res.rows;
});
getmemberTeamList().then((res) => {
this.memberTeamList = res.rows
})
this.memberTeamList = res.rows;
});
getvertexValue().then((res) => {
this.vertexList = res.data
})
this.vertexList = res.data;
});
},
//
changeActive() {
this.isActive = !this.isActive
this.isActive = !this.isActive;
},
//
//
reChongzhi() {
this.queryParams = {
memberCode: '',
memberName: '',
memberCode: "",
memberName: "",
time1: [],
time2: []
}
this.getBusinessList()
time2: [],
};
this.getBusinessList();
},
handleSelectionChange(val) {
this.multipleSelection = val
this.multipleSelection = val;
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
return 'warning-row'
return "warning-row";
} else if (rowIndex % 2 == 0) {
return 'success-row'
return "success-row";
}
return ''
}
}
}
return "";
},
},
};
</script>
<style lang="scss" scoped>

View File

@ -2,9 +2,9 @@
<div class="page">
<topBar
v-if="topList.length > 0"
:top-list="topList"
:topList="topList"
:moren="moren"
/>
></topBar>
<div class="main">
<el-table
@ -20,19 +20,19 @@
prop="memberCode"
:label="'会员编号'"
width="200px"
/>
></el-table-column>
<el-table-column
align="center"
prop="memberName"
width="200px"
:label="'会员姓名'"
/>
></el-table-column>
<el-table-column
align="center"
prop="phone"
width="200px"
:label="'联系方式'"
/>
></el-table-column>
<el-table-column
align="center"
prop="endValidityDate"
@ -50,7 +50,7 @@
:label="'变更会员姓名'"
>
<template slot-scope="scope">
<el-input v-model="scope.row.newMemberName" disabled />
<el-input disabled v-model="scope.row.newMemberName"></el-input>
</template>
</el-table-column>
<el-table-column
@ -60,7 +60,7 @@
width="200px"
>
<template slot-scope="scope">
<el-input v-model="scope.row.newPhone" disabled />
<el-input disabled v-model="scope.row.newPhone"></el-input>
</template>
</el-table-column>
<el-table-column
@ -70,7 +70,7 @@
:label="'扣款币种'"
>
<template slot-scope="scope">
<el-input v-model="scope.row.pkAccountKeyVal" disabled />
<el-input disabled v-model="scope.row.pkAccountKeyVal"></el-input>
</template>
</el-table-column>
<el-table-column
@ -78,7 +78,7 @@
prop="singleAmount100"
label="单笔扣款金额(¥)"
width="200px"
/>
></el-table-column>
<el-table-column
fixed="right"
align="center"
@ -87,10 +87,10 @@
>
<template slot-scope="scope">
<el-button
@click="handleDelete(scope.row, scope.$index, tableData)"
type="text"
size="small"
style="color: #c73030"
@click="handleDelete(scope.row, scope.$index, tableData)"
>
{{ '删除' }}
</el-button>
@ -108,19 +108,19 @@
prop="memberCode"
label="会员编号"
width="200px"
/>
></el-table-column>
<el-table-column
align="center"
prop="businessTypeVal"
label="办理业务"
width="200px"
/>
></el-table-column>
<el-table-column
align="center"
prop="newValue"
label="变更业务"
width="200px"
/>
></el-table-column>
<el-table-column
align="center"
width="200px"
@ -128,7 +128,7 @@
:label="'扣款币种'"
>
<template slot-scope="scope">
<el-input v-model="scope.row.pkAccountKeyVal" disabled />
<el-input disabled v-model="scope.row.pkAccountKeyVal"></el-input>
</template>
</el-table-column>
<el-table-column
@ -138,7 +138,7 @@
label="单笔扣款金额(¥)"
>
<template slot-scope="scope">
<el-input v-model="scope.row.cost" disabled />
<el-input disabled v-model="scope.row.cost"></el-input>
</template>
</el-table-column>
@ -147,13 +147,13 @@
prop=""
label=""
width="200px"
/>
></el-table-column>
<el-table-column
align="center"
prop=""
label=""
width="200px"
/>
></el-table-column>
<el-table-column
fixed="right"
align="center"
@ -162,12 +162,12 @@
>
<template slot-scope="scope">
<el-button
type="text"
size="small"
style="color: #c73030"
@click="
handleDelete2(scope.row, scope.$index, handleBusinessList)
"
type="text"
size="small"
style="color: #c73030"
>
{{ '删除' }}
</el-button>
@ -215,28 +215,33 @@
>{{ item.label }}</el-button> -->
<el-button class="thebtn0" @click="saveDate(0)">
{{ '取消' }}</el-button>
{{ '取消' }}</el-button
>
<el-button
v-hasButtons="['ReviewBusinessExemptSign']"
class="thebtn1"
@click="saveDate(1)"
>{{ '免签' }}</el-button>
>{{ '免签' }}</el-button
>
<el-button
v-hasButtons="['ReviewBusinessExemptPay']"
class="thebtn2"
@click="saveDate(2)"
>{{ '免付' }}</el-button>
>{{ '免付' }}</el-button
>
<el-button
v-hasButtons="['ReviewBusinessExemptAll']"
class="thebtn3"
@click="saveDate(3)"
>{{ '全免' }}</el-button>
>{{ '全免' }}</el-button
>
<el-button
v-hasButtons="['ReviewBusinessConfirm']"
class="thebtn4"
@click="saveDate(4)"
>
{{ '确认' }}</el-button>
{{ '确认' }}</el-button
>
</div>
</div>
<el-dialog
@ -258,20 +263,24 @@
align="center"
prop="memberCode"
:label="'会员编号'"
/>
>
</el-table-column>
<el-table-column
align="center"
prop="errorMsg"
:label="'报错信息'"
/>
>
</el-table-column>
</el-table>
</div>
<div class="footer" style="text-align: center">
<div style="margin: 0 auto">
<el-button class="thebtn" @click="errorShow = false">
{{ '取消' }}</el-button>
{{ '取消' }}</el-button
>
<el-button type="primary" class="thebtn" @click="errorShow = false">
{{ '确认' }}</el-button>
{{ '确认' }}</el-button
>
</div>
</div>
</el-dialog>
@ -279,37 +288,37 @@
</template>
<script>
import topBar from '@/components/topBar'
import topBar from "@/components/topBar";
import {
saveHandelBusiness,
getPubEnumsProcessTyepe,
balanceCheck
} from '@/api/business.js'
balanceCheck,
} from "@/api/business.js";
export default {
name: 'Shyw',
name: "Shyw",
components: {
topBar
topBar,
},
data() {
return {
moren: 'shyw',
moren: "shyw",
topList: [
{
name: '基础业务',
path: 'jcyw'
path: "jcyw",
},
{
name: '订单业务',
path: 'ddyw'
path: "ddyw",
},
{
name: '确认业务',
path: 'shyw'
name: "确认业务",
path: "shyw",
},
{
name: '在线签呈',
path: 'zxqc'
}
name: "在线签呈",
path: "zxqc",
},
],
tableData: [],
processTypeList: [],
@ -317,177 +326,177 @@ export default {
btvo: {},
errorData: [],
errorShow: false,
thedata: {}
}
thedata: {},
};
},
created() {
this.thedata = JSON.parse(this.$route.query.data)
console.log('🌈先1', this.thedata)
this.tableData = this.thedata.businessOldMemberList
this.handleBusinessList = this.thedata.handleBusinessList
this.getPubEnumsProcessTyepe()
this.btvo = this.thedata.btvo
this.thedata = JSON.parse(this.$route.query.data);
console.log("🌈先1", this.thedata);
this.tableData = this.thedata.businessOldMemberList;
this.handleBusinessList = this.thedata.handleBusinessList;
this.getPubEnumsProcessTyepe();
this.btvo = this.thedata.btvo;
},
methods: {
formatDate(date) {
if (!date) return ''
const d = new Date(date)
if (isNaN(d.getTime())) return 'Invalid Date' //
const year = d.getFullYear()
const month = String(d.getMonth() + 1).padStart(2, '0')
const day = String(d.getDate()).padStart(2, '0')
const hours = String(d.getHours()).padStart(2, '0')
const minutes = String(d.getMinutes()).padStart(2, '0')
const seconds = String(d.getSeconds()).padStart(2, '0')
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
if (!date) return "";
const d = new Date(date);
if (isNaN(d.getTime())) return "Invalid Date"; //
const year = d.getFullYear();
const month = String(d.getMonth() + 1).padStart(2, "0");
const day = String(d.getDate()).padStart(2, "0");
const hours = String(d.getHours()).padStart(2, "0");
const minutes = String(d.getMinutes()).padStart(2, "0");
const seconds = String(d.getSeconds()).padStart(2, "0");
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
//
//
handleDelete(row, index, rows) {
this.$confirm('是否删除').then((_) => {
const delList = []
const delList = [];
this.tableData.forEach((ele, eindex) => {
if (row.memberCode == ele.memberCode) {
delList.push(eindex)
delList.push(eindex);
}
})
rows.splice(index, delList.length)
});
rows.splice(index, delList.length);
this.handleBusinessList = this.handleBusinessList.filter(
(ele) => ele.memberCode !== row.memberCode
)
);
this.thedata.businessMemberList =
this.thedata.businessMemberList.filter(
(ele) => ele.memberCode !== row.memberCode
)
})
);
});
},
handleDelete2(row, index, rows) {
this.$confirm('是否删除').then((_) => {
const delList2 = []
const delList3 = []
const delList2 = [];
const delList3 = [];
this.handleBusinessList.forEach((ele, eindex) => {
if (row.pkId == ele.pkId) {
delList2.push(eindex)
delList2.push(eindex);
}
})
});
this.thedata.businessMemberList.forEach((ele, eindex) => {
if (row.pkId == ele.pkId) {
delList3.push(eindex)
delList3.push(eindex);
}
})
rows.splice(index, delList2.length)
this.thedata.businessMemberList.splice(index, delList3.length)
})
});
rows.splice(index, delList2.length);
this.thedata.businessMemberList.splice(index, delList3.length);
});
},
getPubEnumsProcessTyepe() {
getPubEnumsProcessTyepe().then((res) => {
this.processTypeList = res.data
})
this.processTypeList = res.data;
});
},
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) {
return 'warning-row'
return "warning-row";
} else if (rowIndex % 2 == 0) {
return 'success-row'
return "success-row";
}
return ''
return "";
},
handleSelectionChange(val) {
this.multipleSelection = val
this.multipleSelection = val;
},
saveDate(index) {
this.thedata.businessOldMemberList = this.tableData
this.thedata.handleBusinessList = this.handleBusinessList
this.thedata.businessOldMemberList = this.tableData;
this.thedata.handleBusinessList = this.handleBusinessList;
// console.log('🌈thedata',this.thedata)
if (this.tableData.length > 0 && this.handleBusinessList.length > 0) {
if (index == 0) {
this.$router.go(-1)
this.$router.go(-1);
} else if (index == 2 || index == 4) {
//
//
if (index == 2) {
this.$router.push({
path: '/information/business/zxqc',
path: "/information/business/zxqc",
query: {
data: JSON.stringify(this.thedata),
index: index
}
})
index: index,
},
});
} else if (index == 4) {
//
const thebusinessCostVOList = this.thedata.businessCostVOList
//
const thebusinessCostVOList = this.thedata.businessCostVOList;
balanceCheck({ businessCostVOList: thebusinessCostVOList }).then(
(res) => {
if (res.code == 200) {
this.$router.push({
path: '/information/business/zxqc',
path: "/information/business/zxqc",
query: {
data: JSON.stringify(this.thedata),
index: index
}
})
index: index,
},
});
} else if (res.code == 504 && res.data) {
this.errorShow = true
this.errorData = res.data
this.errorShow = true;
this.errorData = res.data;
}
}
)
);
}
} else if (index == 1 || index == 3) {
//
//
const thehandleBusinessList = this.thedata.handleBusinessList
const thebusinessMemberList = this.thedata.businessMemberList
const thebusinessCostVOList = this.thedata.businessCostVOList
const thehandleBusinessList = this.thedata.handleBusinessList;
const thebusinessMemberList = this.thedata.businessMemberList;
const thebusinessCostVOList = this.thedata.businessCostVOList;
if (index == 1) {
//
//
balanceCheck({ businessCostVOList: thebusinessCostVOList }).then(
(res) => {
if (res.code == 200) {
saveHandelBusiness({
processType: index,
handleBusinessList: thehandleBusinessList,
businessMemberList: thebusinessMemberList
businessMemberList: thebusinessMemberList,
}).then((res) => {
this.$message({
message: res.msg,
type: 'success'
})
this.$router.go(-1)
})
type: "success",
});
this.$router.go(-1);
});
} else if (res.code == 504 && res.data) {
this.errorShow = true
this.errorData = res.data
this.errorShow = true;
this.errorData = res.data;
}
}
)
);
} else if (index == 3) {
saveHandelBusiness({
processType: index,
handleBusinessList: thehandleBusinessList,
businessMemberList: thebusinessMemberList
businessMemberList: thebusinessMemberList,
}).then((res) => {
if (res.code == 200) {
this.$message({
message: res.msg,
type: 'success'
})
this.$router.go(-1)
type: "success",
});
this.$router.go(-1);
} else if (res.code == 504 && res.data) {
this.errorShow = true
this.errorData = res.data
this.errorShow = true;
this.errorData = res.data;
}
})
});
}
}
} else {
this.$message({
message: '业务不能为空',
type: 'warning'
})
message: "业务不能为空",
type: "warning",
});
}
}
}
}
},
},
};
</script>
<style lang="scss" scoped>

View File

@ -64,7 +64,7 @@
<el-col :span="4">
<el-form-item :label="'结算等级'" prop="pkMaxAwards">
<el-select
v-model="queryParams.pkSettleGrade"
v-model="queryParams.pkgettleGrade"
clearable
:placeholder="'请选择'"
>
@ -79,6 +79,38 @@
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item :label="$t('当月奖衔')" prop="pkAwards">
<el-select
v-model="queryParams.pkAwards"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in awardsList"
:key="item.pkId"
:label="item.awardsName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('荣誉奖衔')" prop="pkMaxAwards">
<el-select
v-model="queryParams.pkMaxAwards"
clearable
:placeholder="'请选择'"
>
<el-option
v-for="item in awardsList"
:key="item.pkId"
:label="item.awardsName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'隶属体系'" prop="vertexId">
<el-select
@ -221,6 +253,10 @@
/>
</el-form-item>
</el-col>
</el-row>
<el-collapse-transition>
<div v-show="isActive">
<el-row>
<el-col :span="4">
<el-form-item :label="$t('是否激活')" prop="isActivate">
<el-select
@ -237,10 +273,19 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-collapse-transition>
<div v-show="isActive">
<el-row>
<el-col :span="8">
<el-form-item :label="$t('收益地址')" prop="accountStatus">
<el-cascader
v-model="address"
class="area"
:options="areaData"
:placeholder="'请选择省市区'"
:props="regionParams"
@change="flChange"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'创建日期'" prop="code">
<el-date-picker
@ -380,19 +425,38 @@
width="180"
/>
<el-table-column
v-if="tableColumnVisible('parMemberCode') && allTxt.parMemberCode"
v-if="menuList[1].checked == true && allTxt.parMemberCode"
align="center"
prop="parMemberCode"
:label="'推荐编号'"
width="180"
/>
<el-table-column
v-if="tableColumnVisible('parMemberName') && allTxt.parMemberName"
v-if="menuList[2].checked == true && allTxt.parMemberName"
align="center"
prop="parMemberName"
:label="'推荐姓名'"
width="180"
/>
<el-table-column
v-if="allTxt.pkAwardsVal"
align="center"
prop="pkAwardsVal"
:label="$t('当月奖衔')"
width="160"
/>
<el-table-column
align="center"
prop="pkRangeAwardsVal"
:label="$t('分红奖衔')"
width="160"
/>
<el-table-column
align="center"
prop="pkMaxAwardsVal"
:label="$t('荣誉奖衔')"
width="160"
/>
<el-table-column
v-if="allTxt.orderSourceVal"
align="center"
@ -401,21 +465,21 @@
width="180"
/>
<el-table-column
v-if="tableColumnVisible('pkRegisterGradeVal') && allTxt.pkRegisterGradeVal"
v-if="menuList[3].checked == true && allTxt.pkRegisterGradeVal"
align="center"
prop="pkRegisterGradeVal"
:label="'注册等级'"
width="180"
/>
<el-table-column
v-if="tableColumnVisible('pkSettleGradeVal') && allTxt.pkSettleGradeVal"
v-if="menuList[4].checked == true && allTxt.pkgettleGradeval"
align="center"
prop="pkSettleGradeVal"
prop="pkgettleGradeval"
:label="'结算等级'"
width="180"
/>
<el-table-column
v-if="tableColumnVisible('consumeMoney') && allTxt.consumeMoney"
v-if="menuList[5].checked == true && allTxt.consumeMoney"
align="center"
prop="consumeMoney"
:label="'注册金额' + `(${isLocalSymbol()})`"
@ -426,7 +490,7 @@
</template>
</el-table-column>
<el-table-column
v-if="tableColumnVisible('consumeAchieve') && allTxt.consumeAchieve"
v-if="menuList[6].checked == true && allTxt.consumeAchieve"
align="center"
:label="`${'注册业绩'}` + `(${isLocals()})`"
prop="consumeAchieve"
@ -437,7 +501,7 @@
</template>
</el-table-column>
<el-table-column
v-if="tableColumnVisible('vertexName') && allTxt.vertexName"
v-if="menuList[7].checked == true && allTxt.vertexName"
align="center"
prop="vertexName"
:label="'隶属体系'"
@ -451,14 +515,14 @@
width="180"
></el-table-column> -->
<el-table-column
v-if="tableColumnVisible('teamName') && allTxt.teamName"
v-if="menuList[11].checked == true && allTxt.teamName"
align="center"
prop="teamName"
label="隶属团队"
width="180"
/>
<el-table-column
v-if="tableColumnVisible('isRealNameVal') && allTxt.isRealNameVal"
v-if="menuList[8].checked == true && allTxt.isRealNameVal"
align="center"
prop="isRealNameVal"
:label="'实名认证'"
@ -476,19 +540,37 @@
</template>
</el-table-column>
<el-table-column
v-if="tableColumnVisible('accountStatusVal') && allTxt.accountStatusVal"
v-if="menuList[9].checked == true && allTxt.accountStatusVal"
align="center"
prop="accountStatusVal"
:label="'账户状态'"
width="180"
/>
<el-table-column
v-if="tableColumnVisible('memberAccountVal') && allTxt.memberAccountVal"
v-if="menuList[10].checked == true && allTxt.memberAccountVal"
align="center"
prop="memberAccountVal"
:label="'钱包状态'"
width="180"
/>
<el-table-column
align="center"
prop="giftProvince"
:label="$t('收益区省')"
width="180"
/>
<el-table-column
align="center"
prop="giftCity"
:label="$t('收益区市')"
width="180"
/>
<el-table-column
align="center"
prop="giftCounty"
:label="$t('收益区县(区)')"
width="180"
/>
<el-table-column
v-if="allTxt.incomeStatusVal"
@ -497,13 +579,6 @@
:label="'收益状态'"
width="180"
/>
<el-table-column
v-if="allTxt.incomeStatusVal"
align="center"
prop="areaName"
label="分公司所属省份"
width="180"
/>
<el-table-column
v-if="allTxt.creationTime"
align="center"
@ -645,6 +720,7 @@ import {
} from '@/api/member'
import {
getgradeRanglist,
getAwardsListChiose,
getRegistration
} from '@/api/level'
import { teamList } from '@/api/business'
@ -705,7 +781,7 @@ export default {
id: 4,
text: '结算等级',
checked: true,
prop: 'pkSettleGradeVal'
prop: 'pkgettleGradeval'
},
{
id: 5,
@ -799,7 +875,7 @@ export default {
phone: '', //
changeNumber: '', //
pkRegisterGrade: '', //
pkSettleGrade: '', //
pkgettleGrade: '', //
pkAwards: '', //
vertexId: '', //
teamId: '', //
@ -850,6 +926,8 @@ export default {
//
this.getMemberList()
this.getgradeRanglist()
this.getAwardsListChiose()
this.getvertexValue()
this.getmemberTeamList()
this.getRegistration()
@ -871,12 +949,6 @@ export default {
this.getUserRole()
},
methods: {
tableColumnVisible(column) {
if (column === 'pkSettleGradeVal') {
console.log(this.menuList.find((item) => item.prop === column)?.checked, '......column')
}
return this.menuList.find((item) => item.prop === column)?.checked
},
getAllArea() {
areaList().then((res) => {
this.areaData = res.data
@ -914,7 +986,6 @@ export default {
},
getUserRole() {
getRoleMenu('Member').then((res) => {
console.log(res.data, '......res.data')
const obj = {}
res.data.forEach((item) => {
obj[item] = 1
@ -1051,6 +1122,12 @@ export default {
this.vertexList = res.data
})
},
//
getAwardsListChiose() {
getAwardsListChiose().then((res) => {
this.awardsList = res.rows
})
},
//
getgradeRanglist() {
getgradeRanglist().then((res) => {

View File

@ -35,6 +35,22 @@
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'真实奖衔'" prop="pkAwards">
<el-select
v-model="queryParams.pkAwards"
clearable
placeholder=""
>
<el-option
v-for="item in awardsList"
:key="item.pkId"
:label="item.awardsName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'注册等级'" prop="pkRegisterGrade">
@ -326,7 +342,20 @@
:label="'结算等级'"
width="180"
/>
<el-table-column
v-if="menuList[3].checked==true&&allTxt.awardsVal"
align="center"
prop="awardsVal"
:label="'真实奖衔'"
width="180"
/>
<el-table-column
v-if="allTxt.pkMaxAwardsVal"
align="center"
prop="pkMaxAwardsVal"
:label="'荣誉奖衔'"
width="180"
/>
<el-table-column
v-if="menuList[4].checked==true&&allTxt.sexVal"
align="center"
@ -428,6 +457,7 @@ import {
} from '@/api/member'
import {
getgradeRanglist,
getAwardsListChiose,
getRegistration, getCardType, getSex
} from '@/api/level'
import { findAllArea } from '@/api/product'
@ -467,7 +497,12 @@ export default {
checked: true,
prop: 'pkSettleGrade'
},
{
id: 42,
text: '真实奖衔',
checked: true,
prop: 'pkAwards'
},
{
id: 33,
text: '性别',
@ -571,6 +606,18 @@ export default {
name: '真实信息',
path: 'RealInfo'
}
// {
// name: '',
// path: "ddyw",
// },
// {
// name: "",
// path: "shyw",
// },
// {
// name: "线",
// path: "zxqc",
// },
],
colums: [],
checkLabels: [],
@ -612,6 +659,8 @@ export default {
//
this.getMemberList()
this.getgradeRanglist()
this.getAwardsListChiose()
this.getSexs()
this.getCardTypes()
this.getAllArea()
@ -765,6 +814,12 @@ export default {
this.vertexList = res.data
})
},
//
getAwardsListChiose() {
getAwardsListChiose().then((res) => {
this.awardsList = res.rows
})
},
//
getgradeRanglist() {
getgradeRanglist().then((res) => {

View File

@ -1558,7 +1558,7 @@ export default {
}
},
changeAllData() {
this.tableData.forEach((item, index) => {
this.tableData.forEach((item) => {
if (this.changeData.placeDept != '') {
item.placeDept = this.changeData.placeDept
item.placeDeptVal = this.changeData.placeDeptVal
@ -1634,9 +1634,6 @@ export default {
item.autoFlag = this.changeData.autoFlag
item.autoFlagVal = this.changeData.autoFlagVal
}
item.autoFlag = 1
item.autoFlagVal = '否'
this.$set(this.tableData, index, item)
})
},
handleSelectionChange(val) {
@ -2009,8 +2006,7 @@ export default {
// contentAbstract: '',
remark: '',
specs: [],
autoFlag: 1,
autoFlagVal: '否'
autoFlag: ''
})
this.tableData.push(obj)
this.getColSpanData('remark', this.tableData)

View File

@ -894,7 +894,7 @@
<div v-else>{{ scope.row.recAddress }}</div>
</template>
</el-table-column>
<!-- <el-table-column
<el-table-column
align="center"
width="150"
prop="autoFlag"
@ -935,7 +935,7 @@
</el-select>
<div v-else>{{ scope.row.autoFlagVal }}</div>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column
align="center"
width="150"
@ -1702,7 +1702,9 @@ export default {
}
},
changeAllData() {
this.tableData.forEach((item, index) => {
this.tableData.forEach((item) => {
item.autoFlag = ''
item.autoFlagVal = ''
if (this.changeData.placeDept != '') {
item.placeDept = this.changeData.placeDept
item.placeDeptVal = this.changeData.placeDeptVal
@ -1780,9 +1782,6 @@ export default {
item.autoFlagVal = this.changeData.autoFlagVal
this.$forceUpdate()
}
item.autoFlag = 1
item.autoFlagVal = '否'
this.$set(this.tableData, index, item)
})
},
handleSelectionChange(val) {
@ -2144,9 +2143,7 @@ export default {
// autoFlag: '',
// contentAbstract: '',
remark: '',
specs: [],
autoFlag: 1,
autoFlagVal: '否'
specs: []
})
this.tableData.push(obj)
this.getColSpanData('remark', this.tableData)

View File

@ -36,7 +36,7 @@ module.exports = {
lintOnSave: false,
productionSourceMap: false,
devServer: {
port: 9655,
port: 9555,
open: true,
overlay: {
warnings: false,
@ -44,7 +44,7 @@ module.exports = {
},
proxy: {
'/prod-api': {
target: 'http://192.168.0.104:8080',
target: 'http://localhost:8080',
changeOrigin: true,
pathRewrite: { '^/prod-api': '' }
}