From 73eb0f1c2fe93375b511611eb3616e59afd16a5a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 21 Dec 2023 21:33:15 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/work/process/maintenanceFundApply/detail.vue | 325 +++++
src/router/views/index.js | 31
src/views/gzll/owners.vue | 505 +++++--
src/views/work/process/maintenanceFundApply/handle.vue | 413 ++++++
src/views/property/propertyCompanyDistrict.vue | 2
src/views/flow/manager.vue | 115 -
src/views/work/process/maintenanceFundApply/form.vue | 267 ++++
src/views/community/index.vue | 369 ++++++
src/views/property/propertyCapitalApply.vue | 817 +++++++------
src/views/work/start.vue | 367 +++--
src/views/userHouse/houseHoldList.vue | 212 +++
src/api/owners_committee/index.js | 37
src/api/owners/ownersCommittee.js | 50
src/api/community/index.js | 49
14 files changed, 2,717 insertions(+), 842 deletions(-)
diff --git a/src/api/community/index.js b/src/api/community/index.js
new file mode 100644
index 0000000..cb54567
--- /dev/null
+++ b/src/api/community/index.js
@@ -0,0 +1,49 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/blade-community/community/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/api/blade-community/community/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const add = (row) => {
+ return request({
+ url: '/api/blade-community/community/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/api/blade-community/community/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const getCommunity = (id) => {
+ return request({
+ url: '/api/blade-community/community/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
diff --git a/src/api/owners/ownersCommittee.js b/src/api/owners/ownersCommittee.js
new file mode 100644
index 0000000..74036c4
--- /dev/null
+++ b/src/api/owners/ownersCommittee.js
@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/blade-ownersCommitteeMember/OwnersCommittee/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getDetail = (id) => {
+ return request({
+ url: '/api/blade-ownersCommitteeMember/OwnersCommittee/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/api/blade-ownersCommitteeMember/OwnersCommittee/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const add = (row) => {
+ return request({
+ url: '/api/blade-ownersCommitteeMember/OwnersCommittee/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/api/blade-ownersCommitteeMember/OwnersCommittee/submit',
+ method: 'post',
+ data: row
+ })
+}
+
diff --git a/src/api/owners_committee/index.js b/src/api/owners_committee/index.js
index 37718b7..88ae465 100644
--- a/src/api/owners_committee/index.js
+++ b/src/api/owners_committee/index.js
@@ -21,3 +21,40 @@
},
});
};
+
+export const getDetatil = (id) => {
+ return request({
+ url: '/api/blade-ownersCommittee/ownersCommittee/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/api/blade-ownersCommittee/ownersCommittee/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+
+export const add = (row) => {
+ return request({
+ url: '/api/blade-ownersCommittee/ownersCommittee/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/api/blade-ownersCommittee/ownersCommittee/update',
+ method: 'post',
+ data: row
+ })
+}
\ No newline at end of file
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 383242e..71d0fb4 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -103,4 +103,33 @@
component: () =>
import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
}]
-}]
+}, {
+ path: '/work/process/maintenanceFundApply',
+ component: Layout,
+ redirect: '/work/process/maintenanceFundApply/form',
+ children: [{
+ path: 'form/:processDefinitionId',
+ name: '维修基金申请',
+ meta: {
+ i18n: 'work'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/work/process/maintenanceFundApply/form')
+ }, {
+ path: 'handle/:taskId/:processInstanceId/:businessId',
+ name: '处理维修基金申请',
+ meta: {
+ i18n: 'work'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/work/process/maintenanceFundApply/handle')
+ }, {
+ path: 'detail/:processInstanceId/:businessId',
+ name: '维修基金申请详情',
+ meta: {
+ i18n: 'work'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/work/process/maintenanceFundApply/detail')
+ }]
+}]
\ No newline at end of file
diff --git a/src/views/community/index.vue b/src/views/community/index.vue
new file mode 100644
index 0000000..4219c88
--- /dev/null
+++ b/src/views/community/index.vue
@@ -0,0 +1,369 @@
+<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.community_delete"
+ @click="handleDelete">删 除
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import { getList, remove, update, add, getCommunity } from "@/api/community/index"
+import { mapGetters } from "vuex"
+import website from '@/config/website'
+export default {
+ data () {
+ return {
+ 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: 280,
+ border: true,
+ //stripe:true,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [
+ {
+ label: "社区名称",
+ prop: "name",
+ searchSpan: 5,
+ search: true,
+ span: 12,
+ labelWidth: 120,
+ width: 220,
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入社区名称",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "社区编号",
+ prop: "code",
+ searchSpan: 5,
+ search: true,
+ span: 12,
+ labelWidth: 120,
+ width: 220,
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入社区编号",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "所属街道",
+ prop: "streetCode",
+ search: true,
+ searchSpan: 4,
+ width: 150,
+ labelWidth: 120,
+ type: "tree",
+ dicUrl: "/api/blade-system/region/tree?parentCode=361102",
+ props: {
+ label: "name",
+ value: "id"
+ },
+ rules: [
+ {
+ required: true,
+ message: "请选择所属街道",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "社区民警",
+ prop: "resPoliceUserId",
+ labelWidth: 120,
+ type: "tree",
+ dicUrl: "/api/blade-system/user/getUserListByParam?roleName=民警",
+ props: {
+ label: "name",
+ value: "id"
+ },
+ rules: [
+ {
+ required: true,
+ message: "请选择所属街道",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "社区图片",
+ prop: "picUrl",
+ width: 80,
+ labelWidth: 120,
+ type: "upload",
+ listType: "picture-img",
+ action: "/api/blade-resource/oss/endpoint/put-file",
+ propsHttp: {
+ res: "data",
+ url: "link",
+ },
+ span: 24,
+ },
+
+ {
+ label: "地址",
+ prop: "address",
+ span: 24,
+ labelWidth: 120,
+ rules: [
+ {
+ required: false,
+ message: "请输入地址",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "社区简介",
+ prop: "remark",
+ labelWidth: 120,
+ component: "AvueUeditor",
+ options: {
+ action: "/api/blade-resource/oss/endpoint/put-file",
+ props: {
+ res: "data",
+ url: "link",
+ },
+ },
+ hide: true,
+ minRows: 6,
+ span: 24,
+ },
+
+ ],
+ },
+ data: [],
+ }
+ },
+ watch: {
+ },
+ computed: {
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList () {
+ return {
+ addBtn: this.vaildData(this.permission.community_add, true),
+ viewBtn: this.vaildData(this.permission.community_view, true),
+ delBtn: this.vaildData(this.permission.community_delete, true),
+ editBtn: this.vaildData(this.permission.community_edit, true),
+ }
+ },
+ ids () {
+ let ids = []
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ },
+ },
+ methods: {
+ rowSave (row, done, loading) {
+ if (row.picUrl.length > 0) {
+ var urls = []
+ var split = row.picUrl.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.picUrl = urls.join(",")
+ }
+ row.userid = this.userInfo.user_id
+ add(row).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+ rowUpdate (row, index, done, loading) {
+ if (row.picUrl.length > 0) {
+ var urls = []
+ var split = row.picUrl.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.picUrl = 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)) {
+ getCommunity(this.form.id).then((res) => {
+ this.form = res.data.data
+ if (this.form.picUrl.length > 0) {
+ var urls = []
+ var names = this.form.picUrl.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ this.form.picUrl = urls.join(",")
+ }
+ })
+ }
+ // 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
+ }
+ 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.picUrl) {
+ if (item.picUrl.length > 0) {
+ var urls = []
+ var names = item.picUrl.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ item.picUrl = urls.join(",")
+ }
+ }
+ })
+ this.loading = false
+ this.selectionClear()
+ })
+ }
+ }
+}
+</script>
+
+<style>
+.avue-upload__icon {
+ line-height: 6;
+}
+</style>
diff --git a/src/views/flow/manager.vue b/src/views/flow/manager.vue
index 33b4a7f..8e48430 100644
--- a/src/views/flow/manager.vue
+++ b/src/views/flow/manager.vue
@@ -1,19 +1,9 @@
<template>
<basic-container>
- <avue-crud :option="option"
- :table-loading="loading"
- :data="data"
- ref="crud"
- v-model="form"
- :page.sync="page"
- :permission="permissionList"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad">
+ <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
+ :permission="permissionList" @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>
@@ -21,75 +11,59 @@
</el-radio-group>
</template>
<template slot-scope="scope" slot="menu">
- <el-button type="text"
- size="small"
- icon="el-icon-refresh"
- v-if="permission.flow_manager_state"
- @click.stop="handleState(scope.row,scope.index)">变更状态
+ <el-button type="text" size="small" icon="el-icon-refresh" v-if="permission.flow_manager_state"
+ @click.stop="handleState(scope.row,scope.index)">变更状态
</el-button>
- <el-button type="text"
- size="small"
- icon="el-icon-search"
- v-if="permission.flow_manager_image"
- @click.stop="handleImage(scope.row,scope.index)">流程图
+ <el-button type="text" size="small" icon="el-icon-search" v-if="permission.flow_manager_image"
+ @click.stop="handleImage(scope.row,scope.index)">流程图
</el-button>
- <el-button type="text"
- size="small"
- icon="el-icon-delete"
- v-if="permission.flow_manager_remove"
- @click.stop="handleSlotDelete(scope.row,scope.index)">删除
+ <el-button type="text" size="small" icon="el-icon-delete" v-if="permission.flow_manager_remove"
+ @click.stop="handleSlotDelete(scope.row,scope.index)">删除
</el-button>
</template>
- <template slot-scope="{row}"
- slot="tenantId">
+ <template slot-scope="{row}" slot="tenantId">
<el-tag>{{row.tenantId===''?'通用':row.tenantId}}</el-tag>
</template>
- <template slot-scope="{row}"
- slot="version">
+ <template slot-scope="{row}" slot="version">
<el-tag>v{{row.version}}</el-tag>
</template>
- <template slot-scope="{row}"
- slot="suspensionState">
+ <template slot-scope="{row}" slot="suspensionState">
<el-tag>{{row.suspensionState===1?'激活':'挂起'}}</el-tag>
</template>
- <template slot-scope="{row}"
- slot="category">
+ <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>
- <el-dialog title="流程变更"
- append-to-body
- :visible.sync="stateBox"
- width="20%">
- <el-form :model="form"
- ref="form"
- label-width="80px">
+ <el-dialog title="流程变更" append-to-body :visible.sync="stateBox" width="20%">
+ <el-form :model="form" ref="form" label-width="80px">
<el-form-item label="流程状态">
<el-select v-model="flowState" placeholder="请选择" value="">
- <el-option
- v-for="item in stateOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-form>
- <span slot="footer"
- class="dialog-footer">
+ <span slot="footer" class="dialog-footer">
<el-button @click="stateBox = false">关 闭</el-button>
- <el-button type="primary"
- @click="handleDoState">确 定</el-button>
+ <el-button type="primary" @click="handleDoState">确 定</el-button>
</span>
</el-dialog>
</basic-container>
</template>
<script>
- import {mapGetters} from "vuex";
- import {managerList, changeState, deleteDeployment} from "@/api/flow/flow";
- import {flowCategory} from "@/util/flow";
+ import {
+ mapGetters
+ } from "vuex";
+ import {
+ managerList,
+ changeState,
+ deleteDeployment
+ } from "@/api/flow/flow";
+ import {
+ flowCategory
+ } from "@/util/flow";
export default {
data() {
@@ -132,8 +106,7 @@
dialogWidth: 900,
menuWidth: 250,
dialogClickModal: false,
- column: [
- {
+ column: [{
label: '租户编号',
prop: 'tenantId',
slot: true,
@@ -152,6 +125,7 @@
{
label: '流程名称',
prop: 'name',
+ search: true,
width: 150,
},
{
@@ -166,7 +140,7 @@
dataType: "number",
slot: true,
prop: "category",
- search: true,
+ // search: true,
width: 100,
},
{
@@ -242,10 +216,10 @@
return;
}
this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
.then(() => {
return deleteDeployment(this.deploymentIds);
})
@@ -260,10 +234,10 @@
},
handleSlotDelete(row) {
this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
.then(() => {
return deleteDeployment(row.deploymentId);
})
@@ -288,7 +262,10 @@
});
return;
}
- changeState({processId: this.selectionId, state: this.flowState}).then(res => {
+ changeState({
+ processId: this.selectionId,
+ state: this.flowState
+ }).then(res => {
const data = res.data;
if (data.success) {
this.$message({
@@ -335,4 +312,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/gzll/owners.vue b/src/views/gzll/owners.vue
index 8a83b5f..031d0b3 100644
--- a/src/views/gzll/owners.vue
+++ b/src/views/gzll/owners.vue
@@ -1,192 +1,351 @@
<!-- 走访日志 -->
<template>
- <basic-container>
- <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
- :permission="permissionList" @search-change="searchChange" @search-reset="searchReset"
- @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
- @refresh-change="refreshChange" @on-load="onLoad">
- </avue-crud>
- </basic-container>
+ <basic-container>
+ <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="form"
+ :permission="permissionList" @search-change="searchChange" @row-save="rowSave" @row-update="rowUpdate"
+ @row-del="rowDel" :before-open="beforeOpen" @search-reset="searchReset" @selection-change="selectionChange"
+ @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ <template slot-scope="scope" slot="menu">
+ <el-button type="text" icon="el-icon-circle-plus-outline" size="small" @click="manageMember(scope.row)">业委会成员
+ </el-button>
+ </template>
+ </avue-crud>
+
+ <el-dialog title="业委会成员" append-to-body :visible.sync="memberFlag" width="345px" center>
+
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="roleBox = false">取 消</el-button>
+ <el-button type="primary" @click="submitRole">确 定</el-button>
+ </span>
+ </el-dialog>
+
+ </basic-container>
</template>
<script>
-import { getList } from "@/api/owners_committee"
-import { mapGetters } from "vuex"
-import website from '@/config/website'
+ import {
+ getList,
+ add,
+ update,
+ remove,
+ getDetatil
+ } from "@/api/owners_committee"
+ import {
+ mapGetters
+ } from "vuex"
+ import website from '@/config/website'
+ import func from "@/util/func";
-export default {
- data () {
- return {
- form: {},
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
+ export default {
+ data() {
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ datetime: "",
+ selectionList: [],
+ memberFlag: false,
+ option: {
+ // menu: false,
+ // addBtn: false,
+ border: true,
+ index: false,
+ selection: false,
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 950,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 3,
+ //stripe:true,
+ viewBtn: true,
+ excelBtn: true,
+ dialogClickModal: false,
+ column: [{
+ label: "业委会名称",
+ prop: "name",
+ search: true,
+ searchLabelWidth: 136,
},
- datetime: "",
- selectionList: [],
- option: {
- menu: false,
- addBtn: false,
- border: true,
- index: false,
- selection: false,
- height: "auto",
- calcHeight: 54,
- dialogWidth: 950,
- tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- //stripe:true,
- viewBtn: true,
- excelBtn: true,
- dialogClickModal: false,
- column: [
- {
- label: "业委会名称",
- prop: "name",
- search: true,
- searchLabelWidth: 136,
- },
- {
- label: "小区名称",
- prop: "areaName",
- search: true
- },
- {
- label: "开始时间",
- prop: "startTime",
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- rules: [
- {
- required: true,
- message: "请输入走访时间",
- trigger: "blur",
- },
- ],
- },
- {
- label: "总人数",
- prop: "peopleTotal",
- },
- {
- label: "手机号",
- prop: "mobile",
- },
- {
- label: "地址",
- prop: "location",
- },
- {
- label: "经度",
- prop: "longitude",
- },
- {
- label: "纬度",
- prop: "latitude",
- },
- {
- label: "图片",
- prop: "imageUrl",
- type: "upload",
- labelWidth: 120,
- width: 80,
- listType: "picture-img",
- action: "/api/blade-resource/oss/endpoint/put-file",
- propsHttp: {
- res: "data",
- name: 'name',
- url: "link",
- },
- span: 24,
- },
+ {
+ label: "小区",
+ prop: "areaId",
+ searchSpan: 5,
+ type: 'tree',
+ dicUrl: `/api/blade-district/district/getDistrictTree`,
+ props: {
+ label: "name",
+ value: "id"
+ },
+ defaultExpandedKeys: ["361102003"],
+ span: 12,
+ labelWidth: 120,
+ width: 220,
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请选择小区",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "开始时间",
+ prop: "startTime",
+ type: "date",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ rules: [{
+ required: true,
+ message: "请输入走访时间",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "总人数",
+ prop: "peopleTotal",
+ display: false,
+ }, {
+ label: "负责名称",
+ prop: "principalName",
+ },
+ {
+ label: "负责人手机",
+ prop: "mobile",
+ },
+ {
+ label: "地址",
+ prop: "location",
+ },
+ {
+ label: "经度",
+ prop: "longitude",
+ },
+ {
+ label: "纬度",
+ prop: "latitude",
+ },
+ {
+ label: "图片",
+ prop: "imageUrl",
+ type: "upload",
+ labelWidth: 120,
+ width: 80,
+ listType: "picture-img",
+ action: "/api/blade-resource/oss/endpoint/put-file",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ viewDisplay: false,
+ span: 24,
+ }, {
+ label: "简介",
+ prop: "profile",
+ // labelWidth: 140,
+ viewDisplay: false,
+ type: "textarea"
+ },
- ],
- },
- data: [],
- }
+ ],
+ },
+ data: [],
+ }
},
- watch: {
- },
+ watch: {},
computed: {
- ...mapGetters(["permission", "userInfo"]),
- permissionList () {
- return {
- addBtn: this.vaildData(this.permission.gridWorkLog_add, true),
- viewBtn: this.vaildData(this.permission.gridWorkLog_view, true),
- delBtn: this.vaildData(this.permission.gridWorkLog_delete, true),
- editBtn: this.vaildData(this.permission.gridWorkLog_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.gridWorkLog_add, true),
+ viewBtn: this.vaildData(this.permission.gridWorkLog_view, true),
+ delBtn: this.vaildData(this.permission.gridWorkLog_delete, true),
+ editBtn: this.vaildData(this.permission.gridWorkLog_edit, true),
+ }
+ },
+ 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()
- },
- currentChange (currentPage) {
- this.page.currentPage = currentPage
- },
- sizeChange (pageSize) {
- this.page.pageSize = pageSize
- },
- refreshChange () {
- this.onLoad(this.page, this.query)
- },
- onLoad (page, params = {}) {
- 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
- this.data = data.records.map(item => {
- if (item.imageUrl && item.imageUrl.length > 0) {
- var urls = []
- var names = item.imageUrl.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- item.imageUrl = urls.join(",")
- }
-
- return item
- })
-
- this.loading = false
- this.selectionClear()
- })
+ manageMember(row) {
+ this.memberFlag = true
+ },
+ rowSave(row, done, loading) {
+ row.imageUrl = func.join(row.imageUrl)
+ if (row.imageUrl.length > 0) {
+ var urls = []
+ var split = row.imageUrl.split(",");
+ split.forEach(url => {
+ var names = url.split("jczz/");
+ urls.push(names[1])
+ })
+ row.imageUrl = urls.join(",")
}
+ row.propertyFlag = 1
+ add(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowUpdate(row, index, done, loading) {
+ if (row.imageUrl.length > 0) {
+ var urls = []
+ var split = row.imageUrl.split(",");
+ split.forEach(url => {
+ var names = url.split("jczz/");
+ urls.push(names[1])
+ })
+ row.imageUrl = 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: "操作成功!",
+ });
+ });
+ },
+ // 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)) {
+ getDetatil(this.form.id).then((res) => {
+ this.form = res.data.data;
+ this.form.propertyFlag = 1;
+ if (this.form.constructionSchemeUrls.length > 0) {
+ var urls = []
+ var names = this.form.constructionSchemeUrls.split(",");
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ this.form.constructionSchemeUrls = urls.join(",")
+ }
+ });
+ }
+ // con
+ done();
+ },
+ 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()
+ },
+
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query)
+ },
+ onLoad(page, params = {}) {
+ 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
+ this.data = data.records.map(item => {
+ if (item.imageUrl && item.imageUrl.length > 0) {
+ var urls = []
+ var names = item.imageUrl.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ item.imageUrl = urls.join(",")
+ }
+
+ return item
+ })
+
+ this.loading = false
+ this.selectionClear()
+ })
+ }
},
-}
+ }
</script>
<style>
-.avue-upload__icon {
+ .avue-upload__icon {
line-height: 6;
-}
-</style>
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/property/propertyCapitalApply.vue b/src/views/property/propertyCapitalApply.vue
index d3b76ca..ea54ff3 100644
--- a/src/views/property/propertyCapitalApply.vue
+++ b/src/views/property/propertyCapitalApply.vue
@@ -18,426 +18,457 @@
</template>
<script>
-import { getList, remove, update, add, getPropertyCapitalApply } from "@/api/property/propertyCapitalApply";
-import { mapGetters } from "vuex";
-import website from '@/config/website';
-import func from "@/util/func";
-export default {
- data() {
- return {
- form: {
- // constructionSchemeUrls:[]
- },
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
- datetime: "",
- selectionList: [],
- option: {
- height: "auto",
- calcHeight: 54,
- dialogWidth: 1150,
- tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 350,
- border: true,
- //stripe:true,
- index: true,
- viewBtn: true,
- selection: true,
- dialogClickModal: false,
- column: [
- {
- label: "小区",
- prop: "districtId",
- searchSpan: 5,
- search: true,
- type: 'tree',
- dicUrl: `/api/blade-district/district/getDistrictTree`,
- props: {
- label: "name",
- value: "id"
- },
- defaultExpandedKeys: ["361102003"],
- span: 12,
- labelWidth: 120,
- width: 220,
- overHidden: true,
- rules: [
- {
+ import {
+ getList,
+ remove,
+ update,
+ add,
+ getPropertyCapitalApply
+ } from "@/api/property/propertyCapitalApply";
+ import {
+ mapGetters
+ } from "vuex";
+ import website from '@/config/website';
+ import func from "@/util/func";
+ export default {
+ data() {
+ return {
+ form: {
+ // constructionSchemeUrls:[]
+ },
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ datetime: "",
+ selectionList: [],
+ option: {
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 1150,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 350,
+ border: true,
+ //stripe:true,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [{
+ label: "小区",
+ prop: "districtId",
+ searchSpan: 5,
+ search: true,
+ type: 'tree',
+ dicUrl: `/api/blade-district/district/getDistrictTree`,
+ props: {
+ label: "name",
+ value: "id"
+ },
+ defaultExpandedKeys: ["361102003"],
+ span: 12,
+ labelWidth: 120,
+ width: 220,
+ overHidden: true,
+ rules: [{
required: true,
message: "请选择小区",
trigger: "blur",
- },
- ],
- },
- {
- label: '维修项目名称',
- prop: 'name',
- searchLabelWidth: 120,
- searchSpan: 5,
- search: true,
- span: 12,
- labelWidth: 140,
- rules: [
- {
+ }, ],
+ },
+ {
+ label: '维修项目名称',
+ prop: 'name',
+ searchLabelWidth: 120,
+ searchSpan: 5,
+ search: true,
+ span: 12,
+ labelWidth: 140,
+ rules: [{
required: true,
message: "请输入维修项目名称",
trigger: "blur",
- },
- ],
- },
- {
- label: "预计开工时间",
- prop: "runTime",
- span: 12,
- labelWidth: 140,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [
- {
+ }, ],
+ },
+ {
+ label: "预计开工时间",
+ prop: "runTime",
+ span: 12,
+ labelWidth: 140,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
required: true,
message: "请选择合同开始时间",
trigger: "blur",
- },
- ],
- },
- {
- label: "预计竣工时间",
- prop: "completedTime",
- labelWidth: 140,
- span: 12,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [
- {
+ }, ],
+ },
+ {
+ label: "预计竣工时间",
+ prop: "completedTime",
+ labelWidth: 140,
+ span: 12,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
required: true,
message: "请选择合同结束时间",
trigger: "blur",
- },
- ],
- },
- {
- label: "项目分摊方式",
- prop: "allocationWay",
- labelWidth: 140,
- value:'按建筑面积分摊',
- span: 14,
- row: true,
- },
- {
- label: '联系人',
- prop: 'linkman',
- span: 12,
- labelWidth: 120,
- search: true,
- searchSpan: 4,
- rules: [
- {
+ }, ],
+ },
+ {
+ label: "项目分摊方式",
+ prop: "allocationWay",
+ labelWidth: 140,
+ value: '按建筑面积分摊',
+ span: 14,
+ row: true,
+ },
+ {
+ label: '联系人',
+ prop: 'linkman',
+ span: 12,
+ labelWidth: 120,
+ search: true,
+ searchSpan: 4,
+ rules: [{
required: true,
message: "请输入联系人",
trigger: "blur",
- },
- ],
- },
- {
- label: '联系方式',
- prop: 'linkPhone',
- span: 12,
- labelWidth: 140,
- rules: [
- {
+ }, ],
+ },
+ {
+ label: '联系方式',
+ prop: 'linkPhone',
+ span: 12,
+ labelWidth: 140,
+ rules: [{
required: true,
message: "请输入联系方式",
trigger: "blur",
- },
- ],
- },
- {
- label: "项目预算总金额(元)",
- prop: "budgetAmount",
- span: 12,
- hide: true,
- labelWidth: 140,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "实际预算金额(元)",
- prop: "actualAmount",
- span: 12,
- hide: true,
- labelWidth: 140,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "自筹金额(元)",
- prop: "selfAmount",
- span: 12,
- hide: true,
- labelWidth: 140,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "预算应拨付金额(元)",
- prop: "budgetAppropriateAmount",
- span: 12,
- hide: true,
- labelWidth: 140,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "项目摘要",
- span: 24,
- hide: true,
- prop: "projectDigest",
- placeholder: "例如:“XX小区XX栋XX设施设备维修，总的预算金额是X，是否含有审价，本次维修涉及范围共XX户，总面积的建筑面积为XX平方米”",
- labelWidth: 140,
- type: "textarea"
- },
- {
- label: "项目进度描述",
- span: 24,
- hide: true,
- prop: "projectDescribe",
- labelWidth: 140,
- type: "textarea"
- },
- {
- label: '施工方案附件',
- prop: 'constructionSchemeUrls',
- type: 'upload',
- span: 24,
- hide:true,
- labelWidth: 140,
- multiple: true,
- // showFileList: true,
- propsHttp: {
- res: 'data',
- name: "originalName",
- url: "link"
+ }, ],
},
- action: '/api/blade-resource/oss/endpoint/put-file-attach',
- rules: [
- {
+ {
+ label: '申请时间',
+ prop: 'applyTime',
+ span: 12,
+ labelWidth: 160,
+ display: false,
+ }, {
+ label: '审核进度',
+ prop: 'applyStatus',
+ span: 12,
+ labelWidth: 140,
+ display: false,
+ dicData: [{
+ label: "待审核",
+ value: 0,
+ }, {
+ label: "业委会",
+ value: 1,
+ }, {
+ label: "街道",
+ value: 2,
+ }, {
+ label: "住建局",
+ value: 3,
+ }, {
+ label: "调整申请",
+ value: 4,
+ }, {
+ label: "审核通过",
+ value: 5,
+ }, {
+ label: "审核不通过",
+ value: 6,
+ }]
+ },
+ {
+ label: "项目预算总金额(元)",
+ prop: "budgetAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00'
+ },
+ {
+ label: "实际预算金额(元)",
+ prop: "actualAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00'
+ },
+ {
+ label: "自筹金额(元)",
+ prop: "selfAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00'
+ },
+ {
+ label: "预算应拨付金额(元)",
+ prop: "budgetAppropriateAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00'
+ },
+ {
+ label: "项目摘要",
+ span: 24,
+ hide: true,
+ prop: "projectDigest",
+ placeholder: "例如:“XX小区XX栋XX设施设备维修，总的预算金额是X，是否含有审价，本次维修涉及范围共XX户，总面积的建筑面积为XX平方米”",
+ labelWidth: 140,
+ type: "textarea"
+ },
+ {
+ label: "项目进度描述",
+ span: 24,
+ hide: true,
+ prop: "projectDescribe",
+ labelWidth: 140,
+ type: "textarea"
+ },
+ {
+ label: '施工方案附件',
+ prop: 'constructionSchemeUrls',
+ type: 'upload',
+ span: 24,
+ hide: true,
+ labelWidth: 140,
+ multiple: true,
+ // showFileList: true,
+ propsHttp: {
+ res: 'data',
+ name: "originalName",
+ url: "link"
+ },
+ action: '/api/blade-resource/oss/endpoint/put-file-attach',
+ rules: [{
required: true,
message: "请上传施工方案",
trigger: "blur",
- },
- ],
- }
- ],
- },
- data: [],
- };
- },
- watch: {
- },
- computed: {
- ...mapGetters(["permission", "userInfo"]),
- permissionList() {
- return {
- addBtn: this.vaildData(this.permission.propertyCapitalApply_add, true),
- viewBtn: this.vaildData(this.permission.propertyCapitalApply_view, true),
- delBtn: this.vaildData(this.permission.propertyCapitalApply_delete, true),
- editBtn: this.vaildData(this.permission.propertyCapitalApply_edit, true),
+ }, ],
+ }
+ ],
+ },
+ data: [],
};
},
- ids() {
- let ids = [];
- this.selectionList.forEach((ele) => {
- ids.push(ele.id);
- });
- return ids.join(",");
- },
- },
- methods: {
- rowSave(row, done, loading) {
- row.constructionSchemeUrls = func.join(row.constructionSchemeUrls)
- if (row.constructionSchemeUrls.length > 0) {
- var urls = []
- var split = row.constructionSchemeUrls.split(",");
- split.forEach(url => {
- var names = url.split("jczz/");
- urls.push(names[1])
- })
- row.constructionSchemeUrls = 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) {
- if (row.constructionSchemeUrls.length > 0) {
- var urls = []
- var split = row.constructionSchemeUrls.split(",");
- split.forEach(url => {
- var names = url.split("jczz/");
- urls.push(names[1])
- })
- row.constructionSchemeUrls = 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)) {
- getPropertyCapitalApply(this.form.id).then((res) => {
- this.form = res.data.data;
- if (this.form.constructionSchemeUrls.length > 0) {
- var urls = []
- var names = this.form.constructionSchemeUrls.split(",");
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- this.form.constructionSchemeUrls = urls.join(",")
- }
- });
- }
- // 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,
+ watch: {},
+ computed: {
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.propertyCapitalApply_add, true),
+ viewBtn: this.vaildData(this.permission.propertyCapitalApply_view, true),
+ delBtn: this.vaildData(this.permission.propertyCapitalApply_delete, true),
+ editBtn: this.vaildData(this.permission.propertyCapitalApply_edit, true),
};
- values.dateTime = null;
- }
- 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.constructionSchemeUrls.length > 0) {
- var urls = []
- var names = item.constructionSchemeUrls.split(",");
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- item.constructionSchemeUrls = urls.join(",")
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ methods: {
+ rowSave(row, done, loading) {
+ row.constructionSchemeUrls = func.join(row.constructionSchemeUrls)
+ if (row.constructionSchemeUrls.length > 0) {
+ var urls = []
+ var split = row.constructionSchemeUrls.split(",");
+ split.forEach(url => {
+ var names = url.split("jczz/");
+ urls.push(names[1])
+ })
+ row.constructionSchemeUrls = urls.join(",")
+ }
+ row.propertyFlag = 1
+ add(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
}
- })
- this.loading = false;
- this.selectionClear();
- });
+ );
+ },
+ rowUpdate(row, index, done, loading) {
+ if (row.constructionSchemeUrls.length > 0) {
+ var urls = []
+ var split = row.constructionSchemeUrls.split(",");
+ split.forEach(url => {
+ var names = url.split("jczz/");
+ urls.push(names[1])
+ })
+ row.constructionSchemeUrls = 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)) {
+ getPropertyCapitalApply(this.form.id).then((res) => {
+ this.form = res.data.data;
+ this.form.propertyFlag = 1;
+ if (this.form.constructionSchemeUrls.length > 0) {
+ var urls = []
+ var names = this.form.constructionSchemeUrls.split(",");
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ this.form.constructionSchemeUrls = urls.join(",")
+ }
+ });
+ }
+ // 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;
+ }
+ 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.constructionSchemeUrls.length > 0) {
+ var urls = []
+ var names = item.constructionSchemeUrls.split(",");
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ item.constructionSchemeUrls = urls.join(",")
+ }
+ })
+ this.loading = false;
+ this.selectionClear();
+ });
+ }
}
- }
-};
+ };
</script>
<style>
-.avue-upload__icon {
- line-height: 6;
-}
-</style>
+ .avue-upload__icon {
+ line-height: 6;
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/property/propertyCompanyDistrict.vue b/src/views/property/propertyCompanyDistrict.vue
index 49cb7d9..a1a4354 100644
--- a/src/views/property/propertyCompanyDistrict.vue
+++ b/src/views/property/propertyCompanyDistrict.vue
@@ -133,7 +133,7 @@
value: 'id'
},
hide: true,
- dicUrl: `/api/blade-system/user/list?name={{userId}}`,
+ dicUrl: `/api/blade-propertyCompany/propertyCompany/getUserByPropertyCompany?id={{propertyCompanyId}}`,
},
{
label: "物业阶段",
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index d940caa..4f2c580 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -149,7 +149,7 @@
import { lintOnSave } from "../../../vue.config"
export default {
- data () {
+ data() {
return {
labelData: [],
form: {},
@@ -185,6 +185,7 @@
width: 96,
label: "姓名",
prop: "name",
+ labelWidth: 120,
search: true,
searchSpan: 4,
},
@@ -192,6 +193,7 @@
width: 106,
label: "电话",
prop: "phoneNumber",
+ labelWidth: 120,
search: true,
searchSpan: 4,
slot: true,
@@ -201,6 +203,7 @@
label: "身份证号",
prop: "idCard",
search: true,
+ labelWidth: 120,
searchSpan: 4,
slot: true,
},
@@ -208,6 +211,7 @@
label: "性别",
prop: "gender",
type: "select",
+ labelWidth: 120,
dicData: [{
label: "男",
value: 1
@@ -224,10 +228,24 @@
},
{
label: "关系",
+ prop: "roleType",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleType",
+ labelWidth: 120,
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ label: "与角色关系",
prop: "relationship",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
dataType: "number",
+ labelWidth: 120,
+ hide: true,
props: {
label: "dictValue",
value: "dictKey",
@@ -239,6 +257,7 @@
prop: "aoiName",
search: true,
searchSpan: 4,
+ display: false
},
{
@@ -278,6 +297,147 @@
label: "标签",
prop: "householdLabelList",
display: false
+ },
+ {
+ label: "主要联系人",
+ prop: "isPrimaryContact",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=primaryContactType",
+ dataType: "number",
+ hide: true,
+ labelWidth: 120,
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ label: "居住情况",
+ prop: "residentialStatus",
+ type: "select",
+ hide: true,
+ labelWidth: 120,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentialStatusType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ label: "身份证号",
+ prop: "idCard",
+ labelWidth: 120,
+ hide: true,
+ },
+ {
+ label: "生日",
+ prop: "birthday",
+ type: "date",
+ labelWidth: 120,
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ hide: true,
+ },
+ {
+ label: "港澳台通行证",
+ prop: "hkmtPass",
+ labelWidth: 120,
+ hide: true,
+ },
+ {
+ label: "护照",
+ prop: "passport",
+ labelWidth: 120,
+ hide: true,
+ },
+ {
+ label: "民族",
+ prop: "ethnicity",
+ type: "select",
+ hide: true,
+ labelWidth: 120,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ label: "学历",
+ prop: "education",
+ type: "select",
+ hide: true,
+ labelWidth: 120,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ label: "户籍登记地",
+ prop: "hukouRegistration",
+ labelWidth: 120,
+ hide: true,
+ },
+ {
+ label: "工作状态",
+ prop: "workStatus",
+ type: "select",
+ labelWidth: 120,
+ hide: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=workStatusType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ label: "工作单位",
+ prop: "employer",
+ labelWidth: 120,
+ hide: true,
+ },
+ {
+ label: "婚姻状态",
+ prop: "maritalStatus",
+ type: "select",
+ labelWidth: 120,
+ hide: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=marriageStatusType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ label: "车牌号",
+ prop: "cardNumber",
+ labelWidth: 120,
+ hide: true,
+ },
+ {
+ label: "其他联系方式",
+ prop: "otherContact",
+ labelWidth: 120,
+ hide: true,
+ },
+ {
+ label: "现居住地址",
+ prop: "currentAddress",
+ labelWidth: 120,
+ hide: true,
+ },
+ {
+ label: "残疾证",
+ prop: "disabilityCert",
+ labelWidth: 120,
+ hide: true,
},
]
},
@@ -374,7 +534,7 @@
watch: {},
computed: {
...mapGetters(["userInfo", "permission"]),
- permissionList () {
+ permissionList() {
return {
addBtn: this.vaildData(this.permission.household_add, false),
viewBtn: this.vaildData(this.permission.household_view, true),
@@ -383,7 +543,7 @@
}
},
- textDispose () {
+ textDispose() {
return (row, flag, type) => {
if (row[flag] || row[type] == null) {
return row[type]
@@ -397,15 +557,15 @@
}
},
- labelDispose () {
+ labelDispose() {
return (list) => {
return list.map(item => item.labelName).join(',')
}
}
},
- mounted () { },
+ mounted() { },
methods: {
- onsubmit () {
+ onsubmit() {
if (this.labelForm.color === '#EBEDF0') {
let params = {
householdId: this.currentRow.id,
@@ -442,13 +602,13 @@
}
},
- changLabel (item) {
+ changLabel(item) {
this.editLabelFlge = true
this.currentLabel = item
this.labelForm.color = item.color
this.labelForm.remark = item.remark
},
- manageLabel (item) {
+ manageLabel(item) {
this.currentRow = item
this.loading = true
this.labelFlag = true
@@ -480,7 +640,7 @@
})
})
},
- rowSave (row, done, loading) {
+ rowSave(row, done, loading) {
add(row).then(() => {
this.initFlag = false
this.onLoad(this.page)
@@ -494,7 +654,7 @@
loading()
})
},
- rowUpdate (row, index, done, loading) {
+ rowUpdate(row, index, done, loading) {
update(row).then(() => {
this.initFlag = false
this.onLoad(this.page)
@@ -508,7 +668,7 @@
loading()
})
},
- rowDel (row) {
+ rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -525,25 +685,25 @@
})
})
},
- searchReset () {
+ searchReset() {
this.query = {}
this.treeDeptId = ''
this.onLoad(this.page)
},
- searchChange (params, done) {
+ searchChange(params, done) {
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
done()
},
- selectionChange (list) {
+ selectionChange(list) {
this.selectionList = list
},
- selectionClear () {
+ selectionClear() {
this.selectionList = []
// this.$refs.crud.toggleSelection();
},
- handleDelete () {
+ handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据")
return
@@ -565,16 +725,16 @@
this.$refs.crud.toggleSelection()
})
},
- handleImport () {
+ handleImport() {
this.excelBox = true
},
- uploadAfter (res, done, loading, column) {
+ uploadAfter(res, done, loading, column) {
window.console.log(column)
this.excelBox = false
this.refreshChange()
done()
},
- handleExport () {
+ handleExport() {
this.$confirm("是否导出住户数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -593,12 +753,12 @@
})
})
},
- handleTemplate () {
+ handleTemplate() {
exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
downloadXls(res.data, "住户数据模板.xlsx")
})
},
- beforeOpen (done, type) {
+ beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetatil(this.form.id).then(res => {
this.form = res.data.data
@@ -607,17 +767,17 @@
this.initFlag = true
done()
},
- currentChange (currentPage) {
+ currentChange(currentPage) {
this.page.currentPage = currentPage
},
- sizeChange (pageSize) {
+ sizeChange(pageSize) {
this.page.pageSize = pageSize
},
- refreshChange () {
+ refreshChange() {
this.onLoad(this.page, this.query)
},
- onLoad (page, params = {}) {
+ onLoad(page, params = {}) {
this.loading = true
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = {
@@ -638,7 +798,7 @@
})
},
- showStringDispose (row, type) {
+ showStringDispose(row, type) {
row[type] = !row[type]
}
}
diff --git a/src/views/work/process/maintenanceFundApply/detail.vue b/src/views/work/process/maintenanceFundApply/detail.vue
new file mode 100644
index 0000000..1083a92
--- /dev/null
+++ b/src/views/work/process/maintenanceFundApply/detail.vue
@@ -0,0 +1,325 @@
+<template>
+ <basic-container>
+ <el-form ref="form" :model="form" label-width="80px">
+ <el-row type="flex" class="row-bg" justify="end">
+ <el-form-item>
+ <el-button @click="handleCancel">关闭</el-button>
+ </el-form-item>
+ </el-row>
+ <el-card shadow="hover">
+ <div slot="header">
+ <span>审批信息</span>
+ </div>
+ <avue-form :option="option" :value="form"></avue-form>
+ <!-- <el-form-item label="申请人">
+ <el-input :disabled="true" v-model="form.flow.assigneeName" />
+ </el-form-item>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="开始时间">
+ <el-input :disabled="true" v-model="form.startTime" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="结束时间">
+ <el-input :disabled="true" v-model="form.endTime" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="请假理由">
+ <el-input :disabled="true" type="textarea" v-model="form.reason" />
+ </el-form-item> -->
+ </el-card>
+ <el-card shadow="hover">
+ <div slot="header">
+ <span>流程信息</span>
+ </div>
+ <el-row type="flex" class="row-bg">
+ <el-timeline>
+ <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
+ <el-card shadow="hover">
+ <p>{{flow.assigneeName}} 在 [{{flow.createTime}}] 开始处理 [{{flow.historyActivityName}}] 环节</p>
+ <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
+ <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
+ <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
+ </el-card>
+ </el-timeline-item>
+ </el-timeline>
+ </el-row>
+ </el-card>
+ <el-card shadow="hover">
+ <div slot="header">
+ <span>流程跟踪</span>
+ </div>
+ <el-row class="row-bg">
+ <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
+ </el-row>
+ </el-card>
+ </el-form>
+ </basic-container>
+</template>
+
+<script>
+ import {
+ historyFlowList,
+ leaveDetail
+ } from "@/api/work/process";
+ import {
+ getList,
+ remove,
+ update,
+ add,
+ getPropertyCapitalApply
+ } from "@/api/property/propertyCapitalApply";
+
+ export default {
+ data() {
+ return {
+ businessId: '',
+ processInstanceId: '',
+ src: '',
+ flowList: [],
+ form: {
+ flow: {
+ assigneeName: '',
+ },
+ startTime: '',
+ endTime: '',
+ reason: '',
+ },
+ option: {
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 1150,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 350,
+ border: true,
+ //stripe:true,
+ submitBtn: false,
+ emptyBtn: false,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [{
+ label: "小区",
+ prop: "districtId",
+ searchSpan: 5,
+ search: true,
+ type: 'tree',
+ dicUrl: `/api/blade-district/district/getDistrictTree`,
+ props: {
+ label: "name",
+ value: "id"
+ },
+ defaultExpandedKeys: ["361102003"],
+ span: 12,
+ labelWidth: 120,
+ width: 220,
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请选择小区",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: '维修项目名称',
+ prop: 'name',
+ searchLabelWidth: 120,
+ searchSpan: 5,
+ search: true,
+ span: 12,
+ labelWidth: 140,
+ rules: [{
+ required: true,
+ message: "请输入维修项目名称",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: "预计开工时间",
+ prop: "runTime",
+ span: 12,
+ labelWidth: 140,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
+ required: true,
+ message: "请选择合同开始时间",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: "预计竣工时间",
+ prop: "completedTime",
+ labelWidth: 140,
+ span: 12,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
+ required: true,
+ message: "请选择合同结束时间",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: "项目分摊方式",
+ prop: "allocationWay",
+ labelWidth: 140,
+ value: '按建筑面积分摊',
+ span: 14,
+ row: true,
+ disabled: true
+ },
+ {
+ label: '联系人',
+ prop: 'linkman',
+ span: 12,
+ labelWidth: 120,
+ search: true,
+ searchSpan: 4,
+ rules: [{
+ required: true,
+ message: "请输入联系人",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: '联系方式',
+ prop: 'linkPhone',
+ span: 12,
+ labelWidth: 140,
+ rules: [{
+ required: true,
+ message: "请输入联系方式",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: "项目预算总金额(元)",
+ prop: "budgetAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "实际预算金额(元)",
+ prop: "actualAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "自筹金额(元)",
+ prop: "selfAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "预算应拨付金额(元)",
+ prop: "budgetAppropriateAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "项目摘要",
+ span: 24,
+ hide: true,
+ prop: "projectDigest",
+ placeholder: "例如:“XX小区XX栋XX设施设备维修，总的预算金额是X，是否含有审价，本次维修涉及范围共XX户，总面积的建筑面积为XX平方米”",
+ labelWidth: 140,
+ type: "textarea",
+ disabled: true
+ },
+ {
+ label: "项目进度描述",
+ span: 24,
+ hide: true,
+ prop: "projectDescribe",
+ labelWidth: 140,
+ type: "textarea",
+ disabled: true
+ },
+ // {
+ // label: '施工方案附件',
+ // prop: 'constructionSchemeUrls',
+ // type: 'upload',
+ // span: 24,
+ // hide: true,
+ // labelWidth: 140,
+ // multiple: true,
+ // // showFileList: true,
+ // propsHttp: {
+ // res: 'data',
+ // name: "originalName",
+ // url: "link"
+ // },
+ // action: '/api/blade-resource/oss/endpoint/put-file-attach',
+ // rules: [{
+ // required: true,
+ // message: "请上传施工方案",
+ // trigger: "blur",
+ // }, ],
+ // }
+ ],
+ }
+ }
+ },
+ created() {
+ this.init();
+ },
+ methods: {
+ init() {
+ this.processInstanceId = this.$route.params.processInstanceId;
+ this.businessId = this.$route.params.businessId;
+ historyFlowList(this.processInstanceId).then(res => {
+ const data = res.data;
+ if (data.success) {
+ this.flowList = data.data;
+ }
+ })
+ getPropertyCapitalApply(this.businessId).then(res => {
+ const data = res.data;
+ if (data.success) {
+ this.form = data.data;
+ }
+ })
+ },
+ handleCancel() {
+ this.$router.$avueRouter.closeTag();
+ this.$router.push({
+ path: `/work/start`
+ });
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/work/process/maintenanceFundApply/form.vue b/src/views/work/process/maintenanceFundApply/form.vue
new file mode 100644
index 0000000..2428fd3
--- /dev/null
+++ b/src/views/work/process/maintenanceFundApply/form.vue
@@ -0,0 +1,267 @@
+<template>
+ <div>
+ <basic-container>
+ <avue-form :option="option" v-model="form" @submit="handleSubmit" />
+ </basic-container>
+ <basic-container>
+ <flow-design :is-display="true" :process-definition-id="processDefinitionId"></flow-design>
+ </basic-container>
+ </div>
+</template>
+
+<script>
+ import {
+ leaveProcess
+ } from "@/api/work/process";
+
+ export default {
+ data() {
+ return {
+ processDefinitionId: '',
+ form: {},
+ option: {
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 1150,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 350,
+ border: true,
+ //stripe:true,
+ // submitBtn: false,
+ // emptyBtn: false,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [{
+ label: "小区",
+ prop: "districtId",
+ searchSpan: 5,
+ search: true,
+ type: 'tree',
+ dicUrl: `/api/blade-district/district/getDistrictTree`,
+ props: {
+ label: "name",
+ value: "id"
+ },
+ defaultExpandedKeys: ["361102003"],
+ span: 12,
+ labelWidth: 120,
+ width: 220,
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请选择小区",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: '维修项目名称',
+ prop: 'name',
+ searchLabelWidth: 120,
+ searchSpan: 5,
+ search: true,
+ span: 12,
+ labelWidth: 140,
+ rules: [{
+ required: true,
+ message: "请输入维修项目名称",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "预计开工时间",
+ prop: "runTime",
+ span: 12,
+ labelWidth: 140,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
+ required: true,
+ message: "请选择合同开始时间",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "预计竣工时间",
+ prop: "completedTime",
+ labelWidth: 140,
+ span: 12,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
+ required: true,
+ message: "请选择合同结束时间",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "项目分摊方式",
+ prop: "allocationWay",
+ labelWidth: 140,
+ value: '按建筑面积分摊',
+ span: 14,
+ row: true,
+ },
+ {
+ label: '联系人',
+ prop: 'linkman',
+ span: 12,
+ labelWidth: 120,
+ search: true,
+ searchSpan: 4,
+ rules: [{
+ required: true,
+ message: "请输入联系人",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: '联系方式',
+ prop: 'linkPhone',
+ span: 12,
+ labelWidth: 140,
+ rules: [{
+ required: true,
+ message: "请输入联系方式",
+ trigger: "blur",
+ }, ],
+ },
+ {
+ label: "项目预算总金额(元)",
+ prop: "budgetAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ },
+ {
+ label: "实际预算金额(元)",
+ prop: "actualAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ },
+ {
+ label: "自筹金额(元)",
+ prop: "selfAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ },
+ {
+ label: "预算应拨付金额(元)",
+ prop: "budgetAppropriateAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ },
+ {
+ label: "项目摘要",
+ span: 24,
+ hide: true,
+ prop: "projectDigest",
+ placeholder: "例如:“XX小区XX栋XX设施设备维修，总的预算金额是X，是否含有审价，本次维修涉及范围共XX户，总面积的建筑面积为XX平方米”",
+ labelWidth: 140,
+ type: "textarea",
+ },
+ {
+ label: "项目进度描述",
+ span: 24,
+ hide: true,
+ prop: "projectDescribe",
+ labelWidth: 140,
+ type: "textarea",
+ },
+ {
+ label: '施工方案附件',
+ prop: 'constructionSchemeUrls',
+ type: 'upload',
+ span: 24,
+ hide: true,
+ labelWidth: 140,
+ multiple: true,
+ // showFileList: true,
+ propsHttp: {
+ res: 'data',
+ name: "originalName",
+ url: "link"
+ },
+ action: '/api/blade-resource/oss/endpoint/put-file-attach',
+ rules: [{
+ required: true,
+ message: "请上传施工方案",
+ trigger: "blur",
+ }, ],
+ }
+ ],
+ },
+
+ }
+ },
+ created() {
+ this.processDefinitionId = this.$route.params.processDefinitionId;
+ },
+ methods: {
+ handleSubmit(form, done, loading) {
+ form.constructionSchemeUrls = func.join(form.constructionSchemeUrls)
+ if (form.constructionSchemeUrls.length > 0) {
+ var urls = []
+ var split = form.constructionSchemeUrls.split(",");
+ split.forEach(url => {
+ var names = url.split("jczz/");
+ urls.push(names[1])
+ })
+ form.constructionSchemeUrls = urls.join(",")
+ }
+ add(form).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ handleSubmit() {
+ const params = {
+ processDefinitionId: this.$route.params.processDefinitionId,
+ ...this.form,
+ };
+ leaveProcess(params).then(resp => {
+ const data = resp.data;
+ if (data.success) {
+ this.$message.success(data.msg);
+ this.$router.$avueRouter.closeTag();
+ this.$router.push({
+ path: `/work/start`
+ });
+ } else {
+ this.$message.error(data.msg || '提交失败');
+ }
+ });
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/work/process/maintenanceFundApply/handle.vue b/src/views/work/process/maintenanceFundApply/handle.vue
new file mode 100644
index 0000000..ff20c8c
--- /dev/null
+++ b/src/views/work/process/maintenanceFundApply/handle.vue
@@ -0,0 +1,413 @@
+<template>
+ <basic-container>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-row type="flex" class="row-bg" justify="end">
+ <el-form-item>
+ <el-button type="primary" @click="handleAgree">同意</el-button>
+ <el-button type="danger" @click="handleDisagree">驳回</el-button>
+ <el-button @click="handleCancel">关闭</el-button>
+ </el-form-item>
+ </el-row>
+
+
+
+ <el-card shadow="hover">
+ <div slot="header">
+ <span>审批信息</span>
+ </div>
+ <avue-form :option="option" :value="form"></avue-form>
+ <!-- <el-form-item label="申请人">
+ <el-input :disabled="true" v-model="form.flow.assigneeName" />
+ </el-form-item>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="开始时间">
+ <el-input :disabled="true" v-model="form.startTime" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="结束时间">
+ <el-input :disabled="true" v-model="form.endTime" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="请假理由">
+ <el-input :disabled="true" type="textarea" v-model="form.reason" />
+ </el-form-item>
+ <el-form-item label="批复意见">
+ <el-input type="textarea" v-model="form.comment" />
+ </el-form-item> -->
+ </el-card>
+
+
+ <el-card shadow="hover">
+ <div slot="header">
+ <span>流程信息</span>
+ </div>
+ <el-row type="flex" class="row-bg">
+ <el-timeline>
+ <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
+ <el-card shadow="hover">
+ <p>{{flow.assigneeName}} 在 [{{flow.createTime}}] 开始处理 [{{flow.historyActivityName}}] 环节</p>
+ <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
+ <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
+ <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
+ </el-card>
+ </el-timeline-item>
+ </el-timeline>
+ </el-row>
+ </el-card>
+ <el-card shadow="hover">
+ <div slot="header">
+ <span>流程跟踪</span>
+ </div>
+ <el-row class="row-bg">
+ <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
+ </el-row>
+ </el-card>
+ </el-form>
+ </basic-container>
+</template>
+
+<script>
+ import {
+ historyFlowList,
+ leaveDetail
+ } from "@/api/work/process";
+
+ import {
+ getList,
+ remove,
+ update,
+ add,
+ getPropertyCapitalApply
+ } from "@/api/property/propertyCapitalApply";
+ import {
+ completeTask
+ } from "@/api/work/work";
+
+ export default {
+ data() {
+ return {
+ taskId: '',
+ businessId: '',
+ processInstanceId: '',
+ src: '',
+ flowList: [],
+ form: {
+ flow: {
+ assigneeName: '',
+ },
+ startTime: '',
+ endTime: '',
+ reason: '',
+ comment: '',
+ },
+ option: {
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 1150,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 350,
+ border: true,
+ //stripe:true,
+ submitBtn: false,
+ emptyBtn: false,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [{
+ label: "小区",
+ prop: "districtId",
+ searchSpan: 5,
+ search: true,
+ type: 'tree',
+ dicUrl: `/api/blade-district/district/getDistrictTree`,
+ props: {
+ label: "name",
+ value: "id"
+ },
+ defaultExpandedKeys: ["361102003"],
+ span: 12,
+ labelWidth: 120,
+ width: 220,
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请选择小区",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: '维修项目名称',
+ prop: 'name',
+ searchLabelWidth: 120,
+ searchSpan: 5,
+ search: true,
+ span: 12,
+ labelWidth: 140,
+ rules: [{
+ required: true,
+ message: "请输入维修项目名称",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: "预计开工时间",
+ prop: "runTime",
+ span: 12,
+ labelWidth: 140,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
+ required: true,
+ message: "请选择合同开始时间",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: "预计竣工时间",
+ prop: "completedTime",
+ labelWidth: 140,
+ span: 12,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
+ required: true,
+ message: "请选择合同结束时间",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: "项目分摊方式",
+ prop: "allocationWay",
+ labelWidth: 140,
+ value: '按建筑面积分摊',
+ span: 14,
+ row: true,
+ disabled: true
+ },
+ {
+ label: '联系人',
+ prop: 'linkman',
+ span: 12,
+ labelWidth: 120,
+ search: true,
+ searchSpan: 4,
+ rules: [{
+ required: true,
+ message: "请输入联系人",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: '联系方式',
+ prop: 'linkPhone',
+ span: 12,
+ labelWidth: 140,
+ rules: [{
+ required: true,
+ message: "请输入联系方式",
+ trigger: "blur",
+ }, ],
+ disabled: true
+ },
+ {
+ label: "项目预算总金额(元)",
+ prop: "budgetAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "实际预算金额(元)",
+ prop: "actualAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "自筹金额(元)",
+ prop: "selfAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "预算应拨付金额(元)",
+ prop: "budgetAppropriateAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "项目摘要",
+ span: 24,
+ hide: true,
+ prop: "projectDigest",
+ placeholder: "例如:“XX小区XX栋XX设施设备维修，总的预算金额是X，是否含有审价，本次维修涉及范围共XX户，总面积的建筑面积为XX平方米”",
+ labelWidth: 140,
+ type: "textarea",
+ disabled: true
+ },
+ {
+ label: "项目进度描述",
+ span: 24,
+ hide: true,
+ prop: "projectDescribe",
+ labelWidth: 140,
+ type: "textarea",
+ disabled: true
+ }, {
+ label: "批复意见",
+ span: 24,
+ hide: true,
+ prop: "comment",
+ labelWidth: 140,
+ type: "textarea",
+ rules: [{
+ required: true,
+ message: "请输入批复意见",
+ trigger: "blur",
+ }, ],
+ },
+ // {
+ // label: '施工方案附件',
+ // prop: 'constructionSchemeUrls',
+ // type: 'upload',
+ // span: 24,
+ // hide: true,
+ // labelWidth: 140,
+ // multiple: true,
+ // // showFileList: true,
+ // propsHttp: {
+ // res: 'data',
+ // name: "originalName",
+ // url: "link"
+ // },
+ // action: '/api/blade-resource/oss/endpoint/put-file-attach',
+ // rules: [{
+ // required: true,
+ // message: "请上传施工方案",
+ // trigger: "blur",
+ // }, ],
+ // }
+ ],
+ }
+ }
+ },
+ created() {
+ this.init();
+ },
+ beforeRouteUpdate(to, from, next) {
+ // 在当前路由改变，但是该组件被复用时调用
+ // 举例来说，对于一个带有动态参数的路径 /foo/:id，在 /foo/1 和 /foo/2 之间跳转的时候
+ // 由于会渲染同样的 Foo 组件，因此组件实例会被复用。而这个钩子就会在这个情况下被调用
+ // 可以访问组件实例 `this`
+ if (to.fullPath !== from.fullPath) {
+ next();
+ this.init();
+ }
+ },
+ methods: {
+ init() {
+ this.taskId = this.$route.params.taskId;
+ this.processInstanceId = this.$route.params.processInstanceId;
+ this.businessId = this.$route.params.businessId;
+ historyFlowList(this.processInstanceId).then(res => {
+ const data = res.data;
+ if (data.success) {
+ this.flowList = data.data;
+ }
+ })
+ getPropertyCapitalApply(this.businessId).then(res => {
+ const data = res.data;
+ if (data.success) {
+ this.form = data.data;
+ }
+ })
+ },
+ handleAgree() {
+ this.form.comment = '同意'
+ if (!this.form.comment) {
+ this.$message.warning('请先填写批复意见');
+ return;
+ }
+ const params = {
+ taskId: this.taskId,
+ processInstanceId: this.processInstanceId,
+ flag: 'ok',
+ comment: this.form.comment,
+ };
+ completeTask(params).then(res => {
+ const data = res.data;
+ if (data.success) {
+ this.$message.success(data.msg);
+ this.$router.$avueRouter.closeTag();
+ this.$router.push({
+ path: `/work/todo`
+ });
+ } else {
+ this.$message.error(data.msg || '提交失败');
+ }
+ })
+ },
+ handleDisagree() {
+ this.form.comment = '不同意'
+ if (!this.form.comment) {
+ this.$message.warning('请先填写批复意见');
+ return;
+ }
+ const params = {
+ taskId: this.taskId,
+ processInstanceId: this.processInstanceId,
+ comment: this.form.comment,
+ };
+ completeTask(params).then(res => {
+ const data = res.data;
+ if (data.success) {
+ this.$message.success(data.msg);
+ this.$router.$avueRouter.closeTag();
+ this.$router.push({
+ path: `/work/todo`
+ });
+ } else {
+ this.$message.error(data.msg || '提交失败');
+ }
+ })
+ },
+ handleCancel() {
+ this.$router.$avueRouter.closeTag();
+ this.$router.push({
+ path: `/work/todo`
+ });
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/work/start.vue b/src/views/work/start.vue
index 99b5c04..d53c1fe 100644
--- a/src/views/work/start.vue
+++ b/src/views/work/start.vue
@@ -1,194 +1,203 @@
<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}" 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>
</template>
<script>
-import { mapGetters } from "vuex"
-import { startList } from "@/api/work/work"
-import { flowCategory, flowRoute } from "@/util/flow"
+ import {
+ mapGetters
+ } from "vuex"
+ import {
+ startList
+ } from "@/api/work/work"
+ import {
+ flowCategory,
+ flowRoute
+ } from "@/util/flow"
-export default {
- data () {
- return {
- form: {},
- mode: '1',
- selectionId: '',
- selectionList: [],
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
+ 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,
},
- 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,
- },
- {
- 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,
- },
- {
- 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: "流程分类",
+ 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,
},
- data: []
- }
+ {
+ 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: []
+ }
},
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) {
- 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()
- })
+ 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()
+ })
+ }
}
-}
-</script>
+ }
+</script>
\ No newline at end of file
--
Gitblit v1.9.3