From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/property/propertyCapitalApply.vue | 435 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 345 insertions(+), 90 deletions(-)
diff --git a/src/views/property/propertyCapitalApply.vue b/src/views/property/propertyCapitalApply.vue
index 084674f..3c66426 100644
--- a/src/views/property/propertyCapitalApply.vue
+++ b/src/views/property/propertyCapitalApply.vue
@@ -5,32 +5,28 @@
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-scope="{ row, size, index }" slot="voteForm">
+ <div>{{ topicTitle }}</div>
<el-table :data="topictData" v-if="topictData.length">
- <el-table-column width="300" property="optionContent" label="选项"></el-table-column>
- <el-table-column width="300" property="number" label="人数">
-
-
+ <el-table-column width="300" property="optionContent" label="选项"
+ label-class-name="workOrderStyle"></el-table-column>
+ <el-table-column width="300" property="number" label="人数" label-class-name="workOrderStyle">
</el-table-column>
<el-table-column width="300">
-
<template slot-scope="scope">
- <!-- <span style="margin-right: 10px;">{{scope.row.number}}</span> -->
<el-button slot="reference" type="primary" size="mini" @click="openUserPopup(scope.row, 1)">详情</el-button>
</template>
</el-table-column>
-
</el-table>
-
-
-
-
</template>
<template slot-scope="{ row, size, index }" slot="menu">
+
+ <el-button :size="size" type="text" @click="goDetail(row)">查看申请
+ </el-button>
+
<el-button :size="size" type="text" v-if="row.applyStatus === 4" @click="handleWork(row)">调整申请
</el-button>
<!-- <el-button :size="size" type="text" @click="goDetail(row)">查看申请
@@ -52,31 +48,21 @@
v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
</el-button>
</template>
-
-
- <template slot="constructionSchemeUrlsType" slot-scope="{file}">
+ <!-- <template slot="constructionSchemeUrlsType" slot-scope="{file}">
<span>{{ file }}</span>
- </template>
-
-
-
-
+ </template> -->
</avue-crud>
<el-drawer append-to-body :visible.sync="showDialog" width="80%" :modal="false">
-
<span slot="title">{{ topicTitle }}</span>
-
<avue-crud :option="optionList" :data="topictData" ref="crud2">
<!-- <template #icon="scope">
<i :class="scope.row.icon" style="font-size:14px"></i>
</template> -->
-
<template slot-scope="{row}" slot="number">
<span style="margin-right:10px;">1</span>
<el-button slot="reference" type="primary" size="mini" @click="openUserPopup(row, 1)">详情</el-button>
-
<!-- <el-popover placement="right" width="400" trigger="click">
<el-table :data="gridData">
<el-table-column width="150" property="date" label="日期"></el-table-column>
@@ -85,39 +71,14 @@
</el-table>
<el-button slot="reference" type="primary" size="mini">详情</el-button>
</el-popover> -->
-
</template>
-
-
- <!-- <template #menu="{ row, size }">
- <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
- <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
- <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">
- 选择此项人数：{{ row.number }} 详情</el-button>
-
-
- <el-popover placement="right" width="400" trigger="click">
- <el-table :data="gridData">
- <el-table-column width="150" property="date" label="日期"></el-table-column>
- <el-table-column width="100" property="name" label="姓名"></el-table-column>
- <el-table-column width="300" property="address" label="地址"></el-table-column>
- </el-table>
- <el-button slot="reference" type="primary">详情</el-button>
- </el-popover>
-
-
-
- </template> -->
</avue-crud>
</el-drawer>
<deitDiscussion ref="DeitDiscussion">
</deitDiscussion>
-
-
</basic-container>
</template>
-
<script>
import {
getList,
@@ -133,7 +94,6 @@
import func from "@/util/func"
import {
getLists,
- getPage
} from "@/api/discuss/topics"
import deitDiscussion from "./components/deitDiscussion"
@@ -173,7 +133,7 @@
//stripe:true,
index: true,
editBtn: false,
- viewBtn: true,
+ viewBtn: false,
delBtn: false,
selection: true,
dialogClickModal: false,
@@ -282,11 +242,16 @@
}, ],
},
{
- label: "项目分摊方式",
- prop: "allocationWay",
- value: '按建筑面积分摊',
+ label: "楼栋",
+ prop: "buildingName",
+ value: '',
span: 12,
row: true,
+ rules: [{
+ required: true,
+ message: "请输入楼栋",
+ trigger: "blur",
+ }, ],
},
{
width: 110,
@@ -390,7 +355,7 @@
display: false,
hide: true,
parent: false,
- label: "议事标题",
+ label: "投票结果",
prop: "articleId",
search: false,
viewDisabled: false,
@@ -429,7 +394,7 @@
hide: true,
prop: "vote",
formslot: true,
- label: "议事选项"
+ label: "投票详情"
},
{
@@ -447,26 +412,266 @@
prop: "projectDescribe",
type: "textarea"
},
+ // {
+ // label: '施工方案附件',
+ // prop: 'constructionSchemeUrls',
+ // type: 'upload',
+ // span: 24,
+ // hide: true,
+ // multiple: true,
+ // listType: "text",
+ // propsHttp: {
+ // res: 'data',
+ // name: "name",
+ // url: "link"
+ // },
+ // action: '/api/blade-resource/oss/endpoint/put-file-attach',
+ // rules: [{
+ // required: true,
+ // message: "请上传施工方案",
+ // trigger: "blur",
+ // }]
+ // },
{
- label: '施工方案附件',
- prop: 'constructionSchemeUrls',
- type: 'upload',
+
+ label: "维修资金使用申请审批表",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file1",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
span: 24,
hide: true,
- multiple: true,
- // showFileList: true,
- propsHttp: {
- res: 'data',
- name: "originalName",
- url: "link"
- },
- action: '/api/blade-resource/oss/endpoint/put-file-attach',
rules: [{
required: true,
- message: "请上传施工方案",
+ message: "请上传文件",
trigger: "blur",
- }, ],
- }
+ }],
+ },
+ {
+
+ label: "申请使用维修资金的报告、附维修部位彩色照片、业委会(物管会)会议纪要(社区意见)",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file2",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请上传文件",
+ trigger: "blur",
+ }],
+ },
+ {
+
+ label: "公示单，现场勘察图片、公示照片(公示期7天)",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file3",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请上传文件",
+ trigger: "blur",
+ }],
+ },
+ {
+
+ label: "维修单位出具的工程款发票(验收合格后以竣工决算审核报告审定金额开具)",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file4",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请上传文件",
+ trigger: "blur",
+ }],
+ },
+ {
+ label: "应急维修需提供专业机构出具的检验检测报告或(乡镇人民政府)街道办事处现场核实意见",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file5",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请上传文件",
+ trigger: "blur",
+ }],
+ },
+ {
+
+ label: "业主签名表或线上表决记录(应急情况不提供)",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file6",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请上传文件",
+ trigger: "blur",
+ }],
+ },
+ {
+ label: "政府采购资料",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file7",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请上传文件",
+ trigger: "blur",
+ }],
+ },
+ {
+
+ label: "维修和更新、改造方案、维修项目的协议或合同",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file8",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请上传文件",
+ trigger: "blur",
+ }],
+ },
+ {
+
+ label: "维修改造工程竣工验收单一式两份(维修完工需经申请人签字);维修项目签证单(超出预算清单内容的需出具签证单)",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file9",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请上传文件",
+ trigger: "blur",
+ }],
+ },
+ {
+
+ label: "维修项目决算、造价机构出具的决算审价报告",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file10",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请上传文件",
+ trigger: "blur",
+ }],
+ },
+ {
+
+ label: "业主委员会情况登记表;经办人或代理人证件(复印件)，复印件上签名、联系电话",
+ offset: 2,
+ labelPosition: "top",
+ prop: "file11",
+ type: "upload",
+ listType: "text",
+ action: "/api/blade-resource/oss/endpoint/put-file-attach",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请上传文件",
+ trigger: "blur",
+ }],
+ },
],
},
data: [],
@@ -509,7 +714,6 @@
// },
// deep: true,
// immediate: true
-
// }
'form.districtId': {
@@ -569,6 +773,7 @@
},
methods: {
+
rowView() {
this.showDialog = false;
},
@@ -588,17 +793,63 @@
path: `/property/process/maintenanceFundApply/detail/${row.processInstanceId}/${row.id}`
})
},
- 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(",")
+
+ setFile(fileObj) {
+ for (let i in fileObj) {
+ fileObj[i] = func.join(fileObj[i])
+ if (fileObj[i].length > 0) {
+ var urls = []
+ var split = fileObj[i].split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ fileObj[i] = urls.join(",")
+ }
}
+ return fileObj;
+ },
+
+ 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(",")
+ // }
+
+ let keys = ["file1", "file2", "file3", "file4", "file5", "file6", "file7", "file8", "file9", "file10", "file11"]
+ let files = {};
+ for (let i in row) {
+ if (keys.indexOf(i) != -1) {
+
+ files[i] = row[i];
+ }
+ }
+ for (let k in files) {
+ files[k] = func.join(files[k])
+ if (files[k].length) {
+ let urls = [];
+ let split = files[k].split(",");
+ split.forEach(url => {
+ let names = url.split("jczz/");
+ urls.push(names[1]);
+ })
+ files[k] = urls.join(",")
+ }
+ }
+
+ row.attachment = JSON.stringify(files);
+ for (let j in row) {
+ if (keys.indexOf(j) != -1) {
+ delete row[j];
+ }
+ }
+ console.log("提交===>", row);
row.propertyFlag = 1
add(row).then(
() => {
@@ -747,14 +998,14 @@
this.data = data.records
this.data.forEach(item => {
this.$set(item, 'linkPhoneflag', false)
- if (item.constructionSchemeUrls.length > 0) {
- var urls = []
- var names = item.constructionSchemeUrls.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- item.constructionSchemeUrls = urls.join(",")
- }
+ // 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()
@@ -789,4 +1040,8 @@
.avue-upload__icon {
line-height: 6;
}
-</style>
\ No newline at end of file
+
+ .workOrderStyle {
+ font-weight: normal;
+ }
+</style>
--
Gitblit v1.9.3