yangjun
/
sadjv3_admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

认证类型

This commit is contained in:
曹磊 2024-08-14 22:02:27 +08:00
parent 26ab975341
commit 2bc745d1ee
8 changed files with 446 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/router/index.js
View File

@ -83,7 +83,7 @@ const mainRoutes = {
{ path: '/comment', component: _import('comment/comment'), name: 'comment', meta: { title: '评价中心', isTab: true } }, { path: '/comment', component: _import('comment/comment'), name: 'comment', meta: { title: '评价中心', isTab: true } },
{ path: '/business', component: _import('business/business'), name: 'business', meta: { title: '投诉中心', isTab: true } }, { path: '/business', component: _import('business/business'), name: 'business', meta: { title: '投诉中心', isTab: true } },
{ path: '/emergencyHelp', component: _import('business/emergencyHelp'), name: 'emergencyHelp', meta: { title: '紧急求助', isTab: true } }, { path: '/emergencyHelp', component: _import('business/emergencyHelp'), name: 'emergencyHelp', meta: { title: '紧急求助', isTab: true } },
{ path: '/travel', component: _import('taskConfig/travel'), name: 'travel', meta: { title: '出行配置', isTab: true } }, { path: '/travel', component: _import('taskConfig/travel'), name: 'travel', meta: { title: '开放城市', isTab: true } },
{ path: '/agent', component: _import('recruit/agent'), name: 'agent', meta: { title: '推广代理', isTab: true } }, { path: '/agent', component: _import('recruit/agent'), name: 'agent', meta: { title: '推广代理', isTab: true } },
// 2023.02.16 按摩 4.0版本 新增 // 2023.02.16 按摩 4.0版本 新增

274
src/views/applyList/technician.vue
View File

@ -92,7 +92,13 @@
fixed="left" fixed="left"
> >
</el-table-column> </el-table-column>
<el-table-column prop="classifyName" label="项目类型" width="150"> <el-table-column prop="classifyId" label="项目类型" width="150">
<template slot-scope="scope">
<div v-for="(item, index) in scope.row.artificerClassifyList" :key="index"
class="borderInner">
<div>{{ item.classifyName }}</div>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="artificerName" label="师傅名称" fixed="left"> <el-table-column prop="artificerName" label="师傅名称" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
@ -832,8 +838,57 @@
:visible.sync="dialogFormVisible8" :visible.sync="dialogFormVisible8"
center center
width="80%" width="80%"
top="0"
> >
<div> <div>
<div style="position: relative; display: inline-block; margin: 5px">
<span>服务类型：</span>
<el-select
clearable
v-model="userMassageClassifyId"
style="width: 150px; margin-left: 10px">
<el-option
v-for="item in fwData"
:key="item.id"
:label="item.value"
:value="item.id">
</el-option>
</el-select>&nbsp;&nbsp;
</div>
<div style="position: relative; display: inline-block">
<span>项目名称：</span>
<el-input
style="width: 200px"
placeholder="请输入服务名称"
v-model="userMassageTitle">
</el-input>
</div>
<div style="position: relative; display: inline-block">
<span>状态：</span>
<el-select
clearable
v-model="userMassageStatus"
style="width: 150px; margin-left: 10px">
<el-option value="0" label="上架"></el-option>
<el-option value="1" label="下架"></el-option>
</el-select>
</div>
<el-button
style="margin: 10px"
size="mini"
type="primary"
icon="document"
@click="userMassageSelect"
>查询
</el-button>
<el-button
style="margin: 10px"
size="mini"
type="primary"
icon="document"
@click="userMassageClear"
>重置
</el-button>&nbsp;&nbsp;
<el-button <el-button
style="margin: 10px 0" style="margin: 10px 0"
:disabled="!isAuth('locality:add')" :disabled="!isAuth('locality:add')"
@ -841,8 +896,7 @@
type="primary" type="primary"
icon="document" icon="document"
@click="choiadd()" @click="choiadd()"
>添加项目</el-button >添加项目</el-button>
>
</div> </div>
<el-table v-loading="tableDataLoading1" :data="tableData3"> <el-table v-loading="tableDataLoading1" :data="tableData3">
<el-table-column <el-table-column
@ -852,6 +906,13 @@
fixed="left" fixed="left"
> >
</el-table-column> </el-table-column>
<el-table-column
prop="classifyName"
label="项目类型"
width="100"
fixed="left"
>
</el-table-column>
<el-table-column <el-table-column
prop="title" prop="title"
label="项目名称" label="项目名称"
@ -913,9 +974,9 @@
</el-table-column> </el-table-column>
<el-table-column prop="oldPrice" label="原价"> </el-table-column> <el-table-column prop="oldPrice" label="原价"> </el-table-column>
<el-table-column prop="price" label="现价"> </el-table-column> <el-table-column prop="price" label="现价"> </el-table-column>
<el-table-column prop="memberPrice" label="会员价"> </el-table-column> <!-- <el-table-column prop="memberPrice" label="会员价"> </el-table-column>-->
<el-table-column prop="artificerPrice" label="师傅价"> <!-- <el-table-column prop="artificerPrice" label="师傅价">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="duration" label="时长(分钟)" width="100"> <el-table-column prop="duration" label="时长(分钟)" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="labels" label="标签" width="200"> <el-table-column prop="labels" label="标签" width="200">
@ -1102,9 +1163,7 @@
<!-- 添加、修改服务项目 --> <!-- 添加、修改服务项目 -->
<el-dialog :title="titles" :visible.sync="dialogFormVisible9" center> <el-dialog :title="titles" :visible.sync="dialogFormVisible9" center>
<div style="margin-bottom: 10px"> <div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right" <span style="width: 200px; display: inline-block; text-align: right">项目类型：</span>
>项目类型：</span
>
<el-select v-model="classType" style="width: 50%"> <el-select v-model="classType" style="width: 50%">
<el-option <el-option
v-for="item in fwData" v-for="item in fwData"
@ -1112,13 +1171,11 @@
:label="item.value" :label="item.value"
:value="item.id" :value="item.id"
> >
</el-option> </el-select </el-option>
>&nbsp;&nbsp;&nbsp; </el-select>&nbsp;&nbsp;&nbsp;
</div> </div>
<div style="margin-bottom: 10px"> <div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right" <span style="width: 200px; display: inline-block; text-align: right">项目名称：</span>
>项目名称：</span
>
<el-input <el-input
style="width: 50%" style="width: 50%"
v-model="massageTypeTitle" v-model="massageTypeTitle"
@ -1128,19 +1185,15 @@
</el-input> </el-input>
</div> </div>
<div style="margin-bottom: 10px; display: flex"> <div style="margin-bottom: 10px; display: flex">
<span style="width: 200px; display: inline-block; text-align: right" <span style="width: 200px; display: inline-block; text-align: right">项目图片：</span>
>项目图片：</span <div style="
>
<div
style="
width: 148px; width: 148px;
height: 148px; height: 148px;
border: 1px dashed #c0ccda; border: 1px dashed #c0ccda;
border-radius: 6px; border-radius: 6px;
text-align: center; text-align: center;
line-height: 148px; line-height: 148px;
" ">
>
<el-upload <el-upload
class="avatar-uploader" class="avatar-uploader"
v-model="massageImg" v-model="massageImg"
@ -1216,32 +1269,32 @@
placeholder="请输入现价" placeholder="请输入现价"
></el-input> ></el-input>
</div> </div>
<div style="margin-bottom: 10px"> <!-- <div style="margin-bottom: 10px">-->
<span style="width: 200px; display: inline-block; text-align: right" <!-- <span style="width: 200px; display: inline-block; text-align: right"-->
>会员价：</span <!-- >会员价：</span-->
> <!-- >-->
<el-input <!-- <el-input-->
style="width: 50%" <!-- style="width: 50%"-->
v-model="memberPrice" <!-- v-model="memberPrice"-->
onkeyup="value=value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" <!-- onkeyup="value=value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"-->
type="number" <!-- type="number"-->
min="0" <!-- min="0"-->
placeholder="请输入会员价" <!-- placeholder="请输入会员价"-->
></el-input> <!-- ></el-input>-->
</div> <!-- </div>-->
<div style="margin-bottom: 10px"> <!-- <div style="margin-bottom: 10px">-->
<span style="width: 200px; display: inline-block; text-align: right" <!-- <span style="width: 200px; display: inline-block; text-align: right"-->
>师傅价：</span <!-- >师傅价：</span-->
> <!-- >-->
<el-input <!-- <el-input-->
style="width: 50%" <!-- style="width: 50%"-->
v-model="artificerPrice" <!-- v-model="artificerPrice"-->
onkeyup="value=value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" <!-- onkeyup="value=value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"-->
type="number" <!-- type="number"-->
min="0" <!-- min="0"-->
placeholder="请输入师傅价" <!-- placeholder="请输入师傅价"-->
></el-input> <!-- ></el-input>-->
</div> <!-- </div>-->
<div style="margin-bottom: 10px"> <div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right" <span style="width: 200px; display: inline-block; text-align: right"
>项目时长(分钟)：</span >项目时长(分钟)：</span
@ -1416,10 +1469,67 @@
</el-pagination> </el-pagination>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="项目列表" :visible.sync="dialogFormVisible11" center> <el-dialog title="项目列表" :visible.sync="dialogFormVisible11" center width="80%" top="0">
<el-table v-loading="tableDataLoading" :data="tableData4.list"> <div>
<div style="position: relative; display: inline-block; margin: 5px">
<span>服务类型：</span>
<el-select
clearable
v-model="massageClassifyId"
style="width: 150px; margin-left: 10px">
<el-option
v-for="item in fwData"
:key="item.id"
:label="item.value"
:value="item.id">
</el-option>
</el-select>&nbsp;&nbsp;
</div>
<div style="position: relative; display: inline-block">
<span>项目名称：</span>
<el-input
style="width: 200px"
placeholder="请输入服务名称"
v-model="massageTitle">
</el-input>
</div>
<div style="position: relative; display: inline-block">
<span>状态：</span>
<el-select
clearable
v-model="massageStatus"
style="width: 150px; margin-left: 10px">
<el-option value="1" label="上架"></el-option>
<el-option value="2" label="下架"></el-option>
</el-select>
</div>
<el-button
style="margin: 10px"
size="mini"
type="primary"
icon="document"
@click="massageSelect"
>查询
</el-button>
<el-button
style="margin: 10px"
size="mini"
type="primary"
icon="document"
@click="massageClear"
>重置
</el-button>&nbsp;&nbsp;
</div>
<el-table v-loading="tableDataLoading" :data="tableData4.list">
<el-table-column prop="massageTypeId" label="编号" width="80"> <el-table-column prop="massageTypeId" label="编号" width="80">
</el-table-column> </el-table-column>
<el-table-column
prop="classifyName"
label="项目类型"
width="100"
>
</el-table-column>
<el-table-column prop="title" label="项目名称"> </el-table-column> <el-table-column prop="title" label="项目名称"> </el-table-column>
<el-table-column prop="massageImg" label="项目图片"> <el-table-column prop="massageImg" label="项目图片">
<template slot-scope="scope"> <template slot-scope="scope">
@ -1468,9 +1578,9 @@
</el-table-column> </el-table-column>
<el-table-column prop="oldPrice" label="原价"> </el-table-column> <el-table-column prop="oldPrice" label="原价"> </el-table-column>
<el-table-column prop="price" label="现价"> </el-table-column> <el-table-column prop="price" label="现价"> </el-table-column>
<el-table-column prop="memberPrice" label="会员价"> </el-table-column> <!-- <el-table-column prop="memberPrice" label="会员价"> </el-table-column>-->
<el-table-column prop="artificerPrice" label="师傅价"> <!-- <el-table-column prop="artificerPrice" label="师傅价">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="duration" label="时长(分钟)"> <el-table-column prop="duration" label="时长(分钟)">
</el-table-column> </el-table-column>
<el-table-column prop="addNum" label="加钟次数"> </el-table-column> <el-table-column prop="addNum" label="加钟次数"> </el-table-column>
@ -2087,6 +2197,12 @@ export default {
{ validator: materialPackageRulesFun, trigger: "change" }, { validator: materialPackageRulesFun, trigger: "change" },
], ],
}, },
userMassageTitle: '',
userMassageClassifyId: '',
userMassageStatus: '',
massageTitle: '',
massageClassifyId: '',
massageStatus: '',
}; };
}, },
methods: { methods: {
@ -3638,6 +3754,55 @@ export default {
} }
}); });
}, },
userMassageSelect() {
this.tableDataLoading1 = true;
this.$http({
url: this.$http.adornUrl("artificer/selectArtificerMassageList"),
method: "get",
params: this.$http.adornParams({
artificerId: this.artificerId,
title: this.userMassageTitle,
classifyId: this.userMassageClassifyId,
status: this.userMassageStatus,
}),
}).then(({ data }) => {
console.log("```", data);
if (data.code == 0) {
this.tableDataLoading1 = false;
let returnData = data.data;
this.tableData3 = returnData;
console.log(this.tableData3);
for (var i in this.tableData3) {
if (this.tableData3[i].contentImg) {
this.tableData3[i].contentImg =
this.tableData3[i].contentImg.split(",");
}
}
} else {
this.$notify({
title: "提示",
duration: 1800,
message: data.msg,
type: "warning",
});
}
});
},
userMassageClear(){
this.userMassageTitle = '';
this.userMassageClassifyId = '';
this.userMassageStatus = '';
this.userMassageSelect();
},
massageSelect() {
this.classSelect2(this.artificerId);
},
massageClear(){
this.massageTitle = '';
this.massageClassifyId = '';
this.massageStatus = '';
this.classSelect2(this.artificerId);
},
// 项目列表数据 // 项目列表数据
classSelect2(artificerId) { classSelect2(artificerId) {
this.$http({ this.$http({
@ -3648,12 +3813,13 @@ export default {
page: this.page3, page: this.page3,
classifyId: this.artificerOfclassity, classifyId: this.artificerOfclassity,
limit: this.limit3, limit: this.limit3,
status: "",
sort: "", sort: "",
city: this.citys, city: this.citys,
title: this.title,
authentication: "", authentication: "",
by: "", by: "",
title: this.massageTitle,
classifyIdT: this.massageClassifyId,
status: this.massageStatus,
}), }),
}).then(({ data }) => { }).then(({ data }) => {
console.log("````````````", data); console.log("````````````", data);

25
src/views/autonym/autonym.vue
View File

@ -42,7 +42,13 @@
<span v-else>个人</span> <span v-else>个人</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column prop="classifyName" label="项目类型" width="150"> <el-table-column prop="classifyId" label="项目类型" width="150">
<template slot-scope="scope">
<div v-for="(item, index) in scope.row.artificerClassifyList" :key="index"
class="borderInner">
<div>{{ item.classifyName }}</div>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="姓名" width="100"> <el-table-column prop="name" label="姓名" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -197,7 +203,7 @@
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<span style="width: 200px;display: inline-block;text-align: right;">项目类型：</span> <span style="width: 200px;display: inline-block;text-align: right;">项目类型：</span>
<el-select v-model="classifyIds" style="width:50%;margin-left: 10px;"> <el-select v-model="classifyIds" multiple style="width:50%;margin-left: 10px;">
<el-option v-for="item in fwData" :key="item.id" :label="item.value" :value="item.id"> <el-option v-for="item in fwData" :key="item.id" :label="item.value" :value="item.id">
</el-option> </el-option>
</el-select>&nbsp;&nbsp; </el-select>&nbsp;&nbsp;
@ -368,7 +374,8 @@ import { serverPaths } from '@/utils/enumData'
// ```` // ````
birthdate: '', birthdate: '',
classifyIds: '', // classifyIds: '',
classifyIds: [],
phone: '', phone: '',
name: '', name: '',
sex: '', sex: '',
@ -665,7 +672,13 @@ import { serverPaths } from '@/utils/enumData'
updateClicks(row) { updateClicks(row) {
this.birthdate = row.birthdate this.birthdate = row.birthdate
this.ids = row.id this.ids = row.id
this.classifyIds = row.classifyId // this.classifyIds = row.classifyId
this.classifyIds = [];
let classifyList = row.artificerClassifyList;
for(let i=0;i<classifyList.length;i++){
let classify = classifyList[i];
this.classifyIds.push(classify["classifyId"]);
}
this.name = row.name this.name = row.name
this.sex = row.sex this.sex = row.sex
this.address = row.address this.address = row.address
@ -682,14 +695,14 @@ import { serverPaths } from '@/utils/enumData'
this.dialogFormVisibleR = true this.dialogFormVisibleR = true
}, },
refusetoUp() { refusetoUp() {
let classifyId = this.classifyIds.join(",");
this.$http({ this.$http({
url: this.$http.adornUrl('admin/realname/updateRealName'), url: this.$http.adornUrl('admin/realname/updateRealName'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'userId': this.userId, 'userId': this.userId,
'classifyId': this.classifyIds, 'classifyId': classifyId,
'name': this.name, 'name': this.name,
'sex': this.sex,
'address': this.address, 'address': this.address,
'individualResume': this.individualResume, 'individualResume': this.individualResume,
'certification': this.certification.toString(), 'certification': this.certification.toString(),

3
src/views/bl/massage/massagePackage.vue
View File

@ -82,8 +82,7 @@
icon="document" icon="document"
@click="handleClear" @click="handleClear"
>重置 >重置
</el-button </el-button>&nbsp;&nbsp;
>&nbsp;&nbsp;
<div style="text-align: right; display: inline-block"> <div style="text-align: right; display: inline-block">
<el-button <el-button
style="margin: 10px" style="margin: 10px"

35
src/views/members/memberDetails.vue
View File

@ -20,9 +20,9 @@
<span v-if="scope.row.vipNameType == 0">月</span> <span v-if="scope.row.vipNameType == 0">月</span>
<span v-if="scope.row.vipNameType == 1">季</span> <span v-if="scope.row.vipNameType == 1">季</span>
<span v-if="scope.row.vipNameType == 2">年</span> <span v-if="scope.row.vipNameType == 2">年</span>
<span v-if="scope.row.vipNameType == 3">新</span> <span v-if="scope.row.vipNameType == 3">资深</span>
<span v-if="scope.row.vipNameType == 4">专</span> <span v-if="scope.row.vipNameType == 4">金牌</span>
<span v-if="scope.row.vipNameType == 5">资</span> <span v-if="scope.row.vipNameType == 5">专家</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="vipName" label="会员名称"> <el-table-column prop="vipName" label="会员名称">
@ -63,9 +63,9 @@
<el-radio :label="0" :hidden="vipShow">月</el-radio> <el-radio :label="0" :hidden="vipShow">月</el-radio>
<el-radio :label="1" :hidden="vipShow">季</el-radio> <el-radio :label="1" :hidden="vipShow">季</el-radio>
<el-radio :label="2" :hidden="vipShow">年</el-radio> <el-radio :label="2" :hidden="vipShow">年</el-radio>
<el-radio :label="3" :hidden="!vipShow">新</el-radio> <el-radio :label="3" :hidden="!vipShow">资深</el-radio>
<el-radio :label="4" :hidden="!vipShow">专</el-radio> <el-radio :label="4" :hidden="!vipShow">金牌</el-radio>
<el-radio :label="5" :hidden="!vipShow">资</el-radio> <el-radio :label="5" :hidden="!vipShow">专家</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<div style="margin-bottom: 20px;"> <div style="margin-bottom: 20px;">
@ -108,9 +108,9 @@
<el-radio :label="0" :hidden="vipShow">月</el-radio> <el-radio :label="0" :hidden="vipShow">月</el-radio>
<el-radio :label="1" :hidden="vipShow">季</el-radio> <el-radio :label="1" :hidden="vipShow">季</el-radio>
<el-radio :label="2" :hidden="vipShow">年</el-radio> <el-radio :label="2" :hidden="vipShow">年</el-radio>
<el-radio :label="3" :hidden="!vipShow">新</el-radio> <el-radio :label="3" :hidden="!vipShow">资深</el-radio>
<el-radio :label="4" :hidden="!vipShow">专</el-radio> <el-radio :label="4" :hidden="!vipShow">金牌</el-radio>
<el-radio :label="5" :hidden="!vipShow">资</el-radio> <el-radio :label="5" :hidden="!vipShow">专家</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="会员名称：" :label-width="formLabelWidth"> <el-form-item label="会员名称：" :label-width="formLabelWidth">
@ -278,13 +278,7 @@
return return
} }
if (this.rate == '') { if (this.rate == '') {
this.$notify({ this.rate = 0
title: '提示',
duration: 1800,
message: '请输入优惠力度',
type: 'warning'
});
return
} }
this.$http({ this.$http({
url: this.$http.adornUrl('vipDetails/insertVipDetails'), url: this.$http.adornUrl('vipDetails/insertVipDetails'),
@ -350,15 +344,8 @@
return return
} }
if (this.form.rate == '') { if (this.form.rate == '') {
this.$notify({ this.form.rate == 0
title: '提示',
duration: 1800,
message: '请输入优惠力度',
type: 'warning'
});
return
} }
this.$http({ this.$http({
url: this.$http.adornUrl('vipDetails/updateVipDetails'), url: this.$http.adornUrl('vipDetails/updateVipDetails'),
method: 'post', method: 'post',

195
src/views/taskConfig/travel.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<div style="margin-right:2%;"> <div style="margin-right:2%;">
<div style="position: relative;display: inline-block;"> <div style="position: relative;display: inline-block;">
<span>城市：</span> <span>城市：</span>
@ -8,7 +8,7 @@
</el-input>&nbsp;&nbsp; </el-input>&nbsp;&nbsp;
</div> </div>
<el-button style='margin: 10px 0;' size="mini" type="primary" icon="document" @click="Notice">查询</el-button> <el-button style='margin: 10px 0;' size="mini" type="primary" icon="document" @click="Notice">查询</el-button>
<el-button style='margin: 10px 0;' :disabled="!isAuth('travel:add')" size="mini" type="primary" <el-button style='margin: 10px 0;' size="mini" type="primary"
icon="document" @click="addNotice">添加</el-button> icon="document" @click="addNotice">添加</el-button>
</div> </div>
<el-table v-loading="tableDataLoading" :data="tableData.list"> <el-table v-loading="tableDataLoading" :data="tableData.list">
@ -16,24 +16,24 @@
</el-table-column> </el-table-column>
<el-table-column prop="city" label="城市"> <el-table-column prop="city" label="城市">
</el-table-column> </el-table-column>
<el-table-column prop="taxiStartingFare" label="出租起步价"> <!-- <el-table-column prop="taxiStartingFare" label="出租起步价">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="taxiStartingKm" label="出租起步公里"> <!-- <el-table-column prop="taxiStartingKm" label="出租起步公里">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="taxiKmMoney" label="出租每公里价格"> <!-- <el-table-column prop="taxiKmMoney" label="出租每公里价格">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="busStartingFare" label="公交起步价"> <!-- <el-table-column prop="busStartingFare" label="公交起步价">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="busStartingKm" label="公交起步公里"> <!-- <el-table-column prop="busStartingKm" label="公交起步公里">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="busKmMoney" label="公交每公里价格"> <!-- <el-table-column prop="busKmMoney" label="公交每公里价格">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" width="180"> <el-table-column label="操作" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="!isAuth('travel:update')" <el-button size="mini" type="primary"
@click="amendBanner(scope.row)">修改 @click="amendBanner(scope.row)">修改
</el-button> </el-button>
<el-button size="mini" type="danger" :disabled="!isAuth('travel:delete')" <el-button size="mini" type="danger"
@click="deletes(scope.row)">删除 @click="deletes(scope.row)">删除
</el-button> </el-button>
</template> </template>
@ -46,46 +46,58 @@
</el-pagination> </el-pagination>
</div> </div>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center> <el-dialog :title="title" :visible.sync="dialogFormVisible" center>
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<span style="width: 200px;display: inline-block;text-align: right;">城市：</span> <span style="width: 200px;display: inline-block;text-align: right;">城市：</span>
<el-input style="width:50%;" v-model="city" placeholder="请输入城市"></el-input> <!-- <el-input style="width:50%;" v-model="city" placeholder="请输入城市"></el-input>-->
<el-cascader
style="width: 45%"
size="large"
:options="options"
ref="cascaderAddr"
v-model="storeAddress"
:placeholder="storeAddre"
@change="handleChangeCity"
:value="storeAddre"
>
</el-cascader>
</div> </div>
<div style="margin-bottom: 10px;"> <!-- <div style="margin-bottom: 10px;">-->
<span style="width: 200px;display: inline-block;text-align: right;">出租起步价：</span> <!-- <span style="width: 200px;display: inline-block;text-align: right;">出租起步价：</span>-->
<el-input style="width:50%;" v-model="taxiStartingFare" type="number" min="0" placeholder="请输入出租起步价"></el-input> <!-- <el-input style="width:50%;" v-model="taxiStartingFare" type="number" min="0" placeholder="请输入出租起步价"></el-input>-->
</div> <!-- </div>-->
<div style="margin-bottom: 10px;"> <!-- <div style="margin-bottom: 10px;">-->
<span style="width: 200px;display: inline-block;text-align: right;">出租起步公里：</span> <!-- <span style="width: 200px;display: inline-block;text-align: right;">出租起步公里：</span>-->
<el-input style="width:50%;" v-model="taxiStartingKm" type="number" min="0" placeholder="请输入出租起步公里"></el-input> <!-- <el-input style="width:50%;" v-model="taxiStartingKm" type="number" min="0" placeholder="请输入出租起步公里"></el-input>-->
</div> <!-- </div>-->
<div style="margin-bottom: 10px;"> <!-- <div style="margin-bottom: 10px;">-->
<span style="width: 200px;display: inline-block;text-align: right;">出租每公里价格：</span> <!-- <span style="width: 200px;display: inline-block;text-align: right;">出租每公里价格：</span>-->
<el-input style="width:50%;" v-model="taxiKmMoney" type="number" min="0" placeholder="请输入出租每公里价格"></el-input> <!-- <el-input style="width:50%;" v-model="taxiKmMoney" type="number" min="0" placeholder="请输入出租每公里价格"></el-input>-->
</div> <!-- </div>-->
<div style="margin-bottom: 10px;"> <!-- <div style="margin-bottom: 10px;">-->
<span style="width: 200px;display: inline-block;text-align: right;">公交起步价：</span> <!-- <span style="width: 200px;display: inline-block;text-align: right;">公交起步价：</span>-->
<el-input style="width:50%;" v-model="busStartingFare" type="number" min="0" placeholder="请输入公交起步价"></el-input> <!-- <el-input style="width:50%;" v-model="busStartingFare" type="number" min="0" placeholder="请输入公交起步价"></el-input>-->
</div> <!-- </div>-->
<div style="margin-bottom: 10px;"> <!-- <div style="margin-bottom: 10px;">-->
<span style="width: 200px;display: inline-block;text-align: right;">公交起步公里：</span> <!-- <span style="width: 200px;display: inline-block;text-align: right;">公交起步公里：</span>-->
<el-input style="width:50%;" v-model="busStartingKm" type="number" min="0" placeholder="请输入公交起步公里"></el-input> <!-- <el-input style="width:50%;" v-model="busStartingKm" type="number" min="0" placeholder="请输入公交起步公里"></el-input>-->
</div> <!-- </div>-->
<div style="margin-bottom: 10px;"> <!-- <div style="margin-bottom: 10px;">-->
<span style="width: 200px;display: inline-block;text-align: right;">公交每公里价格：</span> <!-- <span style="width: 200px;display: inline-block;text-align: right;">公交每公里价格：</span>-->
<el-input style="width:50%;" v-model="busKmMoney" type="number" min="0" placeholder="请输入公交每公里价格"></el-input> <!-- <el-input style="width:50%;" v-model="busKmMoney" type="number" min="0" placeholder="请输入公交每公里价格"></el-input>-->
</div> <!-- </div>-->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button> <el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="addNoticeTo()">确 定</el-button> <el-button type="primary" @click="addNoticeTo()">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {provinceAndCityData} from "element-china-area-data";
export default { export default {
data() { data() {
return { return {
@ -98,27 +110,41 @@
tableData: [], tableData: [],
tableDataY: {}, tableDataY: {},
city: '', city: '',
busKmMoney: '', // busKmMoney: '',
busStartingFare:'', // busStartingFare:'',
busStartingKm:'', // busStartingKm:'',
taxiStartingFare:'', // taxiStartingFare:'',
taxiStartingKm:'', // taxiStartingKm:'',
taxiKmMoney:'', // taxiKmMoney:'',
tripId: '', tripId: '',
giveNum: '', // giveNum: '',
couponId: '', // couponId: '',
couponName: '', // couponName: '',
sort: '', // sort: '',
payClassifyId: '', // payClassifyId: '',
title: '添加', title: '添加',
dialogFormVisible4: false, dialogFormVisible4: false,
cityT:'', cityT:'',
options: provinceAndCityData,
storeAddress: [],
storeAddre: "请选择城市",
} }
}, },
methods: { methods: {
// 获取省市区
handleChangeCity(value) {
value = this.$refs["cascaderAddr"].currentLabels;
console.log("````````````value", value);
this.province = value[0];
this.city = value[1];
if (this.city == "市辖区") {
this.city = this.province;
}
this.storeAddre = this.province + "/" + this.city;
this.storeAddress = value;
},
// 获取数据列表 // 获取数据列表
dataSelect() { dataSelect() {
this.tableDataLoading = true this.tableDataLoading = true
@ -142,21 +168,21 @@
}) })
}, },
Notice() { Notice() {
this.page = 1 this.page = 1
this.dataSelect() this.dataSelect()
}, },
addNotice() { addNotice() {
this.city = '' this.city = ''
this.storeAddre = "请选择城市";
this.tripId = '' this.tripId = ''
this.busKmMoney = '' // this.busKmMoney = ''
this.busStartingFare = '' // this.busStartingFare = ''
this.busStartingKm = '' // this.busStartingKm = ''
this.taxiStartingFare = '' // this.taxiStartingFare = ''
this.taxiStartingKm = '' // this.taxiStartingKm = ''
this.taxiKmMoney = '' // this.taxiKmMoney = ''
this.title = '添加' this.title = '添加'
this.dialogFormVisible = true this.dialogFormVisible = true
}, },
@ -168,20 +194,18 @@
this.limit = val this.limit = val
this.dataSelect() this.dataSelect()
}, },
// 添加banner图 // 添加banner图
addNoticeTo() { addNoticeTo() {
if (this.price == '') { if (this.city == '') {
this.$notify({ this.$notify({
title: '提示', title: '提示',
duration: 1800, duration: 1800,
message: '请输入充值金额', message: '请选择城市',
type: 'warning' type: 'warning'
}); });
return return
} }
if (this.title == '添加') { if (this.title == '添加') {
var url = 'trip/insertTrip' var url = 'trip/insertTrip'
} else { } else {
@ -193,12 +217,12 @@
data: this.$http.adornData({ data: this.$http.adornData({
'city': this.city, 'city': this.city,
'tripId': this.tripId, 'tripId': this.tripId,
'busKmMoney': this.busKmMoney, // 'busKmMoney': this.busKmMoney,
'busStartingFare': this.busStartingFare, // 'busStartingFare': this.busStartingFare,
'busStartingKm': this.busStartingKm, // 'busStartingKm': this.busStartingKm,
'taxiStartingFare': this.taxiStartingFare, // 'taxiStartingFare': this.taxiStartingFare,
'taxiStartingKm': this.taxiStartingKm, // 'taxiStartingKm': this.taxiStartingKm,
'taxiKmMoney': this.taxiKmMoney, // 'taxiKmMoney': this.taxiKmMoney,
}) })
}).then(({ }).then(({
data data
@ -210,7 +234,7 @@
type: 'success', type: 'success',
duration: 1500, duration: 1500,
onClose: () => { onClose: () => {
this.dataSelect() this.dataSelect()
} }
}) })
@ -223,19 +247,20 @@
} }
}) })
} }
}) })
}, },
// 修改 // 修改
amendBanner(rows) { amendBanner(rows) {
this.city = rows.city this.city = rows.city
this.storeAddre = this.city;
this.tripId = rows.tripId this.tripId = rows.tripId
this.busKmMoney = rows.busKmMoney // this.busKmMoney = rows.busKmMoney
this.busStartingFare = rows.busStartingFare // this.busStartingFare = rows.busStartingFare
this.busStartingKm = rows.busStartingKm // this.busStartingKm = rows.busStartingKm
this.taxiStartingFare = rows.taxiStartingFare // this.taxiStartingFare = rows.taxiStartingFare
this.taxiStartingKm = rows.taxiStartingKm // this.taxiStartingKm = rows.taxiStartingKm
this.taxiKmMoney = rows.taxiKmMoney // this.taxiKmMoney = rows.taxiKmMoney
this.title = '修改' this.title = '修改'
this.dialogFormVisible = true this.dialogFormVisible = true
}, },

