From ee695cb13f2306500eaf6799e8a9d2b78408a2a5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 15 May 2024 14:44:28 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jczz_web
---
src/views/property/propertyCapitalApply.vue | 361 ++++++++++++++++++++++++++++++--------------------
1 files changed, 216 insertions(+), 145 deletions(-)
diff --git a/src/views/property/propertyCapitalApply.vue b/src/views/property/propertyCapitalApply.vue
index 3c66426..7001f08 100644
--- a/src/views/property/propertyCapitalApply.vue
+++ b/src/views/property/propertyCapitalApply.vue
@@ -4,7 +4,8 @@
<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">
+ @current-change="currentChange" @size-change="sizeChange" :upload-after="uploadAfter"
+ @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">
@@ -19,8 +20,6 @@
</el-table-column>
</el-table>
</template>
-
-
<template slot-scope="{ row, size, index }" slot="menu">
@@ -77,6 +76,9 @@
<deitDiscussion ref="DeitDiscussion">
</deitDiscussion>
+
+ <userList ref="userList" @selectPersonList="selectPersonList"></userList>
+
</basic-container>
</template>
<script>
@@ -87,6 +89,7 @@
add,
getPropertyCapitalApply
} from "@/api/property/propertyCapitalApply"
+ import userList from "./components/userList.vue";
import {
mapGetters
} from "vuex"
@@ -101,13 +104,14 @@
export default {
components: {
- deitDiscussion
+ deitDiscussion,
+ userList
},
data() {
return {
showDialog: false,
form: {
- // constructionSchemeUrls:[]
+ attachment: []
},
query: {},
loading: true,
@@ -178,7 +182,37 @@
trigger: "blur",
}, ],
},
-
+ {
+ // display: false,
+ label: "户室",
+ prop: "houseNames",
+ tags: true,
+ type: "input",
+ // multiple: true,
+ span: 12,
+ // offset: 8,
+ remote: true,
+ // hide: true,
+ // row: true,
+ rules: [{
+ required: true,
+ message: '请选择户室',
+ trigger: 'blur'
+ }],
+ focus: ({
+ value,
+ column
+ }) => {
+ if (!this.form.districtId) {
+ this.$message({
+ type: "error",
+ message: "请先选择小区后，再选择户室!",
+ })
+ return
+ }
+ this.$refs.userList.show(this.form.districtId)
+ },
+ },
{
label: '维修项目名称',
prop: 'name',
@@ -242,17 +276,14 @@
}, ],
},
{
- label: "楼栋",
- prop: "buildingName",
- value: '',
+ label: "项目分摊方式",
+ prop: "allocationWay",
+ value: '按建筑面积分摊',
span: 12,
- row: true,
- rules: [{
- required: true,
- message: "请输入楼栋",
- trigger: "blur",
- }, ],
+ // row: true,
+
},
+
{
width: 110,
label: '联系人',
@@ -315,42 +346,42 @@
value: 7,
}]
},
- {
- label: "项目预算总金额(元)",
- prop: "budgetAmount",
- span: 12,
- hide: true,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "实际预算金额(元)",
- prop: "actualAmount",
- span: 12,
- hide: true,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "自筹金额(元)",
- prop: "selfAmount",
- span: 12,
- hide: true,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "预算应拨付金额(元)",
- prop: "budgetAppropriateAmount",
- span: 12,
- hide: true,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
+ // {
+ // label: "项目预算总金额(元)",
+ // prop: "budgetAmount",
+ // span: 12,
+ // hide: true,
+ // type: 'number',
+ // precision: 2,
+ // value: '0.00'
+ // },
+ // {
+ // label: "实际预算金额(元)",
+ // prop: "actualAmount",
+ // span: 12,
+ // hide: true,
+ // type: 'number',
+ // precision: 2,
+ // value: '0.00'
+ // },
+ // {
+ // label: "自筹金额(元)",
+ // prop: "selfAmount",
+ // span: 12,
+ // hide: true,
+ // type: 'number',
+ // precision: 2,
+ // value: '0.00'
+ // },
+ // {
+ // label: "预算应拨付金额(元)",
+ // prop: "budgetAppropriateAmount",
+ // span: 12,
+ // hide: true,
+ // type: 'number',
+ // precision: 2,
+ // value: '0.00'
+ // },
{
display: false,
hide: true,
@@ -378,11 +409,8 @@
}, ],
change: (val) => {
console.log("val===>", val)
- // console.log("form===>",this.form)
if (val.value && !this.form.id) {
this.articleRange = val.articleRange;
- // this.showDialog = true;
- // this.getDetail(val.value, val.articleRange)
}
}
@@ -433,13 +461,17 @@
// }]
// },
{
-
label: "维修资金使用申请审批表",
offset: 2,
labelPosition: "top",
prop: "file1",
type: "upload",
+ dataType: 'object',
listType: "text",
+ props: {
+ label: 'name',
+ value: 'url'
+ },
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
res: "data",
@@ -448,19 +480,19 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
{
-
label: "申请使用维修资金的报告、附维修部位彩色照片、业委会(物管会)会议纪要(社区意见)",
offset: 2,
labelPosition: "top",
prop: "file2",
type: "upload",
+ dataType: 'object',
listType: "text",
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
@@ -470,20 +502,20 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
{
-
- label: "公示单，现场勘察图片、公示照片(公示期7天)",
+ label: "公示单,预算,现场勘察图片、公示照片(公示期7天)",
offset: 2,
labelPosition: "top",
prop: "file3",
type: "upload",
listType: "text",
+ dataType: 'object',
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
res: "data",
@@ -492,20 +524,20 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
{
-
label: "维修单位出具的工程款发票(验收合格后以竣工决算审核报告审定金额开具)",
offset: 2,
labelPosition: "top",
prop: "file4",
type: "upload",
listType: "text",
+ dataType: 'object',
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
res: "data",
@@ -514,11 +546,11 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
{
label: "应急维修需提供专业机构出具的检验检测报告或(乡镇人民政府)街道办事处现场核实意见",
@@ -527,6 +559,7 @@
prop: "file5",
type: "upload",
listType: "text",
+ dataType: 'object',
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
res: "data",
@@ -535,20 +568,20 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
{
-
label: "业主签名表或线上表决记录(应急情况不提供)",
offset: 2,
labelPosition: "top",
prop: "file6",
type: "upload",
listType: "text",
+ dataType: 'object',
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
res: "data",
@@ -557,11 +590,11 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
{
label: "政府采购资料",
@@ -570,6 +603,7 @@
prop: "file7",
type: "upload",
listType: "text",
+ dataType: 'object',
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
res: "data",
@@ -578,20 +612,20 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
{
-
label: "维修和更新、改造方案、维修项目的协议或合同",
offset: 2,
labelPosition: "top",
prop: "file8",
type: "upload",
listType: "text",
+ dataType: 'object',
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
res: "data",
@@ -600,20 +634,20 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
{
-
label: "维修改造工程竣工验收单一式两份(维修完工需经申请人签字);维修项目签证单(超出预算清单内容的需出具签证单)",
offset: 2,
labelPosition: "top",
prop: "file9",
type: "upload",
listType: "text",
+ dataType: 'object',
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
res: "data",
@@ -622,20 +656,20 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
{
-
label: "维修项目决算、造价机构出具的决算审价报告",
offset: 2,
labelPosition: "top",
prop: "file10",
type: "upload",
listType: "text",
+ dataType: 'object',
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
res: "data",
@@ -644,20 +678,20 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
{
-
label: "业主委员会情况登记表;经办人或代理人证件(复印件)，复印件上签名、联系电话",
offset: 2,
labelPosition: "top",
prop: "file11",
type: "upload",
listType: "text",
+ dataType: 'object',
action: "/api/blade-resource/oss/endpoint/put-file-attach",
propsHttp: {
res: "data",
@@ -666,16 +700,15 @@
},
span: 24,
hide: true,
- rules: [{
- required: true,
- message: "请上传文件",
- trigger: "blur",
- }],
+ // rules: [{
+ // required: true,
+ // message: "请上传文件",
+ // trigger: "blur",
+ // }],
},
],
},
data: [],
-
optionList: {
header: false,
menu: false,
@@ -773,7 +806,44 @@
},
methods: {
+ uploadAfter(res, done, loading, column) {
+ console.log(res, column)
+ // this.form.attachment = []
+ this.form.attachment.push({
+ fileName: column.label,
+ fileUrl: res.link,
+ name: column.prop,
+ originalName: res.originalName,
+ fileType: this.getFileExtension(res.originalName),
+ })
+ done()
+ // this.$message.success('上传后的方法')
+ },
+ getFileExtension(filename) {
+ var lastDotIndex = filename.lastIndexOf('.');
+ if (lastDotIndex !== -1) {
+ return filename.substring(lastDotIndex + 1);
+ }
+ return '';
+ },
+
+ selectPersonList(personList) {
+ console.log(personList, "++++++++++++")
+ this.personList = personList
+ let houseNameList = personList.map(e => {
+ if (e.houseName) {
+ return e.houseName
+ }
+ })
+ this.form.houseNames = houseNameList.join(",")
+ let addressCodeList = personList.map(e => {
+ if (e.addressCode) {
+ return e.addressCode
+ }
+ })
+ this.form.addressCodes = addressCodeList.join(",")
+ },
rowView() {
this.showDialog = false;
},
@@ -821,34 +891,35 @@
// })
// row.constructionSchemeUrls = urls.join(",")
// }
+ console.log("保存+++++++++" + JSON.stringify(row))
- 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) {
+ // 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(",")
- }
- }
+ // files.push(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];
- }
- }
+ row.attachment = JSON.stringify(row.attachment);
+ // for (let j in row) {
+ // if (keys.indexOf(j) != -1) {
+ // delete row[j];
+ // }
+ // }
console.log("提交===>", row);
row.propertyFlag = 1
add(row).then(
--
Gitblit v1.9.3