angelo
/
web-store-retail-admin
forked from angelo/web-retail-admin
3
0
Fork 0
Code Pull Requests Activity

Compare commits

base: angelo:8f9732b6be3cf6984757305e87fb1919f939933e
Branches Tags
angelo:master
angelo:base-online
angelo:test
angelo:dev
angelo:feat/withDrawal
angelo:test
angelo:dev
angelo:base-online
angelo:feat/bonusTotal
angelo:feat/goods-sort-config
angelo:feat/summaryDashboard
angelo:feat/goods/goodsAreaIncome
angelo:feat/goodsEdit-boxNum
angelo:feat/vertex-group
angelo:master
..
compare: angelo/web-store-retail-admin:04a5f057c25960c4438f6f48b033c43045155859
Branches Tags
angelo/web-store-retail-admin:base-online
angelo/web-store-retail-admin:test
angelo/web-store-retail-admin:dev
angelo/web-store-retail-admin:feat/withDrawal
angelo/web-store-retail-admin:master
angelo:test
angelo:dev
angelo:base-online
angelo:feat/bonusTotal
angelo:feat/goods-sort-config
angelo:feat/summaryDashboard
angelo:feat/goods/goodsAreaIncome
angelo:feat/goodsEdit-boxNum
angelo:feat/vertex-group
angelo:master

10 Commits
8f9732b6be ... 04a5f057c2

Author SHA1 Message Date
woody 04a5f057c2 feat(memberRetailRegion): 收益区域配置逻辑调整 2025-07-10 16:33:41 +08:00
woody db651039dc feat(navBar): 移除语言选择下拉框 2025-07-08 11:39:13 +08:00
cabbage 3c70e9390c ## 隐藏添加产品中进销存接口调用； 2025-07-07 17:34:25 +08:00
cabbage 08dcf48590 ## 隐藏添加产品中进销存接口调用； 2025-07-07 16:46:42 +08:00
woody 5e4befb340 feat(emptyOrder、nowdelivery): 空单注册不展示激活字段，默认值为否。立即发货移除追溯相关字段 2025-06-23 16:23:10 +08:00
woody f9ac26a5b4 feat(business): 办理业务添加分公司选择所属省份选择逻辑 2025-06-23 14:53:30 +08:00
woody a1ea001b62 feat(business): 办理业务添加分公司是所属省份 2025-06-23 13:27:35 +08:00
woody c83cb955d2 fix(member): 结算等级问题处理 2025-06-21 09:45:19 +08:00
woody 20e1ca0bb3 feat(realInfo): 真实信息移除奖衔字段 2025-06-20 18:03:43 +08:00
woody 62270b9d73 chore(env): update env 2025-06-20 16:20:46 +08:00
17 changed files with 814 additions and 949 deletions
Show Stats Expand all files Collapse all files

2
.env.development
View File

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

3
.env.production
View File

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

2
package.json
View File

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

6
src/api/business.js
View File

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

14
src/api/user.js
View File

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

2
src/components/Delivery/nowdelivery.vue
View File

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

149
src/layout/components/Navbar.vue
View File

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

448
src/views/configManage/memberRetailRegion/index.vue
View File

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

144
src/views/goodsManage/productRelease/jcsz.vue
View File

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

14
src/views/goodsManage/productRelease/productDetail.vue
View File

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

461
src/views/information/business/index.vue
View File

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

261
src/views/information/business/shyw.vue
View File

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

143
src/views/information/member/index.vue
View File

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

59
src/views/information/realInfo/index.vue
View File

@ -35,22 +35,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </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-col :span="4">
<el-form-item :label="'注册等级'" prop="pkRegisterGrade"> <el-form-item :label="'注册等级'" prop="pkRegisterGrade">
@ -342,20 +326,7 @@
:label="'结算等级'" :label="'结算等级'"
width="180" 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 <el-table-column
v-if="menuList[4].checked==true&&allTxt.sexVal" v-if="menuList[4].checked==true&&allTxt.sexVal"
align="center" align="center"
@ -457,7 +428,6 @@ import {
} from '@/api/member' } from '@/api/member'
import { import {
getgradeRanglist, getgradeRanglist,
getAwardsListChiose,
getRegistration, getCardType, getSex getRegistration, getCardType, getSex
} from '@/api/level' } from '@/api/level'
import { findAllArea } from '@/api/product' import { findAllArea } from '@/api/product'
@ -497,12 +467,7 @@ export default {
checked: true, checked: true,
prop: 'pkSettleGrade' prop: 'pkSettleGrade'
}, },
{
id: 42,
text: '真实奖衔',
checked: true,
prop: 'pkAwards'
},
{ {
id: 33, id: 33,
text: '性别', text: '性别',
@ -606,18 +571,6 @@ export default {
name: '真实信息', name: '真实信息',
path: 'RealInfo' path: 'RealInfo'
} }
// {
// name: '订单业务',
// path: "ddyw",
// },
// {
// name: "审核业务",
// path: "shyw",
// },
// {
// name: "在线签呈",
// path: "zxqc",
// },
], ],
colums: [], colums: [],
checkLabels: [], checkLabels: [],
@ -659,8 +612,6 @@ export default {
// 查询会员信息 // 查询会员信息
this.getMemberList() this.getMemberList()
this.getgradeRanglist() this.getgradeRanglist()
this.getAwardsListChiose()
this.getSexs() this.getSexs()
this.getCardTypes() this.getCardTypes()
this.getAllArea() this.getAllArea()
@ -814,12 +765,6 @@ export default {
this.vertexList = res.data this.vertexList = res.data
}) })
}, },
// 真实奖衔下拉选
getAwardsListChiose() {
getAwardsListChiose().then((res) => {
this.awardsList = res.rows
})
},
// 注册等级下拉 // 注册等级下拉
getgradeRanglist() { getgradeRanglist() {
getgradeRanglist().then((res) => { getgradeRanglist().then((res) => {

8
src/views/information/specialBusiness/emptyOrder/dataList.vue
View File

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

15
src/views/information/specialBusiness/emptyOrder/index.vue
View File

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

4
vue.config.js
View File

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