|
@@ -3,7 +3,6 @@
|
|
|
<div class="table-operator">
|
|
|
<a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal">新增</a-button>
|
|
|
</div>
|
|
|
-
|
|
|
<s-table
|
|
|
ref="table"
|
|
|
size="default"
|
|
@@ -11,6 +10,10 @@
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
bordered>
|
|
|
+ <!-- 时间段 -->
|
|
|
+ <template slot="deliveryTimeRuleItemList" slot-scope="text, record">
|
|
|
+ <span>{{ filterData(record.deliveryTimeRuleItemList) }}</span>
|
|
|
+ </template>
|
|
|
<!-- 操作 -->
|
|
|
<span slot="action" slot-scope="text, record">
|
|
|
<a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" />
|
|
@@ -23,7 +26,7 @@
|
|
|
</span>
|
|
|
</s-table>
|
|
|
<!-- 新增/编辑 弹窗 -->
|
|
|
- <add-time-modal :visible="showModal" :data="itemData" @refresh="refreshTable" @close="showModal = false"></add-time-modal>
|
|
|
+ <add-time-modal :visible="showModal" :id="itemId" @refresh="refreshTable" @close="showModal = false"></add-time-modal>
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
@@ -33,12 +36,7 @@ import {
|
|
|
VSelect
|
|
|
} from '@/components'
|
|
|
import AddTimeModal from './AddTimeModal.vue'
|
|
|
-import {
|
|
|
- getPowerRoleList,
|
|
|
- updateEnableStatus,
|
|
|
- delectRolePower,
|
|
|
- getMenuList
|
|
|
-} from '@/api/power-role.js'
|
|
|
+import { getList, deleteTimeSetting } from '@/api/openTimeSetting.js'
|
|
|
export default {
|
|
|
name: 'RoleList',
|
|
|
components: {
|
|
@@ -49,7 +47,7 @@ export default {
|
|
|
data () {
|
|
|
return {
|
|
|
showModal: false, // 是否打开新增时间段弹窗
|
|
|
- itemData: {}, // 编辑行数据
|
|
|
+ itemId: {}, // 编辑行id
|
|
|
// 表头
|
|
|
columns: [{
|
|
|
title: '序号',
|
|
@@ -71,9 +69,12 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: '投放时间段',
|
|
|
- dataIndex: 'time',
|
|
|
+ dataIndex: 'deliveryTimeRuleItemList',
|
|
|
width: 200,
|
|
|
- align: 'center'
|
|
|
+ align: 'center',
|
|
|
+ scopedSlots: {
|
|
|
+ customRender: 'deliveryTimeRuleItemList'
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: '操作',
|
|
@@ -87,27 +88,25 @@ export default {
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
console.log(parameter, 'parameter')
|
|
|
-
|
|
|
- // return getPowerRoleList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
- // const no = (res.data.pageNo - 1) * res.data.pageSize
|
|
|
- // for (let i = 0; i < res.data.list.length; i++) {
|
|
|
- // const _item = res.data.list[i]
|
|
|
- // _item.no = no + i + 1
|
|
|
- // _item.isEnable = _item.isEnable + '' === '1'
|
|
|
- // }
|
|
|
- // return res.data
|
|
|
- // })
|
|
|
- return new Promise((resolve) => {
|
|
|
- const data = [
|
|
|
- { no: 1, id: '1', createDate: '2020-10-30 09:14', name: '上下班高峰', time: '8:00-9:00,18:00-20:00' },
|
|
|
- { no: 2, id: '12', createDate: '2020-10-30 09:14', name: '中午', time: '8:00-9:00,18:00-20:00' },
|
|
|
- { no: 3, id: '13', createDate: '2020-10-30 09:14', name: '下午茶', time: '8:00-9:00,18:00-20:00' },
|
|
|
- { no: 4, id: '14', createDate: '2020-10-30 09:14', name: '晚高峰', time: '8:00-9:00,18:00-20:00' },
|
|
|
- { no: 5, id: '15', createDate: '2020-10-30 09:14', name: '早高峰', time: '8:00-9:00,18:00-20:00' },
|
|
|
- { no: 6, id: '16', createDate: '2020-10-30 09:14', name: '深夜', time: '8:00-9:00,18:00-20:00' }
|
|
|
- ]
|
|
|
- resolve(data)
|
|
|
+ return getList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
+ const no = (res.data.pageNo - 1) * res.data.pageSize
|
|
|
+ for (let i = 0; i < res.data.list.length; i++) {
|
|
|
+ const _item = res.data.list[i]
|
|
|
+ _item.no = no + i + 1
|
|
|
+ }
|
|
|
+ return res.data
|
|
|
})
|
|
|
+ // return new Promise((resolve) => {
|
|
|
+ // const data = [
|
|
|
+ // { no: 1, id: '1', createDate: '2020-10-30 09:14', name: '上下班高峰', time: '8:00-9:00,18:00-20:00' },
|
|
|
+ // { no: 2, id: '12', createDate: '2020-10-30 09:14', name: '中午', time: '8:00-9:00,18:00-20:00' },
|
|
|
+ // { no: 3, id: '13', createDate: '2020-10-30 09:14', name: '下午茶', time: '8:00-9:00,18:00-20:00' },
|
|
|
+ // { no: 4, id: '14', createDate: '2020-10-30 09:14', name: '晚高峰', time: '8:00-9:00,18:00-20:00' },
|
|
|
+ // { no: 5, id: '15', createDate: '2020-10-30 09:14', name: '早高峰', time: '8:00-9:00,18:00-20:00' },
|
|
|
+ // { no: 6, id: '16', createDate: '2020-10-30 09:14', name: '深夜', time: '8:00-9:00,18:00-20:00' }
|
|
|
+ // ]
|
|
|
+ // resolve(data)
|
|
|
+ // })
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -124,9 +123,21 @@ export default {
|
|
|
// 新建
|
|
|
openModal () {
|
|
|
this.showModal = true
|
|
|
- this.itemData = {}
|
|
|
+ this.itemId = ''
|
|
|
+ },
|
|
|
+ // 时间段数据处理
|
|
|
+ filterData (row) {
|
|
|
+ if (row) {
|
|
|
+ let str = ''
|
|
|
+ row.map((item, index) => {
|
|
|
+ const p = item.openTime + '-' + item.closeTime
|
|
|
+ str = str + p + ((index == row.length - 1) ? '' : ',')
|
|
|
+ })
|
|
|
+ return str
|
|
|
+ } else {
|
|
|
+ return '--'
|
|
|
+ }
|
|
|
},
|
|
|
-
|
|
|
// 删除
|
|
|
delect (row) {
|
|
|
const _this = this
|
|
@@ -137,7 +148,7 @@ export default {
|
|
|
okText: '确定',
|
|
|
cancelText: '取消',
|
|
|
onOk () {
|
|
|
- delectRolePower({
|
|
|
+ deleteTimeSetting({
|
|
|
id: row.id
|
|
|
}).then(res => {
|
|
|
console.log(res, 'res1111')
|
|
@@ -153,7 +164,7 @@ export default {
|
|
|
handleEdit (row) {
|
|
|
console.log(row, 'row')
|
|
|
this.showModal = true
|
|
|
- this.itemData = row
|
|
|
+ this.itemId = row.id
|
|
|
}
|
|
|
}
|
|
|
}
|