84
src/views/user/userDetail.vue
View File

@ -275,7 +275,11 @@
</td> </td>
<th>项目类型</th> <th>项目类型</th>
<td class="border-rt"> <td class="border-rt">
{{ artificer.classifyName }} <!-- {{ artificer.classifyName }}-->
<div v-for="(item, index) in artificer.artificerClassifyList" :key="index"
class="borderInner">
<div>{{ item.classifyName }}</div>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -307,7 +311,11 @@
修改</el-button> 修改</el-button>
</td> </td>
<th>城市</th> <th>城市</th>
<td>{{ artificer.city }}</td> <td>{{ artificer.city }}
<el-button size="mini"
style="color: #4f9dec;background: #fff;border: none;"
@click="cityChange()">修改</el-button>
</td>
<th>当前物料包</th> <th>当前物料包</th>
<td class="border-rt"> <td class="border-rt">
<div v-for="(item, index) in materialPackageOptions" :key="index" <div v-for="(item, index) in materialPackageOptions" :key="index"
@ -1656,6 +1664,20 @@
<el-button type="primary" @click="StairNoticeTo5()">确 定</el-button> <el-button type="primary" @click="StairNoticeTo5()">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 修改城市 -->
<el-dialog title="修改城市" :visible.sync="dialogFormVisible6" center>
<div style="margin-bottom: 10px;">
<span style="width: 200px;display: inline-block;text-align: right;">修改城市：</span>
<el-select v-model="city" style="width:50%;margin-left: 10px;">
<el-option v-for="item in cityList" :key="item.city" :label="item.city" :value="item.city">
</el-option>
</el-select>&nbsp;&nbsp;
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible6 = false">取 消</el-button>
<el-button type="primary" @click="updateCity()">确 定</el-button>
</div>
</el-dialog>
<el-tab-pane label="我的物料" name="myArtificerSelfGoods" v-if="tableData.isAuthentication == 2"> <el-tab-pane label="我的物料" name="myArtificerSelfGoods" v-if="tableData.isAuthentication == 2">
<el-button size="mini" type="primary" icon="plus" @click="myArtificerSelfGoods.addPage.open()">新增</el-button> <el-button size="mini" type="primary" icon="plus" @click="myArtificerSelfGoods.addPage.open()">新增</el-button>
<el-button size="mini" type="primary" @click="myArtificerSelfGoods.load">刷新</el-button> <el-button size="mini" type="primary" @click="myArtificerSelfGoods.load">刷新</el-button>
@ -2206,6 +2228,7 @@ import { serverPaths } from '@/utils/enumData'
dialogFormVisible3: false, dialogFormVisible3: false,
dialogFormVisible4: false, dialogFormVisible4: false,
dialogFormVisible5: false, dialogFormVisible5: false,
dialogFormVisible6: false,
tableDataLoading: true, tableDataLoading: true,
tableDataLoading1: true, tableDataLoading1: true,
relation_id: "", relation_id: "",
@ -2271,7 +2294,6 @@ import { serverPaths } from '@/utils/enumData'
artificerXg: {}, artificerXg: {},
// 师傅信息 // 师傅信息
artificerName: "", artificerName: "",
content: "",
beginTime: "", beginTime: "",
finishTime: "", finishTime: "",
longitude: "", longitude: "",
@ -2287,6 +2309,7 @@ import { serverPaths } from '@/utils/enumData'
isHot: "", isHot: "",
tripWay: "", tripWay: "",
city: "", city: "",
cityList:[],
artificerDate: "", artificerDate: "",
timeList: [], timeList: [],
timeLis: [{ timeLis: [{
@ -4346,6 +4369,10 @@ import { serverPaths } from '@/utils/enumData'
this.age = ""; this.age = "";
this.dialogFormVisible5 = true; this.dialogFormVisible5 = true;
}, },
cityChange(city) {
this.city= "";
this.dialogFormVisible6 = true;
},
StairNoticeTo5() { StairNoticeTo5() {
if (this.type == "") { if (this.type == "") {
this.$notify({ this.$notify({
@ -4398,6 +4425,44 @@ import { serverPaths } from '@/utils/enumData'
} }
}); });
}, },
updateCity(){
if (this.city == "") {
this.$notify({
title: "提示",
duration: 1800,
message: "请选择城市",
type: "warning",
});
return;
}
this.$http({
url: this.$http.adornUrl("artificer/updateArtificerCity"),
method: "post",
params: this.$http.adornParams({
artificerId: this.tablenum.artificer.artificerId,
city: this.city,
}),
}).then(({data}) => {
if (data.code == 0) {
this.$message({
message: "修改成功",
type: "success",
duration: 1500,
onClose: () => {
this.dialogFormVisible6 = false;
this.autonymSelect();
},
});
} else {
this.$message({
message: data.msg,
type: "warning",
duration: 1500,
onClose: () => {},
});
}
});
},
// 信用分明细数据 // 信用分明细数据
xinyongSelect() { xinyongSelect() {
let userId = this.$route.query.userId; let userId = this.$route.query.userId;
@ -5147,6 +5212,18 @@ import { serverPaths } from '@/utils/enumData'
} }
}); });
}, },
// 获取开放城市
getCitys() {
this.$http({
url: this.$http.adornUrl("trip/selectCityList"),
method: "get",
data: this.$http.adornData({}),
}).then(({data}) => {
if (data.code == 0) {
this.cityList = data.data;
}
});
},
}, },
mounted() { mounted() {
this.artificerIdSet = this.$route.query.artificerId; this.artificerIdSet = this.$route.query.artificerId;
@ -5155,6 +5232,7 @@ import { serverPaths } from '@/utils/enumData'
this.fwSelect(); this.fwSelect();
this.xianshi(); this.xianshi();
this.getMaterialPackage(); this.getMaterialPackage();
this.getCitys();
}, },
}; };
</script> </script>

