diff --git a/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue b/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue
index 62d1fff2..df168983 100644
--- a/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue
+++ b/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue
@@ -80,19 +80,19 @@
       v-loading="loading"
       :data="contractsList"
       @selection-change="handleSelectionChange"
-      :expand-row-keys="expands"
       :row-key="getRowKeys"
-      lazy
-      :load="load"
-      @expand-change="handleExpandChange"
+      :expand-row-keys="expands"
+      @expand-change="expandChange"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 
       <el-table-column type="expand">
-        <template>
-          <el-table v-loading="loading"
-                    :data="infoList"
-                    @selection-change="handleSelectionChange">
+        <template slot-scope="props">
+          <el-table
+            @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
               label="序号"
@@ -301,10 +301,10 @@ export default {
   props: ["formData"],
   data() {
     return {
+      expands: [],
       getRowKeys(row) {
         return row.id;
       },
-      expands: [], // 存储展开行的 keys
       //支付记录数据
       infoList: [],
       // 遮罩层
@@ -345,6 +345,7 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+
     };
   },
   created() {
@@ -367,7 +368,13 @@ export default {
       }
       this.loading = true;
       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.loading = false;
       });
@@ -496,9 +503,19 @@ export default {
         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) {
         this.expands = []
         if (row) {
@@ -508,17 +525,39 @@ export default {
         this.expands = []
       }
       getRecord(row.id).then((response) => {
-        this.infoList = response.data;
+        if (response.data.size === 0) {
+          this.contractsList.forEach((item, index) => {
+            this.contractsList[index].children = {};
+          })
+        }else {
+          this.contractsList.forEach((item, index) => {
+            if (row.contractNumber === response.data[0].contractNumber) {
+              this.contractsList[index].children = response.data;
+            }
+          });
+        }
+
       })
-      setTimeout(()=>{
-        resolve(this.infoList)
-      },3000)
 
 
-    },
-    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>
diff --git a/jwtech-admin-page/src/views/building/investment/options/sourceFunds.vue b/jwtech-admin-page/src/views/building/investment/options/sourceFunds.vue
index 09151952..27ac8b5c 100644
--- a/jwtech-admin-page/src/views/building/investment/options/sourceFunds.vue
+++ b/jwtech-admin-page/src/views/building/investment/options/sourceFunds.vue
@@ -88,142 +88,142 @@
       />
 
 
-      <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange"
-                :row-key="getRowKeys"
-                :expand-row-keys="expands"
-                @expand-change="handledetail">
-        <el-table-column type="expand">
-          <template slot-scope="props">
-            <el-table v-loading="loading"
-                      :data="infoList"
-                      :row-style="{background:'rgb(48,133,154)',color:'#bbcafb',opacity:1,}"
-                      :header-cell-style="{opacity:1,background:'rgb(48,133,154)',color:'#bbcafb'}"
-                      @selection-change="xthandleSelectionChange">
-              <el-table-column type="selection" width="55" align="center"/>
-              <el-table-column label="标题" align="center" prop="detailsTitle"/>
-              <el-table-column label="排序" align="center" prop="sort"/>
-              <el-table-column label="展示位" align="center" prop="code">
-                <template slot-scope="scope">
-                  <dict-tag :options="dict.type.sys_details_code" :value="scope.row.code"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="类型" align="center" prop="detailsType">
-                <template slot-scope="scope">
-                  <dict-tag :options="dict.type.sys_content_type" :value="scope.row.detailsType"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="是否发布" align="center" prop="xqIsRelease">
-                <template slot-scope="scope">
-                  <el-switch
-                    v-model="scope.row.xqIsRelease"
-                    active-value="1"
-                    inactive-value="0"
-                    @change="xtswitchChange($event,scope.row)"
-                  >
-                  </el-switch>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-view"
-                    @click="xthandleLook(scope.row)"
-                    v-hasPermi="['system:info:query']"
-                  >查看
-                  </el-button>
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-edit"
-                    @click="xthandleUpdate(scope.row)"
-                    v-hasPermi="['system:info:edit']"
-                  >修改
-                  </el-button>
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-delete"
-                    @click="xthandleDelete(scope.row)"
-                    v-hasPermi="['system:info:remove']"
-                  >删除
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-            <pagination
-              v-show="xttotal>0"
-              :total="xttotal"
-              :page.sync="currentOpenRow.pageNum"
-              :limit.sync="currentOpenRow.pageSize"
-              @pagination="getxtList"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column label="名称" align="center" prop="historyName"/>
-        <el-table-column label="排序" align="center" prop="historySort"/>
-        <el-table-column label="标题图片" align="center" prop="filePath">
-          <template slot-scope="scope">
-            <el-image
-              v-if="undefined!=scope.row.filePath && ''!=scope.row.filePath && null!=scope.row.filePath && 'null'!=scope.row.filePath"
-              style="width: 100px; height: 100px;cursor: pointer"
-              :src="returnImgPath(scope.row.filePath)">
-            </el-image>
-            <span v-else>未上传文件</span>
+<!--      <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange"-->
+<!--                :row-key="getRowKeys"-->
+<!--                :expand-row-keys="expands"-->
+<!--                @expand-change="handledetail">-->
+<!--        <el-table-column type="expand">-->
+<!--          <template slot-scope="props">-->
+<!--            <el-table v-loading="loading"-->
+<!--                      :data="infoList"-->
+<!--                      :row-style="{background:'rgb(48,133,154)',color:'#bbcafb',opacity:1,}"-->
+<!--                      :header-cell-style="{opacity:1,background:'rgb(48,133,154)',color:'#bbcafb'}"-->
+<!--                      @selection-change="xthandleSelectionChange">-->
+<!--              <el-table-column type="selection" width="55" align="center"/>-->
+<!--              <el-table-column label="标题" align="center" prop="detailsTitle"/>-->
+<!--              <el-table-column label="排序" align="center" prop="sort"/>-->
+<!--              <el-table-column label="展示位" align="center" prop="code">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <dict-tag :options="dict.type.sys_details_code" :value="scope.row.code"/>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="类型" align="center" prop="detailsType">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <dict-tag :options="dict.type.sys_content_type" :value="scope.row.detailsType"/>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="是否发布" align="center" prop="xqIsRelease">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <el-switch-->
+<!--                    v-model="scope.row.xqIsRelease"-->
+<!--                    active-value="1"-->
+<!--                    inactive-value="0"-->
+<!--                    @change="xtswitchChange($event,scope.row)"-->
+<!--                  >-->
+<!--                  </el-switch>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <el-button-->
+<!--                    size="mini"-->
+<!--                    type="text"-->
+<!--                    icon="el-icon-view"-->
+<!--                    @click="xthandleLook(scope.row)"-->
+<!--                    v-hasPermi="['system:info:query']"-->
+<!--                  >查看-->
+<!--                  </el-button>-->
+<!--                  <el-button-->
+<!--                    size="mini"-->
+<!--                    type="text"-->
+<!--                    icon="el-icon-edit"-->
+<!--                    @click="xthandleUpdate(scope.row)"-->
+<!--                    v-hasPermi="['system:info:edit']"-->
+<!--                  >修改-->
+<!--                  </el-button>-->
+<!--                  <el-button-->
+<!--                    size="mini"-->
+<!--                    type="text"-->
+<!--                    icon="el-icon-delete"-->
+<!--                    @click="xthandleDelete(scope.row)"-->
+<!--                    v-hasPermi="['system:info:remove']"-->
+<!--                  >删除-->
+<!--                  </el-button>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--            </el-table>-->
+<!--            <pagination-->
+<!--              v-show="xttotal>0"-->
+<!--              :total="xttotal"-->
+<!--              :page.sync="currentOpenRow.pageNum"-->
+<!--              :limit.sync="currentOpenRow.pageSize"-->
+<!--              @pagination="getxtList"-->
+<!--            />-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="名称" align="center" prop="historyName"/>-->
+<!--        <el-table-column label="排序" align="center" prop="historySort"/>-->
+<!--        <el-table-column label="标题图片" align="center" prop="filePath">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-image-->
+<!--              v-if="undefined!=scope.row.filePath && ''!=scope.row.filePath && null!=scope.row.filePath && 'null'!=scope.row.filePath"-->
+<!--              style="width: 100px; height: 100px;cursor: pointer"-->
+<!--              :src="returnImgPath(scope.row.filePath)">-->
+<!--            </el-image>-->
+<!--            <span v-else>未上传文件</span>-->
 
-          </template>
-        </el-table-column>
-        <!--      <el-table-column label="创建时间" align="center" prop="historyCreatetime" />-->
-        <!--      <el-table-column label="更新时间" align="center" prop="historyUpdatetime" />-->
-        <el-table-column label="是否发布" align="center" prop="isRelease">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.isRelease"
-              active-value="1"
-              inactive-value="0"
-              @change="switchChange($event,scope.row)"
-            >
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="dshandleLook(scope.row)"
-              v-hasPermi="['system:history:show']"
-            >查看
-            </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:history:edit']"
-            >修改
-            </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:history:remove']"
-            >删除
-            </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-plus"
-              @click="addxt(scope.row)"
-              v-hasPermi="['system:info:add']"
-            >新建详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        &lt;!&ndash;      <el-table-column label="创建时间" align="center" prop="historyCreatetime" />&ndash;&gt;-->
+<!--        &lt;!&ndash;      <el-table-column label="更新时间" align="center" prop="historyUpdatetime" />&ndash;&gt;-->
+<!--        <el-table-column label="是否发布" align="center" prop="isRelease">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-switch-->
+<!--              v-model="scope.row.isRelease"-->
+<!--              active-value="1"-->
+<!--              inactive-value="0"-->
+<!--              @change="switchChange($event,scope.row)"-->
+<!--            >-->
+<!--            </el-switch>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-view"-->
+<!--              @click="dshandleLook(scope.row)"-->
+<!--              v-hasPermi="['system:history:show']"-->
+<!--            >查看-->
+<!--            </el-button>-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-edit"-->
+<!--              @click="handleUpdate(scope.row)"-->
+<!--              v-hasPermi="['system:history:edit']"-->
+<!--            >修改-->
+<!--            </el-button>-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-delete"-->
+<!--              @click="handleDelete(scope.row)"-->
+<!--              v-hasPermi="['system:history:remove']"-->
+<!--            >删除-->
+<!--            </el-button>-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-plus"-->
+<!--              @click="addxt(scope.row)"-->
+<!--              v-hasPermi="['system:info:add']"-->
+<!--            >新建详情-->
+<!--            </el-button>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
       <pagination
         v-show="total>0"
         :total="total"
diff --git a/jwtech-admin/src/main/resources/application-test.yml b/jwtech-admin/src/main/resources/application-test.yml
index 499d7f63..e4667a96 100644
--- a/jwtech-admin/src/main/resources/application-test.yml
+++ b/jwtech-admin/src/main/resources/application-test.yml
@@ -130,8 +130,8 @@ spring:
   # redis 配置
   redis:
     # 地址
-#    host: 127.0.0.1
-    host: 192.168.2.189
+    host: 127.0.0.1
+#    host: 192.168.2.189
 #    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
 #     max-redirects: 3
diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java
index a5cc4e10..abba68fc 100644
--- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java
+++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java
@@ -164,4 +164,8 @@ public class BsSgcJsjdBuiContInfo extends BaseEntity
     @ApiModelProperty("实际支付")
     private BigDecimal actualPayment;
 
+    @Excel(name = "是否有子节点")
+    @ApiModelProperty("是否有子节点")
+    private Boolean hasChildren;
+
 }