xiaobei
/
xmf_saas_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zx

Browse Source
main
张雄 3 years ago
parent df89efeed3
commit cef9b23e12
28 changed files with 309 additions and 99 deletions
Show Stats Download Patch File Download Diff File

8
src/router/payment.js
Unescape View File

@ -53,6 +53,14 @@ export default [
redirect: '/Payment/ActivityManage', redirect: '/Payment/ActivityManage',
meta: {title: '账单管理'}, meta: {title: '账单管理'},
children: [ children: [
{
path: '/BillManage/PayInfo',
name: "PayInfo",
title: "账单明细",
hide: false,
component: resolve => require(['@/views/Payment/BillManage/_payInfo'], resolve),
meta: {title: '账单明细'},
},
{ {
path: '/BillManage/PayList', path: '/BillManage/PayList',
name: "PayList", name: "PayList",

4
src/views/Basic/Authority/depend/permissions.vue
Unescape View File

@ -31,7 +31,7 @@
class="tree" class="tree"
v-model="checkedKeys" v-model="checkedKeys"
checkable checkable
checkStrictly :defaultExpandAll="true"
:replace-fields="replaceFields" :replace-fields="replaceFields"
:expanded-keys="expandedKeys" :expanded-keys="expandedKeys"
:selected-keys="selectedKeys" :selected-keys="selectedKeys"
@ -108,6 +108,7 @@ export default {
this.roleId = data; this.roleId = data;
FindAllMenus({ roleId: this.roleId }).then((res) => { FindAllMenus({ roleId: this.roleId }).then((res) => {
this.menus = res.data; this.menus = res.data;
console.log(res.data)
this.defaultCheck(this.menus); this.defaultCheck(this.menus);
}); });
} else if (data === undefined) { } else if (data === undefined) {
@ -138,6 +139,7 @@ export default {
this.checkedKeys.push(item.id); this.checkedKeys.push(item.id);
} }
} }
console.log(this.checkedKeys)
}, },
onExpand(expandedKeys) { onExpand(expandedKeys) {
this.expandedKeys = expandedKeys; this.expandedKeys = expandedKeys;

4
src/views/Basic/Authority/index.vue
Unescape View File

@ -227,6 +227,7 @@ export default {
}, },
success() { success() {
this.getData(); this.getData();
this.getPeople();
}, },
addClose() { addClose() {
this.add.show = false; this.add.show = false;
@ -328,6 +329,9 @@ export default {
// this.form.roleId = arr.toString() // this.form.roleId = arr.toString()
// }, // },
async sendSubmit() { async sendSubmit() {
if(this.form.roleId == ''){
this.form.roleId = null
};
const res = await assignRoles(this.form); const res = await assignRoles(this.form);
if (res.code === 200) { if (res.code === 200) {
this.$message.success(res.msg); this.$message.success(res.msg);

18
src/views/Basic/Employee/depend/form.vue
Unescape View File

@ -9,7 +9,7 @@
:rules="rules" :rules="rules"
:wrapper-col="{ span: 18 }" :wrapper-col="{ span: 18 }"
> >
<div>基本信息</div> <div class="drawer-title">基本信息</div>
<a-divider></a-divider> <a-divider></a-divider>
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
@ -92,7 +92,7 @@
>单张最多不超过4M，最多上传2张，支持JPG,PNG格式</span >单张最多不超过4M，最多上传2张，支持JPG,PNG格式</span
> >
</a-row> </a-row>
<div>入职信息</div> <div class="drawer-title">入职信息</div>
<a-divider></a-divider> <a-divider></a-divider>
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
@ -141,7 +141,7 @@
<span style="color: #00000073">支持上传PNG，JPG，PDF文件</span> <span style="color: #00000073">支持上传PNG，JPG，PDF文件</span>
</a-col> </a-col>
</a-row> </a-row>
<div style="margin-top: 20px">联系信息</div> <div class="drawer-title">联系信息</div>
<a-divider></a-divider> <a-divider></a-divider>
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
@ -172,7 +172,7 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
<div>其他信息</div> <div class="drawer-title">其他信息</div>
<a-divider></a-divider> <a-divider></a-divider>
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
@ -470,3 +470,13 @@ export default {
}; };
</script> </script>
<style lang="less">
.drawer-title {
margin: 0;
color: rgba(0, 0, 0, 0.85);
font-weight: 500;
font-size: 16px;
line-height: 22px;
margin-top: 16px
}
</style>

6
src/views/Basic/Employee/index.vue
Unescape View File

@ -3,12 +3,12 @@
<a-row> <a-row>
<!-- 组织架构 --> <!-- 组织架构 -->
<a-col :span="5" class="left-tree"> <a-col :span="5" class="left-tree">
<a-input-search <!-- <a-input-search
style="margin-bottom: 8px" style="margin-bottom: 8px"
placeholder="请输入搜索信息" placeholder="请输入搜索信息"
v-model="searchStr" v-model="searchStr"
@change="onSearch" @change="onSearch"
/> /> -->
<div> <div>
<a-button type="link" @click="openDepartment(1)" <a-button type="link" @click="openDepartment(1)"
>+&nbsp;新建分组</a-button >+&nbsp;新建分组</a-button
@ -49,7 +49,7 @@
<a-col :span="19"> <a-col :span="19">
<div class="search-box"> <div class="search-box">
<a-space size="large"> <a-space size="large">
<a-input v-model="searchForm.keyword" placeholder="请输入申请人" /> <a-input v-model="searchForm.keyword" placeholder="请输入姓名/手机号" />
<a-button type="primary" @click='getData'>查 询</a-button> <a-button type="primary" @click='getData'>查 询</a-button>
<a-button @click='reset'>重 置</a-button> <a-button @click='reset'>重 置</a-button>
</a-space> </a-space>

10
src/views/Basic/EstateInfo/_houseHoldAudit/depend/config.js
Unescape View File

@ -6,12 +6,12 @@ export const columns = [
{ {
title: "申请人姓名", title: "申请人姓名",
dataIndex:"name", dataIndex:"name",
width:'14%' width:'12%'
}, },
{ {
title: "申请人身份", title: "申请人身份",
key: "tags", key: "tags",
width: "14%", width: "12%",
dataIndex: "identity", dataIndex: "identity",
scopedSlots: { customRender: "tags" }, scopedSlots: { customRender: "tags" },
}, },
@ -24,7 +24,7 @@ export const columns = [
{ {
title: "申请人手机号", title: "申请人手机号",
dataIndex:"tel", dataIndex:"tel",
width:'14%' width:'10%'
}, },
{ {
title: "申请人身份证号", title: "申请人身份证号",
@ -34,7 +34,7 @@ export const columns = [
{ {
title: "状态", title: "状态",
dataIndex:"status", dataIndex:"status",
width:'14%', width:'10%',
customRender:function(status){ customRender:function(status){
switch (status) { switch (status) {
case 1: case 1:
@ -51,7 +51,7 @@ export const columns = [
{ {
title: "房屋类型", title: "房屋类型",
dataIndex:"estateTypeName", dataIndex:"estateTypeName",
width:'14%' width:'10%'
}, },
{ {
title: "操作", title: "操作",

15
src/views/Basic/EstateInfo/_houseHoldAudit/index.vue
Unescape View File

@ -57,7 +57,6 @@
:columns="columns" :columns="columns"
:data-source="tableData" :data-source="tableData"
:pagination="pagination" :pagination="pagination"
:scroll="{ x: 1400 }"
@change="handleTableChange" @change="handleTableChange"
:row-selection="{ :row-selection="{
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
@ -139,7 +138,10 @@ export default {
// 选择的index // 选择的index
selectedRowKeys: [], selectedRowKeys: [],
tableData: [], tableData: [],
ActionsList: [], ActionsList: [
{ value: 1, label: '批量通过'},
{ value: 2, label: '批量驳回'}
],
activeName:'1', activeName:'1',
options:{ options:{
identity:[ identity:[
@ -202,11 +204,16 @@ export default {
}, },
handleTableChange:handleTableChange, handleTableChange:handleTableChange,
Actions(data) { Actions(data) {
console.log(data); this.selectedRowKeys.forEach(ele => {
let obj = {operate: data, estateReviewId: ele};
review(obj);
this.$message.success('操作成功')
})
this.activeAction = undefined; this.activeAction = undefined;
this.selectedRowKeys = [];
this.getData();
}, },
selectionChoosed(data) { selectionChoosed(data) {
console.log(data);
this.selectedRowKeys = data; this.selectedRowKeys = data;
}, },
reset: reset, reset: reset,

6
src/views/Basic/EstateInfo/_houseHoldInfo/depend/addForm.vue
Unescape View File

@ -121,12 +121,12 @@
</div> </div>
</a-upload> </a-upload>
</a-col> </a-col>
<div v-show="form.identity === 2 || form.identity === 4"> <div v-show=" form.identity === 4">
关联信息 关联信息
<a-divider></a-divider> <a-divider></a-divider>
</div> </div>
<div v-if="form.identity === 2"> <div v-if="form.identity === 2">
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-model-item label="业主姓名" prop="ownerName"> <a-form-model-item label="业主姓名" prop="ownerName">
<a-input placeholder="请输入业主姓名" v-model="form.ownerName" style="width: 90%" /> <a-input placeholder="请输入业主姓名" v-model="form.ownerName" style="width: 90%" />
</a-form-model-item> </a-form-model-item>
@ -135,7 +135,7 @@
<a-form-model-item label="业主电话" prop="ownerTel"> <a-form-model-item label="业主电话" prop="ownerTel">
<a-input placeholder="请输入业主电话" v-model="form.ownerTel" style="width: 90%" /> <a-input placeholder="请输入业主电话" v-model="form.ownerTel" style="width: 90%" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col> -->
</div> </div>
<div v-else-if="form.identity === 4"> <div v-else-if="form.identity === 4">
<a-col :span="12"> <a-col :span="12">

21
src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js
Unescape View File

@ -6,14 +6,35 @@ export const columns = [
{ {
title: "住户姓名", title: "住户姓名",
dataIndex: "name", dataIndex: "name",
width: 100
}, },
{ {
title: "住户手机号", title: "住户手机号",
dataIndex: "tel", dataIndex: "tel",
width: 160
},
{
title: "居住房屋",
dataIndex: "build",
scopedSlots: { customRender: "build" },
width: 380
},
{
title: "住户身份",
dataIndex: "ids",
width: 120,
scopedSlots: { customRender: "ids" },
},
{
title: "房屋类型",
dataIndex: "type",
width: 120,
scopedSlots: { customRender: "type" },
}, },
{ {
title: "住户性别", title: "住户性别",
dataIndex: "sex", dataIndex: "sex",
width: 120,
customRender:function(sex){ customRender:function(sex){
switch (sex) { switch (sex) {
case 1: case 1:

19
src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
Unescape View File

@ -46,6 +46,21 @@
} }
" "
> >
<span slot="build" slot-scope="text, row">
<div v-for="(item,index) in row.residentListEstateVoList" :key="index">
{{item.manageBuildingName}}-{{item.manageUnitName}}-{{item.floorLocation}}-{{item.manageEstateName}}
</div>
</span>
<span slot="ids" slot-scope="text, row">
<a-tag v-for="(item,index) in row.residentListEstateVoList" :key="index">
{{item.identity==3?'租户':1?'业主':2?'业主亲属':'租户亲属'}}
</a-tag>
</span>
<span slot="type" slot-scope="text, row">
<div v-for="(item,index) in row.residentListEstateVoList" :key="index">
{{item.manageEstateTypeName}}
</div>
</span>
<span slot="action" slot-scope="text, row"> <span slot="action" slot-scope="text, row">
<a-space> <a-space>
<a class="ant-dropdown-link" @click="houseManage(row)">房屋管理</a> <a class="ant-dropdown-link" @click="houseManage(row)">房屋管理</a>
@ -431,6 +446,10 @@ export default {
this.inform.estateId = undefined; this.inform.estateId = undefined;
} }
}, },
//切换居住房屋
handlerBuilding(index) {
console.log(index);
}
}, },
computed: { computed: {
// 是否选择selection // 是否选择selection

2
src/views/Basic/WorkOrder/finishDrawer.vue
Unescape View File

@ -60,7 +60,7 @@
<span>总费用：{{total}}</span> <span>总费用：{{total}}</span>
</template> </template>
</a-table> </a-table>
<a-button type="primary" ghost @click="addFee">添加</a-button> <a-button type="primary" ghost @click="addFee">添加费用</a-button>
</a-form-model> </a-form-model>
</div> </div>
<div class="drawer-footer"> <div class="drawer-footer">

24
src/views/Operation/Activity/_activityManage/depend/config.js
Unescape View File

@ -4,7 +4,7 @@ export const formItem = [
type: 'select', type: 'select',
label:'状态', label:'状态',
prop:'status', prop:'status',
option:[{ id:1,name:'报名未开始'},{ id:2,name:'报名进行中'},{ id:3,name:'活动未开始'},{ id:4,name:'活动进行中'},{ id:5,name:'活动已结束'}], option:[{id: null,name:'全部'},{ id:1,name:'报名未开始'},{ id:2,name:'报名进行中'},{ id:3,name:'活动未开始'},{ id:4,name:'活动进行中'},{ id:5,name:'活动已结束'}],
placeholder:'请选择状态' placeholder:'请选择状态'
}, },
{ {
@ -33,30 +33,30 @@ export const formItem = [
prop:'organizerName', prop:'organizerName',
placeholder:'请输入' placeholder:'请输入'
}, },
{ // {
type: 'input', // type: 'input',
label:'活动联系人', // label:'活动联系人',
prop:'activityContact', // prop:'activityContact',
placeholder:'请输入' // placeholder:'请输入'
}, // },
] ]
export const columns = [ export const columns = [
{ {
title: "发布时间", title: "发布时间",
dataIndex: "createDate", dataIndex: "createDate",
width: "12%", width: "10%",
}, },
{ {
title: "图片", title: "图片",
dataIndex: "imgpic", dataIndex: "imgpic",
width: "10%", width: "5%",
scopedSlots: { customRender: "imgpic"} scopedSlots: { customRender: "imgpic"}
}, },
{ {
title: "活动状态", title: "活动状态",
dataIndex: "status", dataIndex: "status",
width: "6%", width: "5%",
customRender: function (status) { customRender: function (status) {
switch (status) { switch (status) {
case 1: case 1:
@ -112,14 +112,14 @@ export const columns = [
}, },
{ {
title: "报名时间", title: "报名时间",
width: "12%", width: "14%",
customRender: function (data) { customRender: function (data) {
return (data.registrationStartTime + '——' + data.registrationEndTime) return (data.registrationStartTime + '——' + data.registrationEndTime)
} }
}, },
{ {
title: "活动时间", title: "活动时间",
width: "12%", width: "14%",
customRender: function (data) { customRender: function (data) {
return (data.activityStartTime + '——' + data.activityEndTime) return (data.activityStartTime + '——' + data.activityEndTime)
} }

72
src/views/Operation/Activity/_activityManage/depend/detail.vue
Unescape View File

@ -1,18 +1,26 @@
<template> <template>
<div> <div>
<a-drawer <a-drawer
title="活动-详情" title="活动详情"
:width="720" :width="720"
:visible="show" :visible="show"
:body-style="{ paddingBottom: '80px' }" :body-style="{ paddingBottom: '80px' }"
@close="detailClose" @close="detailClose"
> >
<div class="drawer-content"> <div class="drawer-content">
<div class="content-title"> <div style="display: flex">
{{ detailData.title }} <div><img v-for="item,index in detailData.imgList" :key='index' :src="$ImgUrl(item.url)" class="content-img"></div>
</div> <div>
<img v-for="item,index in detailData.imgList" :key='index' :src="$ImgUrl(item.url)" class="content-img"> <div class="content-title">{{ detailData.title }}</div>
<a-descriptions> <div style="margin-top: 6px;width: 500px">主办方：{{detailData.organizerName}}
<a-tag style="float: right;width: 86px;height: 24px;text-align:center">
{{detailData.status == 1?'报名未开始':2?'报名进行中':3?'活动未开始':4?'活动进行中':'活动已结束'}}
</a-tag>
</div>
</div>
</div>
<a-divider></a-divider>
<a-descriptions class="content-des" layout="vertical">
<a-descriptions-item label="创建时间"> <a-descriptions-item label="创建时间">
{{ detailData.createDate }} {{ detailData.createDate }}
</a-descriptions-item> </a-descriptions-item>
@ -22,14 +30,13 @@
<a-descriptions-item label="活动对象"> <a-descriptions-item label="活动对象">
{{ detailData.activityObject | activityObject }} {{ detailData.activityObject | activityObject }}
</a-descriptions-item> </a-descriptions-item>
</a-descriptions>
<a-descriptions style="padding: 0px 32px 0px 32px" layout="vertical" :column="1">
<a-descriptions-item label="活动内容"> <a-descriptions-item label="活动内容">
{{ detailData.content }} {{ detailData.content }}
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="活动主办方">
{{ detailData.organizerName }}
</a-descriptions-item>
</a-descriptions> </a-descriptions>
<a-descriptions title="报名设置"> <a-descriptions class="content-des" title="报名设置" layout="vertical">
<a-descriptions-item label="报名开始时间"> <a-descriptions-item label="报名开始时间">
{{ detailData.registrationStartTime }} {{ detailData.registrationStartTime }}
</a-descriptions-item> </a-descriptions-item>
@ -43,7 +50,7 @@
{{ detailData.activityAddress }} {{ detailData.activityAddress }}
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>
<a-descriptions title="活动设置"> <a-descriptions class="content-des" title="活动设置" layout="vertical">
<a-descriptions-item label="活动开始时间"> <a-descriptions-item label="活动开始时间">
{{ detailData.activityStartTime }} {{ detailData.activityStartTime }}
</a-descriptions-item> </a-descriptions-item>
@ -57,20 +64,23 @@
{{ detailData.activityTel }} {{ detailData.activityTel }}
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>
报名记录 <div class="content-des">
<a-divider></a-divider> <div class="des-title">报名记录</div>
<a-table <a-divider></a-divider>
:columns="detailColumns" <a-table
:data-source="tableData" :columns="detailColumns"
:pagination="pagination" :data-source="tableData"
:scroll="{ x: 600 }" :pagination="pagination"
@change="handleTableChange" :scroll="{ x: 600 }"
:row-key=" @change="handleTableChange"
(record, index) => { :row-key="
return record.id; (record, index) => {
} return record.id;
" }
></a-table> "
></a-table>
</div>
</div> </div>
<div class="drawer-footer"> <div class="drawer-footer">
<a-button :style="{ marginRight: '8px' }" @click="detailClose"> <a-button :style="{ marginRight: '8px' }" @click="detailClose">
@ -142,7 +152,6 @@ export default {
detailId: { detailId: {
handler(id) { handler(id) {
if (id !== null && id !== undefined) { if (id !== null && id !== undefined) {
console.log(id);
Promise.all([ Promise.all([
activityInfo({ activityId: id }), activityInfo({ activityId: id }),
registrationList({ activityId: id }), registrationList({ activityId: id }),
@ -165,9 +174,20 @@ export default {
font-weight: 500; font-weight: 500;
font-size: 18px; font-size: 18px;
line-height: 25px; line-height: 25px;
padding: 12px 0px 12px 0px;
} }
.content-img{ .content-img{
width: 108px; width: 108px;
height: 86px; height: 86px;
} }
.content-des {
padding: 32px
}
.des-title {
margin-bottom: 20px;
color: rgba(0, 0, 0, 0.85);
font-weight: bold;
font-size: 16px;
line-height: 1.5;
}
</style> </style>

19
src/views/Operation/Activity/_organizers/depend/form.js
Unescape View File

@ -8,13 +8,21 @@ export const form = {
remarks:undefined, remarks:undefined,
imgUrls:[], imgUrls:[],
} }
const handleConfirm = (rule,value,callback) => {
if(value.length != 20) {
callback('请输入正确的格式')
};
callback();
}
export const rules = { export const rules = {
unit:[{required:true,message:'请输入标题',trigger:'blur'}], unit:[{required:true,message:'请输入',trigger:'blur'}],
contact:[{required:true,message:'请输入标题',trigger:'blur'}], contact:[{required:true,message:'请输入联系方式',trigger:'blur'}],
tel:[{required:true,message:'请输入标题',trigger:'blur'}], tel:[{required:true,message:'请输入',trigger:'blur'}],
idType:[{required:true,message:'请选择',trigger:'change'}], idType:[{required:true,message:'请选择',trigger:'change'}],
idNumber:[{required:true,message:'请输入标题',trigger:'blur'}], idNumber:[{required:true,message:'请输入证件号码',trigger:['blur','change']},{validator: (rule,value,callback) => handleConfirm(rule,value,callback)}],
remarks:[{required:true,message:'请输入标题',trigger:'blur'}], remarks:[{required:true,message:'请输入备注',trigger:'blur'}],
} }
export const options = { export const options = {
idType:[ idType:[
@ -23,3 +31,4 @@ export const options = {
], ],
} }

2
src/views/Operation/Activity/_organizers/depend/form.vue
Unescape View File

@ -18,7 +18,7 @@
> >
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item prop="unit" label="活动联系人"> <a-form-model-item prop="unit" label="主办方单位">
<a-input <a-input
v-model="form.unit" v-model="form.unit"
placeholder="请输入主办方名称" placeholder="请输入主办方名称"

6
src/views/Operation/BBS/_topic/depend/config.js
Unescape View File

@ -31,17 +31,17 @@ export const columns = [
{ {
title: "话题标题", title: "话题标题",
dataIndex: "title", dataIndex: "title",
width: "12%", width: 184,
}, },
{ {
title: "内容", title: "内容",
dataIndex: "content", dataIndex: "content",
width: "16%", width: 222,
}, },
{ {
title: "图片", title: "图片",
dataIndex: "imgpic", dataIndex: "imgpic",
width: "16%", width: 106,
scopedSlots: { customRender: "imgpic"} scopedSlots: { customRender: "imgpic"}
}, },
{ {

2
src/views/Operation/BBS/_topic/index.vue
Unescape View File

@ -9,7 +9,7 @@
:columns="columns" :columns="columns"
:data-source="tableData" :data-source="tableData"
:pagination="pagination" :pagination="pagination"
:scroll="{ x: 1400 }" :scroll="{ x: 2400 }"
@change="handleTableChange" @change="handleTableChange"
:row-selection="{ :row-selection="{
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,

10
src/views/Operation/News/_newsManage/depend/config.js
Unescape View File

@ -32,17 +32,17 @@ export const columns = [
{ {
title: "标题", title: "标题",
dataIndex: "title", dataIndex: "title",
width: "10%", width: 340,
}, },
{ {
title: "分类", title: "分类",
dataIndex: "categoryName", dataIndex: "categoryName",
width: "10%", width: 145,
}, },
{ {
title: "发布状态", title: "发布状态",
dataIndex: "status", dataIndex: "status",
width: "6%", width: 145,
customRender: function (status) { customRender: function (status) {
switch (status) { switch (status) {
case 1: case 1:
@ -55,12 +55,12 @@ export const columns = [
{ {
title: "阅读量", title: "阅读量",
dataIndex: "viewsNum", dataIndex: "viewsNum",
width: "10%", width: 145,
}, },
{ {
title: "创建时间", title: "创建时间",
dataIndex: "createDate", dataIndex: "createDate",
width: "12%", width: 220,
}, },
{ {
title: "操作", title: "操作",

2
src/views/Operation/News/_newsManage/depend/form.vue
Unescape View File

@ -142,7 +142,6 @@ export default {
this.$message.error(res.msg); this.$message.error(res.msg);
} }
} else { } else {
console.log(this.form);
let res = await newsUpdate(this.form); let res = await newsUpdate(this.form);
if (res.code === 200) { if (res.code === 200) {
this.$message.success(res.msg); this.$message.success(res.msg);
@ -171,7 +170,6 @@ export default {
newsInfo({ informationId: val }).then((res) => { newsInfo({ informationId: val }).then((res) => {
this.form = res.data; this.form = res.data;
if (res.data.imgList.length > 0) { if (res.data.imgList.length > 0) {
console.log(res.data.imgList);
const pic = []; const pic = [];
for (let item of res.data.imgList) { for (let item of res.data.imgList) {
let obj = { let obj = {

1
src/views/Operation/News/_newsManage/index.vue
Unescape View File

@ -9,7 +9,6 @@
:columns="columns" :columns="columns"
:data-source="tableData" :data-source="tableData"
:pagination="pagination" :pagination="pagination"
:scroll="{ x: 2600 }"
@change="handleTableChange" @change="handleTableChange"
:row-selection="{ :row-selection="{
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,

7
src/views/Operation/clientSet/depend/table.vue
Unescape View File

@ -39,7 +39,8 @@ import { activityList } from "@/api/operation/activity";
export default { export default {
props: { props: {
type: Number, type: Number,
show:Boolean show: Boolean,
selected: Number,
}, },
data() { data() {
return { return {
@ -90,12 +91,14 @@ export default {
this.$emit('submit',this.selectedRowKeys,this.joinString) this.$emit('submit',this.selectedRowKeys,this.joinString)
this.selectedRowKeys = [] this.selectedRowKeys = []
} }
}, },
}, },
watch: { watch: {
type: { type: {
handler(val) { handler(val) {
if(this.selected != null) {
this.selectedRowKeys = [this.selected]
}
if (val === 2) { if (val === 2) {
this.typeMean = 'shop' this.typeMean = 'shop'
shopPushList({ shopPushList({

4
src/views/Operation/clientSet/index.vue
Unescape View File

@ -116,6 +116,7 @@
<chooseTable <chooseTable
:show="table.show" :show="table.show"
:type="form.type" :type="form.type"
:selected="selected"
@submit="submitURL" @submit="submitURL"
@close="close" @close="close"
/> />
@ -148,6 +149,7 @@ export default {
title: "添加轮播图", title: "添加轮播图",
}, },
form, form,
selected: undefined,
}; };
}, },
mounted() { mounted() {
@ -194,12 +196,12 @@ export default {
show: true, show: true,
title: "修改轮播图", title: "修改轮播图",
}; };
console.log(data);
this.form.id = data.id; this.form.id = data.id;
this.form.isShow = data.isShow; this.form.isShow = data.isShow;
this.form.showWeights = data.showWeights; this.form.showWeights = data.showWeights;
this.form.type = data.type; this.form.type = data.type;
this.form.customizeUrl = data.customizeUrl; this.form.customizeUrl = data.customizeUrl;
this.selected = data.associationId;
this.form.associationId = data.associationId; this.form.associationId = data.associationId;
if (data.imgList.length > 0) { if (data.imgList.length > 0) {
// 如果已经有图片 // 如果已经有图片

30
src/views/Payment/BillManage/_payInfo/depend/config.js
Unescape View File

@ -0,0 +1,30 @@
export const formItem = [
{
type: 'input',
label:'',
prop:'',
placeholder:'请输入'
},
]
export const columns = [
{
title: "",
dataIndex: "",
},
{
title: "操作",
dataIndex: "action",
key: "action",
width: "180",
fixed: "right",
scopedSlots: { customRender: "action" },
},
]
export const pagination = {
current: 1,
total: 0,
pageSize: 10,
showTotal: (total) => `共 ${total} 条`,
showSizeChanger: true,
showQuickJumper: true,
}

33
src/views/Payment/BillManage/_payInfo/index.vue
Unescape View File

@ -0,0 +1,33 @@
<template>
<div>
<div class="cardTitle">账单明细</div>
<searchForm :formItem="formItem" @getSearch="search($event)"></searchForm>
</div>
</template>
<script>
export default {
name: 'payInfo',
data() {
return {
searchForm: {
},
formItem: []
}
},
methods: {
getData() {
},
search(data) {
this.searchForm = data;
this.getData()
},
}
}
</script>
<style>
</style>

30
src/views/Payment/ChargeStandardManage/depend/config.js
Unescape View File

@ -14,10 +14,40 @@ export const columns = [
{ {
title: "计费方式", title: "计费方式",
dataIndex: "billingType", dataIndex: "billingType",
customRender:function(billingType){
switch (billingType) {
case 1:
return '单价*数量'
case 2:
return '固定金额'
default:
break;
}
}
}, },
{ {
title: "计量方式", title: "计量方式",
dataIndex: "calculateType", dataIndex: "calculateType",
customRender:function(calculateType){
switch (calculateType) {
case 1:
return '建筑面积'
case 2:
return '使用面积'
case 3:
return '公摊面积'
case 5:
return '仪表用量'
case 6:
return '房屋数分摊'
case 7:
return '房屋面积分摊'
case 8:
return '房屋在住人口分摊'
default:
break;
}
}
}, },
{ {
title: "单价", title: "单价",

7
src/views/Shop/GoodsManage/_jcookList/index.vue
Unescape View File

@ -11,6 +11,11 @@
:row-selection="{ :row-selection="{
selectedRowKeys: selectedRowKeys, selectedRowKeys: selectedRowKeys,
onChange: selectionChoosed, onChange: selectionChoosed,
getCheckboxProps: (record)=>({
props: {
disabled: record.status != 1
}
})
}" }"
:row-key=" :row-key="
(record, index) => { (record, index) => {
@ -20,7 +25,7 @@
> >
<span slot="action" slot-scope="text, row"> <span slot="action" slot-scope="text, row">
<a-space> <a-space>
<a class="ant-dropdown-link" @click="push(row.id)">上架推送</a> <a v-if="row.status == 1" class="ant-dropdown-link" @click="push(row.id)">上架推送</a>
</a-space> </a-space>
</span> </span>
<span slot="mainPhoto" slot-scope="text, row"> <span slot="mainPhoto" slot-scope="text, row">

43
src/views/Shop/ScoreSetting/index.vue
Unescape View File

@ -32,10 +32,12 @@
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="签到方式" prop="signType"> <a-form-model-item label="签到方式" prop="signType">
<a-space> <a-space>
<span <!-- <span :class="[setForm.enableSignSetting === false ? 'disabled' : '']">
:class="[setForm.enableSignSetting === false ? 'disabled' : '']" {{ setForm.signType === 1 ? "一周每日签到模式" : "" }}
>{{ setForm.signType === 1 ? "一周每日签到模式" : "" }}</span </span> -->
> <a-radio-group v-model="setForm.signType" button-style="solid">
<a-radio-button :value="1"> 一周每日签到方式 </a-radio-button>
</a-radio-group>
<a-popover> <a-popover>
<template slot="content"> <template slot="content">
<p style="width: 300px"> <p style="width: 300px">
@ -61,10 +63,9 @@
/> />
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="签到奖励" prop="signReward"> <a-form-model-item label="签到奖励" prop="signReward">
<span <a-radio-group v-model="setForm.signReward" button-style="solid">
:class="[setForm.enableSignSetting === false ? 'disabled' : '']" <a-radio-button :value="1"> 商城积分 </a-radio-button>
>{{ setForm.signReward === 1 ? "商城积分" : "" }}</span </a-radio-group>
>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="签到活动名称" prop="signName"> <a-form-model-item label="签到活动名称" prop="signName">
<a-input <a-input
@ -75,16 +76,16 @@
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="签到奖励设置" prop="signRewardSetting"> <a-form-model-item label="签到奖励设置" prop="signRewardSetting">
<div v-for="(item, index) in dailyScore" :key="index"> <div v-for="(item, index) in dailyScore" :key="index">
<a-space <a-space>
>{{ item.label {{ item.label}}
}}<a-input <a-input
type="number" type="number"
:disabled="setForm.enableSignSetting === false" :disabled="setForm.enableSignSetting === false"
v-model.number="dailyScore[index].value" v-model.number="dailyScore[index].value"
addon-after="分" addon-after="分"
style="width: 100px" style="width: 100px"
></a-input ></a-input>
></a-space> </a-space>
</div> </div>
</a-form-model-item> </a-form-model-item>
<a-form-model-item :wrapper-col="{ span: 14, offset: 4 }"> <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }">
@ -144,13 +145,22 @@ export default {
async getData() { async getData() {
let res = await getSetting(); let res = await getSetting();
this.setForm = res.data; this.setForm = res.data;
res.data.signRewardSetting.split(",").forEach((ele, index) => { res.data.signRewardSetting.split(",").forEach((ele, index) => {
this.dailyScore[index].value = ele; this.dailyScore[index].value = ele;
}); });
this.time[0] = res.data.signBeginTime; this.time[0] = res.data.signBeginTime;
this.time[1] = res.data.signEndTime; this.time[1] = res.data.signEndTime;
}, },
async onSubmit() { async onSubmit() {
let reward = '';
for(let i=0;i<this.dailyScore.length;i++) {
if(i == this.dailyScore.length - 1) {
reward = reward + this.dailyScore[i].value
} else {
reward = reward + this.dailyScore[i].value + ','
}
}
this.setForm.signRewardSetting = reward;
let res = await Setting(this.setForm); let res = await Setting(this.setForm);
if (res.code === 200) { if (res.code === 200) {
this.$message.success(res.msg); this.$message.success(res.msg);
@ -160,7 +170,6 @@ export default {
} }
}, },
changeTime(date) { changeTime(date) {
console.log(date);
this.setForm.signBeginTime = date[0]; this.setForm.signBeginTime = date[0];
this.setForm.signEndTime = date[1]; this.setForm.signEndTime = date[1];
}, },

1
vue.config.js
Unescape View File

@ -9,6 +9,7 @@
module.exports = { module.exports = {
// ... // ...
runtimeCompiler: true, runtimeCompiler: true,
publicPath: './',
devServer: { devServer: {
port: "8443", port: "8443",
}, },

Write Preview
Loading…
Cancel
Save