4
src/views/user/userList.vue
View File

@ -1105,7 +1105,7 @@
</div> </div>
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<span style="width: 200px;display: inline-block;text-align: right;">项目类型：</span> <span style="width: 200px;display: inline-block;text-align: right;">项目类型：</span>
<el-select v-model="classifyId" style="width:45%;"> <el-select v-model="classifyIds" multiple style="width:45%;">
<el-option v-for="item in fwData" :key="item.id" :label="item.value" :value="item.id"> <el-option v-for="item in fwData" :key="item.id" :label="item.value" :value="item.id">
</el-option> </el-option>
</el-select>&nbsp;&nbsp; </el-select>&nbsp;&nbsp;
@ -1314,6 +1314,7 @@ import { serverPaths } from '@/utils/enumData'
certification: [], certification: [],
fwData: [], fwData: [],
classifyId: '', classifyId: '',
classifyIds: [],
member:'', member:'',
ordersUser:'', ordersUser:'',
userNameT:'', userNameT:'',
@ -1697,6 +1698,7 @@ import { serverPaths } from '@/utils/enumData'
}, },
// 确定添加 // 确定添加
addmissionNoticeTo() { addmissionNoticeTo() {
this.classifyId = this.classifyIds.join(",");
if (this.name == '') { if (this.name == '') {
this.$notify({ this.$notify({
title: '提示', title: '提示',