Niko
/
shuili_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

投资落实

dev_kxc
zhuyulei 1 year ago
parent
0a3064f1f1
commit
0a5f240696
4 changed files with 199 additions and 156 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue
  2. 270
      jwtech-admin-page/src/views/building/investment/options/sourceFunds.vue
  3. 4
      jwtech-admin/src/main/resources/application-test.yml
  4. 4
      jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java

77
jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue
View File

@ -80,19 +80,19 @@
v-loading="loading" v-loading="loading"
:data="contractsList" :data="contractsList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:expand-row-keys="expands"
:row-key="getRowKeys" :row-key="getRowKeys"
lazy :expand-row-keys="expands"
:load="load" @expand-change="expandChange"
@expand-change="handleExpandChange"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
> >
<el-table-column type="expand"> <el-table-column type="expand">
<template> <template slot-scope="props">
<el-table v-loading="loading" <el-table
:data="infoList" @selection-change="handleSelectionChange"
@selection-change="handleSelectionChange"> :data="props.row.details" v-loading="!props.row.loadDetails"
stripe border
>
<el-table-column type="selection" width="55" align="center" fixed/> <el-table-column type="selection" width="55" align="center" fixed/>
<el-table-column <el-table-column
label="序号" label="序号"
@ -301,10 +301,10 @@ export default {
props: ["formData"], props: ["formData"],
data() { data() {
return { return {
expands: [],
getRowKeys(row) { getRowKeys(row) {
return row.id; return row.id;
}, },
expands: [], // 存储展开行的 keys
//支付记录数据 //支付记录数据
infoList: [], infoList: [],
// 遮罩层 // 遮罩层
@ -345,6 +345,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: {}, rules: {},
}; };
}, },
created() { created() {
@ -367,7 +368,13 @@ export default {
} }
this.loading = true; this.loading = true;
listInfoByCode(this.queryParams).then((response) => { listInfoByCode(this.queryParams).then((response) => {
this.contractsList = response.records; this.contractsList = response.records.map(item => {
return {
...item,
loadDetails: false,
// children: []
}
})
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
@ -496,9 +503,19 @@ export default {
this.$message.warning("请选择要删除的数据！！"); this.$message.warning("请选择要删除的数据！！");
} }
}, },
/*expandChange(row,expandedRows){
this.childListLoading = true;
let query = {parkOrderId: row.parkOrderId}
getRecord(row.id).then((response) => {
this.infoList=response.data
this.infoList.push({}); //触发vue更新视图
this.infoList.pop(); //把最后添加的空对象删除掉
this.childListLoading = false;
handleExpandChange(row, expandedRows) { })
console.log(row)
},*/
/*expandChange(row, expandedRows) {
if (expandedRows.length) { if (expandedRows.length) {
this.expands = [] this.expands = []
if (row) { if (row) {
@ -508,17 +525,39 @@ export default {
this.expands = [] this.expands = []
} }
getRecord(row.id).then((response) => { getRecord(row.id).then((response) => {
this.infoList = response.data; if (response.data.size === 0) {
this.contractsList.forEach((item, index) => {
this.contractsList[index].children = {};
}) })
setTimeout(()=>{ }else {
resolve(this.infoList) this.contractsList.forEach((item, index) => {
},3000) if (row.contractNumber === response.data[0].contractNumber) {
this.contractsList[index].children = response.data;
}
});
}
})
},
load(){
}, }*/
expandChange(row) {
if(!row.loadDetails){
let temp = [];
//根据loadDetails判定是否已经加载了数据
setTimeout(() =>{
getRecord(row.id).then((res)=>{
row.details = res.data;
})
row.loadDetails= true //加载成功之后更新标识
this.$message({
showClose: true,
message: '数据加载成功'
})
},1000)
}
}
}, },
}; };
</script> </script>

270
jwtech-admin-page/src/views/building/investment/options/sourceFunds.vue
View File

