From b59021fa35d5cda7037dc484d2bd78aac7afe084 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 06 Jan 2024 18:04:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/property/inviteTenders.vue | 20
src/views/property/oiae.vue | 1405 +++++++++++++++++++++---------------------
src/views/userHouse/hireInfoList.vue | 26
src/views/userHouse/houseList.vue | 36
src/views/work/start.vue | 371 +++++-----
src/views/userHouse/components/householdManager.vue | 14
src/views/place/index.vue | 22
src/views/userHouse/houseHoldList.vue | 46
8 files changed, 949 insertions(+), 991 deletions(-)
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index c81d30e..0f44eb8 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -17,18 +17,18 @@
<span v-text="decimalProcessing(row.lat)"></span>
</template>
- <template slot-scope="{row}" slot="confirmFlag">
- <el-tag size="small" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
+ <template slot-scope="{row, size}" slot="confirmFlag">
+ <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
}}</el-tag>
</template>
- <template slot-scope="{row}" slot="confirmFlag">
- <el-tag size="small" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
+ <template slot-scope="{row, size}" slot="confirmFlag">
+ <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
}}</el-tag>
</template>
- <template slot-scope="{row}" slot="source">
- <el-tag size="small" :type="showSource(row.source).type">{{ showSource(row.source).text
+ <template slot-scope="{row, size}" slot="source">
+ <el-tag :size="size" :type="showSource(row.source).type">{{ showSource(row.source).text
}}</el-tag>
</template>
@@ -37,13 +37,13 @@
</el-button>
</template>
- <template slot-scope="scope" slot="menu">
- <el-button type="text" :disabled="scope.row.confirmFlag == 2 || scope.row.confirmFlag != 4"
- icon="el-icon-s-check" size="small" v-if="permission.place_audit_cur" @click="auditCur(scope.row)">审核
+ <template slot-scope="{row, size}" slot="menu">
+ <el-button :size="size" type="text" :disabled="row.confirmFlag == 2 || row.confirmFlag == 4"
+ icon="el-icon-s-check" v-if="permission.place_audit_cur" @click="auditCur(row)">审核
</el-button>
- <el-button type="text" icon="el-icon-edit" size="small" v-if="permission.place_manage_tenants"
- @click="ManageTenants(scope.row)">场所维护
+ <el-button :size="size" type="text" icon="el-icon-edit" v-if="permission.place_manage_tenants"
+ @click="ManageTenants(row)">场所维护
</el-button>
</template>
</avue-crud>
diff --git a/src/views/property/inviteTenders.vue b/src/views/property/inviteTenders.vue
index 877bdf5..f1c2dba 100644
--- a/src/views/property/inviteTenders.vue
+++ b/src/views/property/inviteTenders.vue
@@ -143,7 +143,7 @@
excelBtn: true,
dialogClickModal: false,
column: [{
- label: "资讯标题",
+ label: "招标标题",
prop: "title",
span: 24,
row: true,
@@ -151,12 +151,12 @@
search: true,
rules: [{
required: true,
- message: "请输入资讯标题",
+ message: "请输入招标标题",
trigger: "blur",
}, ],
},
{
- label: "资讯封面",
+ label: "招标封面",
prop: "url",
// align:'center',
width: 80,
@@ -171,19 +171,19 @@
span: 24,
},
// {
- // label: "资讯来源",
+ // label: "招标来源",
// prop: "sourceName",
// search: true,
// searchSpan: 4,
// span: 24,
// rules: [{
// required: true,
- // message: "请输入资讯类型",
+ // message: "请输入招标类型",
// trigger: "blur",
// }, ],
// },
{
- label: "资讯范围",
+ label: "招标范围",
prop: "articleList",
span: 12,
minRows: 2,
@@ -193,7 +193,7 @@
dicData: [],
rules: [{
required: true,
- message: "请选择资讯范围",
+ message: "请选择招标范围",
trigger: "blur",
}, ],
props: {
@@ -203,7 +203,7 @@
hide: true,
},
{
- label: "资讯类型",
+ label: "招标类型",
prop: "type",
searchSpan: 3,
width: 80,
@@ -213,7 +213,7 @@
type: "select",
rules: [{
required: true,
- message: "请选择资讯类型",
+ message: "请选择招标类型",
trigger: "blur",
}, ],
dicData: [{
@@ -302,7 +302,7 @@
},
},
{
- label: "资讯内容",
+ label: "招标内容",
prop: "content",
component: "AvueUeditor",
options: {
diff --git a/src/views/property/oiae.vue b/src/views/property/oiae.vue
index bc9ac04..eb75631 100644
--- a/src/views/property/oiae.vue
+++ b/src/views/property/oiae.vue
@@ -1,766 +1,773 @@
<template>
- <basic-container>
- <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
- v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
- @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
- @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
- <template slot="menuLeft">
- <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删 除
- </el-button>
- <!-- <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
+ <basic-container>
+ <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+ v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
+ :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
+ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+ @refresh-change="refreshChange" @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
+ 除
+ </el-button>
+ <!-- <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
</el-button>
<el-button size="small" icon="el-icon-s-release" plain @click="gbcomment">关闭评论
</el-button> -->
- </template>
+ </template>
- <template slot-scope="{type,size,row }" slot="menu">
- <!-- <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,0)">
+ <template slot-scope="{type,size,row }" slot="menu">
+ <!-- <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,0)">
公益报名
</el-button>
<el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,1)">
创建议题
</el-button> -->
- <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
- 撤销
- </el-button>
- <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
- 发布
- </el-button>
- </template>
+ <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
+ @click.stop="updateFb(row)">
+ 撤销
+ </el-button>
+ <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
+ @click.stop="updateFb(row)">
+ 发布
+ </el-button>
+ </template>
- <template slot-scope="{ row }" slot="publish">
- <el-tag>{{
- row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
- }}
- </el-tag>
- </template>
+ <template slot-scope="{ row }" slot="publish">
+ <el-tag>{{
+ row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
+ }}
+ </el-tag>
+ </template>
- <template slot-scope="{ row }" slot="iscomment">
- <el-tag>{{
- row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
- }}
- </el-tag>
- </template>
- </avue-crud>
+ <template slot-scope="{ row }" slot="iscomment">
+ <el-tag>{{
+ row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
+ }}
+ </el-tag>
+ </template>
+ </avue-crud>
- <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
- <span slot="title" class="dialog-footer">
- {{discussForm.ontitle}}
- </span>
- <div id="" v-if="discussForm.eventType == 1">
- <avue-form @submit="handleSubmit" :option="optionDiscuss" v-model="discussForm"></avue-form>
- </div>
+ <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
+ <span slot="title" class="dialog-footer">
+ {{ discussForm.ontitle }}
+ </span>
+ <div id="" v-if="discussForm.eventType == 1">
+ <avue-form @submit="handleSubmit" :option="optionDiscuss" v-model="discussForm"></avue-form>
+ </div>
- <div id="" v-else>
- <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
- </avue-form>
- </div>
- </el-dialog>
+ <div id="" v-else>
+ <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
+ </avue-form>
+ </div>
+ </el-dialog>
- </basic-container>
+ </basic-container>
</template>
<script>
- import {
+import {
getList,
remove,
update,
add,
getNotice,
upcomment
- } from "@/api/article/article";
+} from "@/api/article/article"
- import {
+import {
getListPd,
removePd,
updatePd,
addPd,
getNoticePd,
upcommentPd
- } from "@/api/discuss/publicDiscuss";
+} from "@/api/discuss/publicDiscuss"
- import website from '@/config/website';
+import website from '@/config/website'
- import {
+import {
getDistrictTree
- } from "@/api/district/index";
+} from "@/api/district/index"
- import {
+import {
mapGetters
- } from "vuex";
+} from "vuex"
- export default {
- data() {
- return {
- discussForm: {
- ontitle: '',
- title: '',
- openFlag: 0,
- numberRestrictions: 0,
- voteRestrictions: 0,
- userRestrictions: 0,
- endTime: '',
- articleId: '',
- createTime: '',
- updateTime: '',
- deleteFlag: '',
- repeatVote: 0,
- voteNumberPublic: 0,
- appointUser: '',
- userIds: '',
- eventType: 1,
- },
- dialogVisibles: false,
- form: {},
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
- datetime: "",
- selectionList: [],
- option: {
- height: "auto",
- calcHeight: 54,
- dialogWidth: 950,
- tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 450,
- border: false,
- //stripe:true,
- index: true,
- viewBtn: true,
- selection: true,
- excelBtn: true,
- dialogClickModal: false,
- column: [{
- label: "资讯标题",
- prop: "title",
- span: 24,
- row: true,
- searchSpan: 4,
- search: true,
- rules: [{
- required: true,
- message: "请输入资讯标题",
- trigger: "blur",
- }, ],
+export default {
+ data () {
+ return {
+ discussForm: {
+ ontitle: '',
+ title: '',
+ openFlag: 0,
+ numberRestrictions: 0,
+ voteRestrictions: 0,
+ userRestrictions: 0,
+ endTime: '',
+ articleId: '',
+ createTime: '',
+ updateTime: '',
+ deleteFlag: '',
+ repeatVote: 0,
+ voteNumberPublic: 0,
+ appointUser: '',
+ userIds: '',
+ eventType: 1,
},
- {
- label: "资讯封面",
- prop: "url",
- // align:'center',
- width: 80,
- type: "upload",
- listType: "picture-img",
- action: "/api/blade-resource/oss/endpoint/put-file",
- propsHttp: {
- res: "data",
- url: "link",
- },
- // hide: true,
- span: 24,
+ dialogVisibles: false,
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
},
- // {
- // label: "资讯来源",
- // prop: "sourceName",
- // search: true,
- // searchSpan: 4,
- // span: 24,
- // rules: [{
- // required: true,
- // message: "请输入资讯类型",
- // trigger: "blur",
- // }, ],
- // },
- {
- label: "资讯范围",
- prop: "articleList",
- span: 12,
- minRows: 2,
- type: "cascader",
- multiple: true,
- tags: true,
- dicData: [],
- rules: [{
- required: true,
- message: "请选择资讯范围",
- trigger: "blur",
- }, ],
- props: {
- label: "name",
- value: 'id'
- },
- hide: true,
+ datetime: "",
+ selectionList: [],
+ option: {
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 950,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 450,
+ border: false,
+ //stripe:true,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ excelBtn: true,
+ dialogClickModal: false,
+ column: [
+ {
+ label: "收支标题",
+ prop: "title",
+ span: 24,
+ row: true,
+ searchSpan: 4,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请输入收支标题",
+ trigger: "blur",
+ }],
+ },
+
+ {
+ label: "缩略图",
+ prop: "url",
+ // align:'center',
+ width: 80,
+ type: "upload",
+ listType: "picture-img",
+ action: "/api/blade-resource/oss/endpoint/put-file",
+ propsHttp: {
+ res: "data",
+ url: "link",
+ },
+ // hide: true,
+ span: 24,
+ },
+
+ // {
+ // label: "收支来源",
+ // prop: "sourceName",
+ // search: true,
+ // searchSpan: 4,
+ // span: 24,
+ // rules: [{
+ // required: true,
+ // message: "请输入收支类型",
+ // trigger: "blur",
+ // }, ],
+ // },
+ {
+ label: "收支范围",
+ prop: "articleList",
+ span: 12,
+ minRows: 2,
+ type: "cascader",
+ multiple: true,
+ tags: true,
+ dicData: [],
+ rules: [{
+ required: true,
+ message: "请选择收支范围",
+ trigger: "blur",
+ },],
+ props: {
+ label: "name",
+ value: 'id'
+ },
+ hide: true,
+ },
+ {
+ label: "收支类型",
+ prop: "type",
+ searchSpan: 3,
+ width: 80,
+ value: 1,
+ slot: true,
+ search: true,
+ type: "select",
+ rules: [{
+ required: true,
+ message: "请选择收支类型",
+ trigger: "blur",
+ },],
+ dicData: [{
+ label: "经营性收支",
+ value: 1,
+ }],
+ },
+ {
+ label: "发布时间",
+ prop: "dateTime",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchSpan: 5,
+ searchRange: true,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请选择发布时间",
+ trigger: "blur",
+ },],
+ },
+ {
+ label: "发布时间",
+ prop: "createTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },
+ {
+ label: "发布状态",
+ prop: "publish",
+ searchSpan: 3,
+ width: 80,
+ value: "0",
+ slot: true,
+ search: true,
+ type: "select",
+ rules: [{
+ required: true,
+ message: "请选择发布状态",
+ trigger: "blur",
+ },],
+ dicData: [{
+ label: "未发布",
+ value: "0",
+ },
+ {
+ label: "已发布",
+ value: "1",
+ }
+ ],
+ },
+ {
+ label: "评论区",
+ prop: "iscomment",
+ width: 80,
+ slot: true,
+ type: "select",
+ dicData: [{
+ label: "关闭",
+ value: "0",
+ },
+ {
+ label: "开启",
+ value: "1",
+ }
+ ],
+ },
+ {
+ label: "视频",
+ prop: "videoUrl",
+ type: "upload",
+ accept: "video/mp4",
+ display: false,
+ hide: true,
+ span: 24,
+ listType: "picture-img",
+ action: "/api/depl/put-depl",
+ propsHttp: {
+ url: "data",
+ },
+ },
+ {
+ label: "收支内容",
+ prop: "content",
+ component: "AvueUeditor",
+ options: {
+ action: "/api/blade-resource/oss/endpoint/put-file",
+ // customConfig: {
+ // lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
+ // },//wangEditor编辑的配置
+ props: {
+ res: "data",
+ url: "link",
+ },
+ },
+ hide: true,
+ minRows: 6,
+ span: 24,
+ },
+ ],
},
- {
- label: "资讯类型",
- prop: "type",
- searchSpan: 3,
- width: 80,
- value: 1,
- slot: true,
- search: true,
- type: "select",
- rules: [{
- required: true,
- message: "请选择资讯类型",
- trigger: "blur",
- }, ],
- dicData: [{
- label: "经营性收支",
- value: 1,
- }],
+ data: [],
+ optionEnroll: {
+ column: [{
+ label: "",
+ type: 'title',
+ prop: "title",
+ span: 24,
+ row: true,
+ offset: 2,
+ styles: {
+ fontSize: '24px'
+ }
+ }, {
+ labelWidth: 100,
+ label: '开启',
+ prop: 'openFlag',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '开启',
+ value: 0
+ }, {
+ label: '不开启',
+ value: 1
+ }]
+ },
+
+ {
+ label: "截止时间",
+ row: true,
+ offset: 6,
+ prop: "endTime",
+ type: "datetime",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "timestamp",
+ },
+ ]
},
- {
- label: "发布时间",
- prop: "dateTime",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- searchSpan: 5,
- searchRange: true,
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- search: true,
- rules: [{
- required: true,
- message: "请选择发布时间",
- trigger: "blur",
- }, ],
- },
- {
- label: "发布时间",
- prop: "createTime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- },
- {
- label: "发布状态",
- prop: "publish",
- searchSpan: 3,
- width: 80,
- value: "0",
- slot: true,
- search: true,
- type: "select",
- rules: [{
- required: true,
- message: "请选择发布状态",
- trigger: "blur",
- }, ],
- dicData: [{
- label: "未发布",
- value: "0",
+ optionDiscuss: {
+ column: [{
+ label: "",
+ type: 'title',
+ prop: "title",
+ span: 24,
+ row: true,
+ offset: 2,
+ styles: {
+ fontSize: '24px'
+ }
+ }, {
+ labelWidth: 100,
+ label: '开启投票',
+ prop: 'openFlag',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '开启',
+ value: 0
+ }, {
+ label: '不开启',
+ value: 1
+ }]
+ }, {
+ labelWidth: 100,
+ label: '开启签名',
+ prop: 'signatureFlag',
+ type: 'radio',
+ button: true,
+ row: true,
+ offset: 6,
+ dicData: [{
+ label: '开启',
+ value: 0
+ }, {
+ label: '不开启',
+ value: 1
+ }]
},
{
- label: "已发布",
- value: "1",
- }
- ],
- },
- {
- label: "评论区",
- prop: "iscomment",
- width: 80,
- slot: true,
- type: "select",
- dicData: [{
- label: "关闭",
- value: "0",
+ label: "截止时间",
+ row: true,
+ offset: 6,
+ prop: "endTime",
+ type: "datetime",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "timestamp",
},
- {
- label: "开启",
- value: "1",
- }
- ],
+ ]
},
- {
- label: "视频",
- prop: "videoUrl",
- type: "upload",
- accept: "video/mp4",
- display: false,
- hide: true,
- span: 24,
- listType: "picture-img",
- action: "/api/depl/put-depl",
- propsHttp: {
- url: "data",
- },
- },
- {
- label: "资讯内容",
- prop: "content",
- component: "AvueUeditor",
- options: {
- action: "/api/blade-resource/oss/endpoint/put-file",
- // customConfig: {
- // lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
- // },//wangEditor编辑的配置
- props: {
- res: "data",
- url: "link",
- },
- },
- hide: true,
- minRows: 6,
- span: 24,
- },
- ],
- },
- data: [],
- optionEnroll: {
- column: [{
- label: "",
- type: 'title',
- prop: "title",
- span: 24,
- row: true,
- offset: 2,
- styles: {
- fontSize: '24px'
- }
- }, {
- labelWidth: 100,
- label: '开启',
- prop: 'openFlag',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '开启',
- value: 0
- }, {
- label: '不开启',
- value: 1
- }]
- },
-
- {
- label: "截止时间",
- row: true,
- offset: 6,
- prop: "endTime",
- type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
- },
- ]
- },
- optionDiscuss: {
- column: [{
- label: "",
- type: 'title',
- prop: "title",
- span: 24,
- row: true,
- offset: 2,
- styles: {
- fontSize: '24px'
- }
- }, {
- labelWidth: 100,
- label: '开启投票',
- prop: 'openFlag',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '开启',
- value: 0
- }, {
- label: '不开启',
- value: 1
- }]
- }, {
- labelWidth: 100,
- label: '开启签名',
- prop: 'signatureFlag',
- type: 'radio',
- button: true,
- row: true,
- offset: 6,
- dicData: [{
- label: '开启',
- value: 0
- }, {
- label: '不开启',
- value: 1
- }]
- },
- {
- label: "截止时间",
- row: true,
- offset: 6,
- prop: "endTime",
- type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
- },
- ]
- },
- districtTree: [],
- };
+ districtTree: [],
+ }
},
watch: {
- "form.articleType": {
- handler(val) {
- if (val) {
- var videoUrl = this.findObject(this.option.column, "videoUrl");
- var content = this.findObject(this.option.column, "content");
- if (val.indexOf('ksp') != -1) {
- videoUrl.display = true;
- content.display = false;
- videoUrl.rules = [{
- required: false,
- message: "请选择视频",
- trigger: "blur",
- }, ];
- } else {
- videoUrl.display = false;
- content.display = true;
- videoUrl.rules = "";
- }
- }
- },
- immediate: true,
- }
+ "form.articleType": {
+ handler (val) {
+ if (val) {
+ var videoUrl = this.findObject(this.option.column, "videoUrl")
+ var content = this.findObject(this.option.column, "content")
+ if (val.indexOf('ksp') != -1) {
+ videoUrl.display = true
+ content.display = false
+ videoUrl.rules = [{
+ required: false,
+ message: "请选择视频",
+ trigger: "blur",
+ },]
+ } else {
+ videoUrl.display = false
+ content.display = true
+ videoUrl.rules = ""
+ }
+ }
+ },
+ immediate: true,
+ }
},
computed: {
- ...mapGetters(["permission", "userInfo"]),
- permissionList() {
- return {
- addBtn: this.vaildData(this.permission.article_add, true),
- viewBtn: this.vaildData(this.permission.article_view, true),
- delBtn: this.vaildData(this.permission.article_delete, true),
- editBtn: this.vaildData(this.permission.article_edit, true),
- };
- },
- ids() {
- let ids = [];
- this.selectionList.forEach((ele) => {
- ids.push(ele.id);
- });
- return ids.join(",");
- },
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList () {
+ return {
+ addBtn: this.vaildData(this.permission.article_add, true),
+ viewBtn: this.vaildData(this.permission.article_view, true),
+ delBtn: this.vaildData(this.permission.article_delete, true),
+ editBtn: this.vaildData(this.permission.article_edit, true),
+ }
+ },
+ ids () {
+ let ids = []
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ },
},
methods: {
- openDilog(row, type) {
- this.dialogVisibles = true
- this.discussForm.eventType = type
- this.discussForm.articleId = row.id
- this.discussForm.title = row.title
- if (type == 0) {
- this.discussForm.ontitle = '公益报名'
- } else {
- this.discussForm.ontitle = '创建议题'
- }
- },
-
- handleSubmit(form, done) {
- done();
- addPd(form).then(
- () => {
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- this.dialogVisibles = false
- done();
- },
- (error) => {
- window.console.log(error);
- // loading();
- }
- );
- },
-
- handleClose(done) {
- done();
- // this.$confirm('确认关闭？')
- // .then(_ => {
- // done();
- // })
- // .catch(_ => {});
- },
- rowSave(row, done, loading) {
- if (row.videoUrl.length == 0) {
- row.videoUrl = "";
- }
- row.userid = this.userInfo.user_id;
- row.articleRange = JSON.stringify(row.articleList)
- if (row.url.length > 0) {
- var urls = []
- var split = row.url.split(",");
- split.forEach(url => {
- var names = url.split("jczz/");
- urls.push(names[1])
- })
- row.url = urls.join(",")
- }
- add(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
- rowUpdate(row, index, done, loading) {
- row.articleRange = JSON.stringify(row.articleList)
- if (row.url.length > 0) {
- var urls = []
- var split = row.url.split(",");
- split.forEach(url => {
- var names = url.split("jczz/");
- urls.push(names[1])
- })
- row.url = urls.join(",")
- }
-
- update(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
- rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(row.id);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- });
- },
- searchReset() {
- this.query = {};
- this.onLoad(this.page);
- },
- searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
- },
- selectionChange(list) {
- this.selectionList = list;
- },
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
- },
- handleDelete() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
- }
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(this.ids);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- this.$refs.crud.toggleSelection();
- });
- },
- beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getNotice(this.form.id).then((res) => {
- let data = res.data.data
- if (data.url.length > 0) {
- var urls = []
- var names = data.url.split(",");
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- data.url = urls.join(",")
+ openDilog (row, type) {
+ this.dialogVisibles = true
+ this.discussForm.eventType = type
+ this.discussForm.articleId = row.id
+ this.discussForm.title = row.title
+ if (type == 0) {
+ this.discussForm.ontitle = '公益报名'
+ } else {
+ this.discussForm.ontitle = '创建议题'
}
- data.articleList = JSON.parse(data.articleRange)
- this.form = data;
- });
- }
- // con
- done();
- },
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
- },
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
- },
- refreshChange() {
- this.onLoad(this.page, this.query);
- },
- onLoad(page, params = {}) {
- const {
- dateTime
- } = this.query;
- let values = {
- ...params,
- };
- if (dateTime) {
- values = {
- ...params,
- startTime: dateTime[0],
- endTime: dateTime[1],
- ...this.query,
- };
- values.dateTime = null;
- }
- values.type = 1
- this.loading = true;
- getList(page.currentPage, page.pageSize, values).then((res) => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.data.forEach(item => {
- if (item.url.length > 0) {
- var urls = []
- var names = item.url.split(",");
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- item.url = urls.join(",")
+ },
+
+ handleSubmit (form, done) {
+ done()
+ addPd(form).then(
+ () => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.dialogVisibles = false
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ // loading();
+ }
+ )
+ },
+
+ handleClose (done) {
+ done()
+ // this.$confirm('确认关闭？')
+ // .then(_ => {
+ // done();
+ // })
+ // .catch(_ => {});
+ },
+ rowSave (row, done, loading) {
+ if (row.videoUrl.length == 0) {
+ row.videoUrl = ""
}
- })
- this.loading = false;
- this.selectionClear();
- });
- getDistrictTree(params = {}).then((res) => {
- const data = res.data.data;
- this.districtTree = data;
- const column = this.findObject(this.option.column, "articleList");
- column.dicData = res.data.data;
- this.loading = false;
- });
- },
- updateFb(row) {
- if (row.publish == "0") {
- row.publish = "1";
- } else {
- row.publish = "0";
+ row.userid = this.userInfo.user_id
+ row.articleRange = JSON.stringify(row.articleList)
+ if (row.url.length > 0) {
+ var urls = []
+ var split = row.url.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.url = urls.join(",")
+ }
+ add(row).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+ rowUpdate (row, index, done, loading) {
+ row.articleRange = JSON.stringify(row.articleList)
+ if (row.url.length > 0) {
+ var urls = []
+ var split = row.url.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.url = urls.join(",")
+ }
+
+ update(row).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+ rowDel (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
+ searchReset () {
+ this.query = {}
+ this.onLoad(this.page)
+ },
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
+ },
+ selectionChange (list) {
+ this.selectionList = list
+ },
+ selectionClear () {
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
+ },
+ handleDelete () {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+ beforeOpen (done, type) {
+ if (["edit", "view"].includes(type)) {
+ getNotice(this.form.id).then((res) => {
+ let data = res.data.data
+ if (data.url.length > 0) {
+ var urls = []
+ var names = data.url.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ data.url = urls.join(",")
+ }
+ data.articleList = JSON.parse(data.articleRange)
+ this.form = data
+ })
+ }
+ // con
+ done()
+ },
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
+ },
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
+ },
+ refreshChange () {
+ this.onLoad(this.page, this.query)
+ },
+ onLoad (page, params = {}) {
+ const {
+ dateTime
+ } = this.query
+ let values = {
+ ...params,
+ }
+ if (dateTime) {
+ values = {
+ ...params,
+ startTime: dateTime[0],
+ endTime: dateTime[1],
+ ...this.query,
+ }
+ values.dateTime = null
+ }
+ values.type = 1
+ this.loading = true
+ getList(page.currentPage, page.pageSize, values).then((res) => {
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.data.forEach(item => {
+ if (item.url.length > 0) {
+ var urls = []
+ var names = item.url.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ item.url = urls.join(",")
+ }
+ })
+ this.loading = false
+ this.selectionClear()
+ })
+ getDistrictTree(params = {}).then((res) => {
+ const data = res.data.data
+ this.districtTree = data
+ const column = this.findObject(this.option.column, "articleList")
+ column.dicData = res.data.data
+ this.loading = false
+ })
+ },
+ updateFb (row) {
+ if (row.publish == "0") {
+ row.publish = "1"
+ } else {
+ row.publish = "0"
+ }
+ if (row.url.length > 0) {
+ var urls = []
+ var split = row.url.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.url = urls.join(",")
+ }
+ update(row).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+ kqcomment () {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据开启评论?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ return upcomment(this.ids, "1")
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+ gbcomment () {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据开启评论?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ return upcomment(this.ids, "0")
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.crud.toggleSelection()
+ })
}
- if (row.url.length > 0) {
- var urls = []
- var split = row.url.split(",");
- split.forEach(url => {
- var names = url.split("jczz/");
- urls.push(names[1])
- })
- row.url = urls.join(",")
- }
- update(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
- kqcomment() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
- }
- this.$confirm("确定将选择数据开启评论?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }).then(() => {
- return upcomment(this.ids, "1");
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- this.$refs.crud.toggleSelection();
- });
- },
- gbcomment() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
- }
- this.$confirm("确定将选择数据开启评论?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }).then(() => {
- return upcomment(this.ids, "0");
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- this.$refs.crud.toggleSelection();
- });
- }
},
- };
+}
</script>
<style>
- .avue-upload__icon {
+.avue-upload__icon {
line-height: 6;
- }
+}
</style>
diff --git a/src/views/userHouse/components/householdManager.vue b/src/views/userHouse/components/householdManager.vue
index 64a3374..5c5b710 100644
--- a/src/views/userHouse/components/householdManager.vue
+++ b/src/views/userHouse/components/householdManager.vue
@@ -12,18 +12,6 @@
@click="handleDelete">删 除
</el-button>
</template>
- <template slot-scope="{row}" slot="tenantName">
- <el-tag>{{ row.tenantName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="roleName">
- <el-tag>{{ row.roleName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="deptName">
- <el-tag>{{ row.deptName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="userTypeName">
- <el-tag>{{ row.userTypeName }}</el-tag>
- </template>
</avue-crud>
</basic-container>
</el-col>
@@ -811,7 +799,7 @@
onLoad (page, params = {}) {
params['houseCode'] = this.houseCode
this.loading = true
-
+
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data
this.page.total = data.total
diff --git a/src/views/userHouse/hireInfoList.vue b/src/views/userHouse/hireInfoList.vue
index 4c29fac..80d0043 100644
--- a/src/views/userHouse/hireInfoList.vue
+++ b/src/views/userHouse/hireInfoList.vue
@@ -7,41 +7,28 @@
@row-save="rowSave" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange"
@search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
- <template slot="auditStatus" slot-scope="{row}">
- <el-tag size="small" :type="showConfirmFlag(row.auditStatus).type">
+ <template slot-scope="{row, size}" slot="auditStatus">
+ <el-tag :size="size" :type="showConfirmFlag(row.auditStatus).type">
{{ showConfirmFlag(row.auditStatus).text }}
</el-tag>
</template>
<template slot="menuLeft">
- <el-button type="danger" size="small" plain icon="el-icon-delete"
+ <el-button type="danger" :size="size" plain icon="el-icon-delete"
v-if="permission.houseRental_delete" @click="handleDelete">删 除
</el-button>
</template>
- <template slot-scope="scope" slot="menu">
- <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
- v-if="permission.househould_manager" @click="ManageTenants(scope.row)">管理租户
+ <template slot-scope="{row, size}" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
+ v-if="permission.househould_manager" @click="ManageTenants(row)">管理租户
</el-button>
<!-- <el-button type="success" size="small" plain icon="el-icon-upload2" @click="handleImport">导入
</el-button>
<el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
</el-button> -->
</template>
- <template slot-scope="{row}" slot="tenantName">
- <el-tag>{{ row.tenantName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="roleName">
- <el-tag>{{ row.roleName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="deptName">
- <el-tag>{{ row.deptName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="userTypeName">
- <el-tag>{{ row.userTypeName }}</el-tag>
- </template>
</avue-crud>
-
<el-dialog title="租户管理" append-to-body :visible.sync="roleBox">
<avue-crud :option="houseHoldOption" :search.sync="search" :table-loading="loading" :data="houseHold"
@@ -56,7 +43,6 @@
<el-button type="primary" @click="submitRole">确 定</el-button>
</span>
</el-dialog>
-
<el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
<avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index 6ff6c2c..862da1b 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -18,39 +18,24 @@
icon="el-icon-download" @click="handleExport">导出
</el-button>
</template>
- <template slot-scope="scope" slot="menu">
- <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
- v-if="permission.househould_manager" @click="manageLabel(scope.row)">标签
+
+ <template slot-scope="{row, size}" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
+ v-if="permission.househould_manager" @click="manageLabel(row)">标签
</el-button>
</template>
- <template slot-scope="{row}" slot="phoneNumber">
- <el-button type="text" @click="showStringDispose(row, 'phoneNumberflag')">
+ <template slot-scope="{row, size}" slot="phoneNumber">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneNumberflag')">
{{ textDispose(row, 'phoneNumberflag', 'phoneNumber') }}
</el-button>
</template>
- <template slot-scope="{row}" slot="idCard">
- <el-button type="text" @click="showStringDispose(row, 'idCardflag')"
+ <template slot-scope="{row, size}" slot="idCard">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'idCardflag')"
v-text="textDispose(row, 'idCardflag', 'idCard')"></el-button>
</template>
-
- <template slot-scope="{row}" slot="householdLabelList">
+ <template slot-scope="{row, size}" slot="householdLabelList">
{{ labelDispose(row.householdLabelList) }}
</template>
-
- <template slot-scope="{row}" slot="tenantName">
- <el-tag>{{ row.tenantName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="roleName">
- <el-tag>{{ row.roleName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="deptName">
- <el-tag>{{ row.deptName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="userTypeName">
- <el-tag>{{ row.userTypeName }}</el-tag>
- </template>
-
-
</avue-crud>
<el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>
@@ -59,8 +44,8 @@
</el-tree>
<span slot="footer" class="dialog-footer">
- <el-button @click="roleBox = false">取 消</el-button>
- <el-button type="primary" @click="submitRole">确 定</el-button>
+ <el-button size="small" @click="roleBox = false">取 消</el-button>
+ <el-button size="small" type="primary" @click="submitRole">确 定</el-button>
</span>
</el-dialog>
@@ -92,16 +77,15 @@
<avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
</avue-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="editLabelFlge = false">取 消</el-button>
- <el-button type="primary" @click="onsubmit">确 定</el-button>
+ <el-button size="small" @click="editLabelFlge = false">取 消</el-button>
+ <el-button size="small" type="primary" @click="onsubmit">确 定</el-button>
</span>
</el-dialog>
-
<el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
<avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
<template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
+ <el-button size="small" type="primary" @click="handleTemplate">
点击下载<i class="el-icon-download el-icon--right"></i>
</el-button>
</template>
@@ -1088,7 +1072,7 @@
onLoad (page, params = {}) {
this.loading = true
-
+
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = {
...res.data.data,
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index 64d2d2e..8b2f087 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -18,30 +18,18 @@
icon="el-icon-download" @click="handleExport">导出
</el-button>
</template>
- <template slot-scope="scope" slot="menu">
- <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
- v-if="permission.househould_manager" @click="handleHouseholdManager(scope.row)">住户管理
+
+ <template slot-scope="{row, size}" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
+ v-if="permission.househould_manager" @click="handleHouseholdManager(row)">住户管理
</el-button>
- <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
- v-if="permission.househould_manager" @click="manageLabel(scope.row)">标签
+ <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
+ v-if="permission.househould_manager" @click="manageLabel(row)">标签
</el-button>
</template>
- <template slot-scope="{row}" slot="tenantName">
- <el-tag>{{ row.tenantName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="roleName">
- <el-tag>{{ row.roleName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="deptName">
- <el-tag>{{ row.deptName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="userTypeName">
- <el-tag>{{ row.userTypeName }}</el-tag>
- </template>
-
- <template slot-scope="{row}" slot="phone">
- <el-button type="text" @click="showStringDispose(row, 'phoneflag')">
+ <template slot-scope="{row, size}" slot="phone">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')">
{{ textDispose(row, 'phoneflag', 'phone') }}
</el-button>
</template>
@@ -57,8 +45,8 @@
</el-tree>
<span slot="footer" class="dialog-footer">
- <el-button @click="roleBox = false">取 消</el-button>
- <el-button type="primary" @click="submitRole">确 定</el-button>
+ <el-button size="small" @click="roleBox = false">取 消</el-button>
+ <el-button size="small" type="primary" @click="submitRole">确 定</el-button>
</span>
</el-dialog>
@@ -80,8 +68,8 @@
<avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
</avue-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="editLabelFlge = false">取 消</el-button>
- <el-button type="primary" @click="onsubmit">确 定</el-button>
+ <el-button size="small" @click="editLabelFlge = false">取 消</el-button>
+ <el-button size="small" type="primary" @click="onsubmit">确 定</el-button>
</span>
</el-dialog>
diff --git a/src/views/work/start.vue b/src/views/work/start.vue
index d53c1fe..9703ed5 100644
--- a/src/views/work/start.vue
+++ b/src/views/work/start.vue
@@ -1,203 +1,208 @@
<template>
- <basic-container>
- <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" v-model="form" ref="crud"
- @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
- @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
- <template slot="menuLeft">
- <el-radio-group v-model="mode" size="small">
- <el-radio-button label="1">通用流程</el-radio-button>
- <el-radio-button label="2">定制流程</el-radio-button>
- </el-radio-group>
- </template>
- <template slot-scope="scope" slot="menu">
- <el-button type="text" size="small" icon="el-icon-video-play" v-if="permission.work_start_flow"
- @click.stop="handleStart(scope.row)">发起
- </el-button>
- <el-button type="text" size="small" icon="el-icon-search" v-if="permission.work_start_image"
- @click.stop="handleImage(scope.row, scope.index)">流程图
- </el-button>
- </template>
- <template slot-scope="{row}" slot="tenantId">
- <el-tag>{{ row.tenantId === '' ? '通用' : row.tenantId }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="version">
- <el-tag>v{{ row.version }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="suspensionState">
- <el-tag>{{ row.suspensionState === 1 ? '激活' : '挂起' }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="category">
- <el-tag>{{ row.categoryName }}</el-tag>
- </template>
- </avue-crud>
- <flow-design is-dialog :is-display.sync="flowBox" :process-definition-id="processDefinitionId"></flow-design>
- </basic-container>
+ <basic-container>
+ <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" v-model="form" ref="crud"
+ @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+ @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-radio-group v-model="mode" size="small">
+ <el-radio-button label="1">通用流程</el-radio-button>
+ <el-radio-button label="2">定制流程</el-radio-button>
+ </el-radio-group>
+ </template>
+ <template slot-scope="scope" slot="menu">
+ <el-button type="text" size="small" icon="el-icon-video-play" v-if="permission.work_start_flow"
+ @click.stop="handleStart(scope.row)">发起
+ </el-button>
+ <el-button type="text" size="small" icon="el-icon-search" v-if="permission.work_start_image"
+ @click.stop="handleImage(scope.row, scope.index)">流程图
+ </el-button>
+ </template>
+ <template slot-scope="{row, size}" slot="tenantId">
+ <el-tag :size="size">{{ row.tenantId === '' ? '通用' : row.tenantId }}</el-tag>
+ </template>
+ <template slot-scope="{row, size}" slot="version">
+ <el-tag :size="size">v{{ row.version }}</el-tag>
+ </template>
+ <template slot-scope="{row, size}" slot="suspensionState">
+ <el-tag :size="size" :type="row.suspensionState === 1 ? 'success' : 'info'">{{ row.suspensionState === 1 ?
+ '激活' : '挂起'
+ }}</el-tag>
+ </template>
+ <template slot-scope="{row, size}" slot="category">
+ <el-tag :size="size">{{ row.categoryName }}</el-tag>
+ </template>
+ </avue-crud>
+ <flow-design is-dialog :is-display.sync="flowBox" :process-definition-id="processDefinitionId"></flow-design>
+ </basic-container>
</template>
<script>
- import {
+import {
mapGetters
- } from "vuex"
- import {
+} from "vuex"
+import {
startList
- } from "@/api/work/work"
- import {
+} from "@/api/work/work"
+import {
flowCategory,
flowRoute
- } from "@/util/flow"
+} from "@/util/flow"
- export default {
- data() {
- return {
- form: {},
- mode: '1',
- selectionId: '',
- selectionList: [],
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- processDefinitionId: '',
- flowBox: false,
- workBox: false,
- option: {
- height: 'auto',
- calcHeight: 30,
- tip: false,
- searchShow: true,
- searchMenuSpan: 6,
- border: true,
- index: true,
- selection: true,
- editBtn: false,
- addBtn: false,
- viewBtn: false,
- delBtn: false,
- menuWidth: 280,
- dialogWidth: 900,
- dialogClickModal: false,
- column: [{
- label: '租户编号',
- prop: 'tenantId',
- slot: true,
- width: 120,
+export default {
+ data () {
+ return {
+ form: {},
+ mode: '1',
+ selectionId: '',
+ selectionList: [],
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
},
- {
- label: "流程分类",
- type: "select",
- row: true,
- dicUrl: "/api/blade-system/dict/dictionary?code=flow",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- prop: "category",
- search: true,
- width: 100,
+ processDefinitionId: '',
+ flowBox: false,
+ workBox: false,
+ option: {
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 140,
+
+ height: 'auto',
+ calcHeight: 30,
+ tip: false,
+ border: true,
+ index: true,
+ selection: true,
+ editBtn: false,
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ dialogWidth: 900,
+ dialogClickModal: false,
+ column: [
+ {
+ width: 120,
+ label: '租户编号',
+ prop: 'tenantId',
+ slot: true,
+ },
+ {
+ width: 120,
+ label: "流程分类",
+ type: "select",
+ row: true,
+ dicUrl: "/api/blade-system/dict/dictionary?code=flow",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ slot: true,
+ prop: "category",
+ search: true,
+ },
+ {
+ label: '流程标识',
+ prop: 'key',
+ },
+ {
+ label: '流程名称',
+ prop: 'name',
+ search: true,
+ },
+ {
+ label: '流程版本',
+ prop: 'version',
+ slot: true,
+ width: 80,
+ },
+ {
+ label: '状态',
+ prop: 'suspensionState',
+ slot: true,
+ width: 80,
+ },
+ {
+ label: '部署时间',
+ prop: 'deploymentTime',
+ width: 165,
+ },
+ ]
},
- {
- label: '流程标识',
- prop: 'key',
- },
- {
- label: '流程名称',
- prop: 'name',
- search: true,
- },
- {
- label: '流程版本',
- prop: 'version',
- slot: true,
- width: 80,
- },
- {
- label: '状态',
- prop: 'suspensionState',
- slot: true,
- width: 80,
- },
- {
- label: '部署时间',
- prop: 'deploymentTime',
- width: 165,
- },
- ]
- },
- data: []
- }
+ data: []
+ }
},
watch: {
- 'mode'() {
- this.onLoad(this.page)
- }
+ 'mode' () {
+ this.onLoad(this.page)
+ }
},
computed: {
- ...mapGetters(["permission", "flowRoutes"]),
- ids() {
- let ids = []
- this.selectionList.forEach(ele => {
- ids.push(ele.id)
- })
- return ids.join(",")
- },
+ ...mapGetters(["permission", "flowRoutes"]),
+ ids () {
+ let ids = []
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ },
},
methods: {
- searchReset() {
- this.query = {}
- this.onLoad(this.page)
- },
- searchChange(params, done) {
- this.query = params
- this.page.currentPage = 1
- this.onLoad(this.page, params)
- done()
- },
- selectionChange(list) {
- this.selectionList = list
- },
- selectionClear() {
- this.selectionList = []
- this.$refs.crud.toggleSelection()
- },
- handleStart(row) {
- // console.log("+++++++++++++++++" + `/work/process/${flowRoute(this.flowRoutes, row.category)}/form/${row.id}`)
- this.$router.push({
- path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/form/${row.id}`
- })
- },
- handleImage(row) {
- this.processDefinitionId = row.id
- this.flowBox = true
- },
- currentChange(currentPage) {
- this.page.currentPage = currentPage
- },
- sizeChange(pageSize) {
- this.page.pageSize = pageSize
- },
- refreshChange() {
- this.onLoad(this.page, this.query)
- },
- onLoad(page, params = {}) {
- const query = {
- ...this.query,
- category: (params.category) ? flowCategory(params.category) : null,
- mode: this.mode
+ searchReset () {
+ this.query = {}
+ this.onLoad(this.page)
+ },
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
+ },
+ selectionChange (list) {
+ this.selectionList = list
+ },
+ selectionClear () {
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
+ },
+ handleStart (row) {
+ // console.log("+++++++++++++++++" + `/work/process/${flowRoute(this.flowRoutes, row.category)}/form/${row.id}`)
+ this.$router.push({
+ path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/form/${row.id}`
+ })
+ },
+ handleImage (row) {
+ this.processDefinitionId = row.id
+ this.flowBox = true
+ },
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
+ },
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
+ },
+ refreshChange () {
+ this.onLoad(this.page, this.query)
+ },
+ onLoad (page, params = {}) {
+ const query = {
+ ...this.query,
+ category: (params.category) ? flowCategory(params.category) : null,
+ mode: this.mode
+ }
+ this.loading = true
+ startList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
}
- this.loading = true
- startList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
- const data = res.data.data
- this.page.total = data.total
- this.data = data.records
- this.loading = false
- this.selectionClear()
- })
- }
}
- }
+}
</script>
\ No newline at end of file
--
Gitblit v1.9.3