@ -88,142 +88,142 @@
/> />
<el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange" <!-- <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange"-->
:row-key="getRowKeys" <!-- :row-key="getRowKeys"-->
:expand-row-keys="expands" <!-- :expand-row-keys="expands"-->
@expand-change="handledetail"> <!-- @expand-change="handledetail">-->
<el-table-column type="expand"> <!-- <el-table-column type="expand">-->
<template slot-scope="props"> <!-- <template slot-scope="props">-->
<el-table v-loading="loading" <!-- <el-table v-loading="loading"-->
:data="infoList" <!-- :data="infoList"-->
:row-style="{background:'rgb(48,133,154)',color:'#bbcafb',opacity:1,}" <!-- :row-style="{background:'rgb(48,133,154)',color:'#bbcafb',opacity:1,}"-->
:header-cell-style="{opacity:1,background:'rgb(48,133,154)',color:'#bbcafb'}" <!-- :header-cell-style="{opacity:1,background:'rgb(48,133,154)',color:'#bbcafb'}"-->
@selection-change="xthandleSelectionChange"> <!-- @selection-change="xthandleSelectionChange">-->
<el-table-column type="selection" width="55" align="center"/> <!-- <el-table-column type="selection" width="55" align="center"/>-->
<el-table-column label="标题" align="center" prop="detailsTitle"/> <!-- <el-table-column label="标题" align="center" prop="detailsTitle"/>-->
<el-table-column label="排序" align="center" prop="sort"/> <!-- <el-table-column label="排序" align="center" prop="sort"/>-->
<el-table-column label="展示位" align="center" prop="code"> <!-- <el-table-column label="展示位" align="center" prop="code">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<dict-tag :options="dict.type.sys_details_code" :value="scope.row.code"/> <!-- <dict-tag :options="dict.type.sys_details_code" :value="scope.row.code"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="类型" align="center" prop="detailsType"> <!-- <el-table-column label="类型" align="center" prop="detailsType">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<dict-tag :options="dict.type.sys_content_type" :value="scope.row.detailsType"/> <!-- <dict-tag :options="dict.type.sys_content_type" :value="scope.row.detailsType"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="是否发布" align="center" prop="xqIsRelease"> <!-- <el-table-column label="是否发布" align="center" prop="xqIsRelease">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-switch <!-- <el-switch-->
v-model="scope.row.xqIsRelease" <!-- v-model="scope.row.xqIsRelease"-->
active-value="1" <!-- active-value="1"-->
inactive-value="0" <!-- inactive-value="0"-->
@change="xtswitchChange($event,scope.row)" <!-- @change="xtswitchChange($event,scope.row)"-->
> <!-- >-->
</el-switch> <!-- </el-switch>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-view" <!-- icon="el-icon-view"-->
@click="xthandleLook(scope.row)" <!-- @click="xthandleLook(scope.row)"-->
v-hasPermi="['system:info:query']" <!-- v-hasPermi="['system:info:query']"-->
>查看 <!-- >查看-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
@click="xthandleUpdate(scope.row)" <!-- @click="xthandleUpdate(scope.row)"-->
v-hasPermi="['system:info:edit']" <!-- v-hasPermi="['system:info:edit']"-->
>修改 <!-- >修改-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="xthandleDelete(scope.row)" <!-- @click="xthandleDelete(scope.row)"-->
v-hasPermi="['system:info:remove']" <!-- v-hasPermi="['system:info:remove']"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> <!-- </el-table>-->
<pagination <!-- <pagination-->
v-show="xttotal>0" <!-- v-show="xttotal>0"-->
:total="xttotal" <!-- :total="xttotal"-->
:page.sync="currentOpenRow.pageNum" <!-- :page.sync="currentOpenRow.pageNum"-->
:limit.sync="currentOpenRow.pageSize" <!-- :limit.sync="currentOpenRow.pageSize"-->
@pagination="getxtList" <!-- @pagination="getxtList"-->
/> <!-- />-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="名称" align="center" prop="historyName"/> <!-- <el-table-column label="名称" align="center" prop="historyName"/>-->
<el-table-column label="排序" align="center" prop="historySort"/> <!-- <el-table-column label="排序" align="center" prop="historySort"/>-->
<el-table-column label="标题图片" align="center" prop="filePath"> <!-- <el-table-column label="标题图片" align="center" prop="filePath">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-image <!-- <el-image-->
v-if="undefined!=scope.row.filePath && ''!=scope.row.filePath && null!=scope.row.filePath && 'null'!=scope.row.filePath" <!-- v-if="undefined!=scope.row.filePath && ''!=scope.row.filePath && null!=scope.row.filePath && 'null'!=scope.row.filePath"-->
style="width: 100px; height: 100px;cursor: pointer" <!-- style="width: 100px; height: 100px;cursor: pointer"-->
:src="returnImgPath(scope.row.filePath)"> <!-- :src="returnImgPath(scope.row.filePath)">-->
</el-image> <!-- </el-image>-->
<span v-else>未上传文件</span> <!-- <span v-else>未上传文件</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<!-- <el-table-column label="创建时间" align="center" prop="historyCreatetime" />--> <!-- &lt;!&ndash; <el-table-column label="创建时间" align="center" prop="historyCreatetime" />&ndash;&gt;-->
<!-- <el-table-column label="更新时间" align="center" prop="historyUpdatetime" />--> <!-- &lt;!&ndash; <el-table-column label="更新时间" align="center" prop="historyUpdatetime" />&ndash;&gt;-->
<el-table-column label="是否发布" align="center" prop="isRelease"> <!-- <el-table-column label="是否发布" align="center" prop="isRelease">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-switch <!-- <el-switch-->
v-model="scope.row.isRelease" <!-- v-model="scope.row.isRelease"-->
active-value="1" <!-- active-value="1"-->
inactive-value="0" <!-- inactive-value="0"-->
@change="switchChange($event,scope.row)" <!-- @change="switchChange($event,scope.row)"-->
> <!-- >-->
</el-switch> <!-- </el-switch>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-view" <!-- icon="el-icon-view"-->
@click="dshandleLook(scope.row)" <!-- @click="dshandleLook(scope.row)"-->
v-hasPermi="['system:history:show']" <!-- v-hasPermi="['system:history:show']"-->
>查看 <!-- >查看-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
@click="handleUpdate(scope.row)" <!-- @click="handleUpdate(scope.row)"-->
v-hasPermi="['system:history:edit']" <!-- v-hasPermi="['system:history:edit']"-->
>修改 <!-- >修改-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['system:history:remove']" <!-- v-hasPermi="['system:history:remove']"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
@click="addxt(scope.row)" <!-- @click="addxt(scope.row)"-->
v-hasPermi="['system:info:add']" <!-- v-hasPermi="['system:info:add']"-->
>新建详情 <!-- >新建详情-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> <!-- </el-table>-->
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"

4
jwtech-admin/src/main/resources/application-test.yml
View File

@ -130,8 +130,8 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
# host: 127.0.0.1 host: 127.0.0.1
host: 192.168.2.189 # host: 192.168.2.189
# cluster: # cluster:
# nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006 # nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006
# max-redirects: 3 # max-redirects: 3

4
jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java
View File

@ -164,4 +164,8 @@ public class BsSgcJsjdBuiContInfo extends BaseEntity
@ApiModelProperty("实际支付") @ApiModelProperty("实际支付")
private BigDecimal actualPayment; private BigDecimal actualPayment;
@Excel(name = "是否有子节点")
@ApiModelProperty("是否有子节点")
private Boolean hasChildren;
} }

Write Preview
Loading…
Cancel
Save