From fb93f707763d7dfb840272ca884025565aabfbbd Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 7 Apr 2022 18:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=9F=E5=9C=B0=E6=B5=81=E8=BD=AC=20=20?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppGroupShareholders.vue                  |  54 +++++
 .../AppGroupShareholders/components/Add.vue   | 197 ++++++++++++++++++
 .../AppGroupShareholders/components/List.vue  | 113 ++++++++++
 .../AppHouseManagement/components/Add.vue     |  38 ++--
 .../apps/AppLandTransfer/components/Add.vue   |  20 +-
 .../apps/AppLandTransfer/components/List.vue  |  19 +-
 .../apps/creditScore/scorePersonal/spList.vue |   3 +-
 7 files changed, 410 insertions(+), 34 deletions(-)
 create mode 100644 project/xiushan/apps/AppGroupShareholders/AppGroupShareholders.vue
 create mode 100644 project/xiushan/apps/AppGroupShareholders/components/Add.vue
 create mode 100644 project/xiushan/apps/AppGroupShareholders/components/List.vue

diff --git a/project/xiushan/apps/AppGroupShareholders/AppGroupShareholders.vue b/project/xiushan/apps/AppGroupShareholders/AppGroupShareholders.vue
new file mode 100644
index 00000000..5e9e8a0c
--- /dev/null
+++ b/project/xiushan/apps/AppGroupShareholders/AppGroupShareholders.vue
@@ -0,0 +1,54 @@
+<template>
+  <section class="AppGroupShareholders">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" :instance="instance" :params="params" :dict="dict" @change="onChange"/>
+    </keep-alive>
+  </section>
+</template>
+
+<script>
+import List from "./components/List.vue";
+import Add from "./components/Add.vue";
+
+export default {
+  name: "AppGroupShareholders",
+  label: "集体经济股权",
+  props: {
+    instance: Function,
+    dict: Object,
+  },
+  components: {Add, List},
+  data() {
+    return {
+      component: "List",
+      params: {},
+      include: [],
+    }
+  },
+  methods: {
+    onChange(data) {
+      if (data.type === "Add") {
+        this.component = "Add";
+        this.params = data.params;
+      }
+
+      if (data.type === "List") {
+        this.component = "List";
+        this.params = data.params;
+
+        this.$nextTick(() => {
+          if (data.isRefresh) {
+            this.$refs.component.getTableData();
+          }
+        });
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppGroupShareholders {
+  height: 100%;
+}
+</style>
diff --git a/project/xiushan/apps/AppGroupShareholders/components/Add.vue b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
new file mode 100644
index 00000000..f564c335
--- /dev/null
+++ b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
@@ -0,0 +1,197 @@
+<template>
+  <section class="Add">
+    <ai-detail v-if="!id || isEdit==true">
+      <template #title>
+        <ai-title :title="params.id ? '编辑集体经济股权登记' : '新增集体经济股权登记'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)"></ai-title>
+      </template>
+      <template #content>
+        <ai-card title="基本信息">
+          <template #right v-if="params.id">
+            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="isEdit=false">取消</span>
+            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span>
+          </template>
+          <template #content>
+            <el-form ref="form" :model="form" :rules="rules" size="small"  label-width="150px">
+              <el-row type="flex">
+                <el-col :span="20">
+                  <el-form-item label="集体经济组织" prop="usePerson">
+                    <el-input v-model="form.usePerson" placeholder="请输入集体经济组织名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="20">
+                  <el-form-item label="统一信用社会代码" prop="houseNumber">
+                    <el-input v-model="form.houseNumber" placeholder="请输入统一社会信用代码"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-form-item label="所在地区" prop="areaName">
+                <ai-area-select v-model="areaId" provinceAction="/api/area/queryProvinceListContainCity" always-show clearable :instance="$request" :areaLevel="5" @fullname="(name) => (this.formJobWant.employmentAreaName = name)"></ai-area-select>
+              </el-form-item>
+              <el-row type="flex">
+                <el-col :span="20">
+                  <el-form-item label="股权证编号" prop="useCertificate">
+                    <el-input v-model="form.useCertificate" placeholder="请输入股权证编号"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-form-item label="权证照片" prop="fileList">
+                <ai-uploader v-model="form.fileList" :instance="instance" :limit="9" isShowTip/>
+              </el-form-item>
+            </el-form>
+          </template>
+        </ai-card>
+
+        <ai-card title="家庭持股情况">
+          <template #right>
+            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" @click="isEdit=false">+添加股权人</span>
+          </template>
+          <template #content>
+            <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                      @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+              <el-table-column slot="options" label="操作"  align="center">
+                <template slot-scope="{ row }">
+                  <el-button type="text" @click="toAdd(row.id)">详情</el-button>
+                  <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+                </template>
+              </el-table-column>
+            </ai-table>
+          </template>
+        </ai-card>
+      </template>
+      <template slot="footer" class="footer">
+        <el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
+        <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
+      </template>
+    </ai-detail>
+    <ai-detail class="add" v-if="params.id && !isEdit">
+      <template slot="title">
+        <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+      </template>
+      <template slot="content">
+        <ai-card title="合同信息">
+          <template #right>
+              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,forms=data">修改</span>
+            </template>
+          <template #content>
+            <ai-wrapper>
+              <ai-info-item label="使用证书" :value="data.useCertificate"></ai-info-item>
+              <ai-info-item label="所在地区" :value="data.areaName"></ai-info-item>
+              <ai-info-item label="使用人" :value="data.usePerson"></ai-info-item>
+              <ai-info-item label="家庭人口" :value="data.houseNumber"></ai-info-item>
+              <ai-info-item label="身份证号" :value="data.idNumber"></ai-info-item>
+              <ai-info-item label="土地所有权" :value="data.landOwnership">{{ dict.getLabel('landOwnership', data.landOwnership) }}</ai-info-item>
+              <ai-info-item label="土地面积/㎡" :value="data.landArea"></ai-info-item>
+              <ai-info-item label="土地四至" :value="data.landFourTo"></ai-info-item>
+              <ai-info-item label="使用情况" :value="data.useSituation"></ai-info-item>
+              <ai-info-item label="权证照片" :value="data.fileList"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+      </template>
+    </ai-detail>
+  </section>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+export default {
+  name: "Add",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    params: Object,
+  },
+  data() {
+    return { 
+      id: '',
+      form: {
+        useCertificate: '',
+
+      },
+      isEdit: false,
+      radioFrom: '',
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+    }
+  }, 
+  computed: {
+    rules() {
+      return {
+        useCertificate: [{required: true, message: '请输入使用证书', trigger: 'blur'}],
+        areaName: [{required: true, message: '请选择所在地区', trigger: 'blur'}],
+        usePerson: [{required: true, message: '请输入使用人', trigger: 'blur'}],
+        houseNumber: [{required: true, message: '请输入家庭人口', trigger: 'blur'}],
+        idNumber: [{required: true, message: '请输入身份证号', trigger: 'blur'}],
+        landOwnership: [{required: true, message: '请输入土地所有权', trigger: 'blur'}],
+        landArea: [{required: true, message: '请输入土地面积', trigger: 'blur'}],
+        landFourTo: [{required: true, message: '请输入土地四至', trigger: 'blur'}],
+        useSituation: [{required: true, message: '请输入使用情况', trigger: 'blur'}],
+        fileList: [{required: true, message: '请上传图片', trigger: 'blur'}],
+      }
+    },
+    ...mapState(['user'])
+  },
+  created() {
+    if (this.params && this.params.id) {
+      this.id = this.params.id
+      this.getDetail(this.params.id)
+    }
+    this.areaId = this.user.info.areaId
+    this.getTableData()
+  },
+  methods: {
+    cancel(isRefresh) {
+      this.$emit('change', {
+        type: 'List',
+        isRefresh: !!isRefresh,
+      })
+    },
+    getTableData() {
+      this.instance.post("/appcollectiveeconomyequity/list", null, {
+        params: {...this.page }
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records.shareholderList
+          this.page.total = res.data.total
+        }
+      })
+    },
+    getDetail(id) {
+      this.instance.post(`/appcollectiveeconomyequity/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.data = res.data
+        }
+      })
+    },
+    confirm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/appcollectiveeconomyequity/addOrUpdate`, {
+            ...this.forms,
+            id: this.params.id || '',
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('提交成功')
+              setTimeout(() => {
+                this.cancel(true)
+              }, 600)
+            }
+          })
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.Add {
+  height: 100%;
+  background: #f3f4f5;
+
+  ::v-deep .ai-detail .ai-detail__footer {
+    background: #FFF;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/project/xiushan/apps/AppGroupShareholders/components/List.vue b/project/xiushan/apps/AppGroupShareholders/components/List.vue
new file mode 100644
index 00000000..c1610888
--- /dev/null
+++ b/project/xiushan/apps/AppGroupShareholders/components/List.vue
@@ -0,0 +1,113 @@
+<template>
+  <section class="List">
+    <ai-list>
+      <!-- :instance="instance" isShowArea v-model="search.areaId" @change="changeArea" -->
+      <ai-title slot="title" title="集体经济组织股权管理" isShowBottomBorder />
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="组织名称/持证人/身份证号/股权证编号" v-model="search.executionCode" clearable @clear="page.current = 1, search.executionCode = '',getTableData()" 
+            suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/>
+            <!-- 导入导出 -->
+            <ai-import :instance="instance" :dict="dict" importUrl="/appcollectiveeconomyequity/import" url="/appcollectiveeconomyequity/downloadTemplate" name="失信被执行人信息" @success="getTableData(), $message.success('导入成功!')">
+              <el-button size="small">导入</el-button>
+            </ai-import>
+            <ai-download :instance="instance" url="/appcollectiveeconomyequity/export" :params="search" fileName="集体经济组织股权管理信息"
+                         :disabled="tableData.length == 0">
+              <el-button size="small">导出</el-button>
+            </ai-download>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="options" label="操作"  align="center">
+            <template slot-scope="{ row }">
+              <el-button type="text" @click="toAdd(row.id)">详情</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+  </section>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: "List",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  data() {
+    return {
+      search: {executionCode: "",areaId:''},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+      areaId: '',
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    colConfigs() {
+      return [
+        { prop: "organizationName", label: '集体经济组织名称', align: "center", width: "200px", },
+        { prop: "name", label: '持证人(户主)', align: "center", width: "200px", },
+        { prop: "idNumber", label: '身份证号', align: "center", width: "200px", },
+        { prop: "stockCertificateCode", label: '股权编号', align: "center", width: "200px", },
+        { prop: "shareholdingNumber", label: '股权总数', align: "center", width: "200px", },
+        { prop: "shareholdingAmount", label: '股金总额(元)', align: "center", width: "200px", },
+        { prop: "areaName", label: '所在地区', align: "center", width: "200px", },
+        { slot: "options" ,},
+      ]
+    }
+  },
+  created() {
+    this.search.areaId = this.user.info.areaId
+    this.getTableData()
+  },
+  methods: {
+    changeArea() {},
+    getTableData() {
+      this.instance.post("/appcollectiveeconomyequity/list", null, {
+        params: {...this.page, ...this.search,...this.select}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    toAdd(id) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          id: id || ''
+        }
+      })
+    },
+    handleDelete(id) {
+      this.$confirm("是否要删除？").then(() => {
+        this.instance.post(`/appcollectiveeconomyequity/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success("删除成功")
+              this.getTableData()
+            }
+          })
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.List {
+  height: 100%;
+  background: #f3f4f5;
+}
+</style>
\ No newline at end of file
diff --git a/project/xiushan/apps/AppHouseManagement/components/Add.vue b/project/xiushan/apps/AppHouseManagement/components/Add.vue
index b48b7f4f..8db21c56 100644
--- a/project/xiushan/apps/AppHouseManagement/components/Add.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/Add.vue
@@ -12,49 +12,52 @@
           </template>
           <template #content>
             <el-form ref="form" :model="form" :rules="rules" size="small"  label-width="150px">
-              <el-form-item label="使用证书" prop="unifiedCode">
-                <el-input v-model="form.unifiedCode" placeholder="请输入宅基地使用证书号"></el-input>
+              <el-form-item label="使用证书" prop="useCertificate">
+                <el-input v-model="form.useCertificate" placeholder="请输入宅基地使用证书号"></el-input>
               </el-form-item>
-              <el-form-item label="所在地区" prop="unifiedCode">
+              <el-form-item label="所在地区" prop="areaName">
                 <ai-area-select v-model="areaId" provinceAction="/api/area/queryProvinceListContainCity" always-show clearable :instance="$request" :areaLevel="5" @fullname="(name) => (this.formJobWant.employmentAreaName = name)"></ai-area-select>
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="20">
-                  <el-form-item label="使用人" prop="unifiedCode">
-                    <el-input v-model="form.unifiedCode" placeholder="请输入使用人姓名"></el-input>
+                  <el-form-item label="使用人" prop="usePerson">
+                    <el-input v-model="form.usePerson" placeholder="请输入使用人姓名"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="20">
-                  <el-form-item label="家庭人口" prop="unifiedCode">
-                    <el-input v-model="form.unifiedCode" placeholder="请输入使用人家庭人口"></el-input>
+                  <el-form-item label="家庭人口" prop="houseNumber">
+                    <el-input v-model="form.houseNumber" placeholder="请输入使用人家庭人口"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row type="flex">
                 <el-col :span="20">
-                  <el-form-item label="身份证号" prop="unifiedCode">
-                    <el-input v-model="form.unifiedCode" placeholder="请输入使用人身份证号"></el-input>
+                  <el-form-item label="身份证号" prop="idNumber">
+                    <el-input v-model="form.idNumber" placeholder="请输入使用人身份证号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="20">
-                  <el-form-item label="土地所有权" prop="unifiedCode">
-                    <el-input v-model="form.unifiedCode" placeholder="请输入土地所有权人/组织名称"></el-input>
+                  <el-form-item label="土地所有权" prop="landOwnership">
+                    <el-input v-model="form.landOwnership" placeholder="请输入土地所有权人/组织名称"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row type="flex">
                 <el-col :span="12">
-                  <el-form-item label="土地面积/㎡" prop="unifiedCode">
-                    <el-input v-model="form.unifiedCode" placeholder="请输入土地面积"></el-input>
+                  <el-form-item label="土地面积/㎡" prop="landArea">
+                    <el-input v-model="form.landArea" placeholder="请输入土地面积"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-form-item label="土地四至" prop="unifiedCode">
-                <el-input type="textarea" v-model="form.unifiedCode" placeholder="请说明宅基地的地块名称地界四至" maxlength="500" show-word-limit :rows="5" />
+              <el-form-item label="土地四至" prop="landFourTo">
+                <el-input type="textarea" v-model="form.landFourTo" placeholder="请说明宅基地的地块名称地界四至" maxlength="500" show-word-limit :rows="5" />
               </el-form-item>
-              <el-form-item label="使用情况" prop="unifiedCode">
-                <el-input type="textarea" v-model="form.unifiedCode" placeholder="请说明宅基地的使用情况" maxlength="500" show-word-limit :rows="5" />
+              <el-form-item label="使用情况" prop="useSituation">
+                <el-input type="textarea" v-model="form.useSituation" placeholder="请说明宅基地的使用情况" maxlength="500" show-word-limit :rows="5" />
               </el-form-item>
+              <el-form-item label="权证照片" prop="fileList">
+              <ai-uploader v-model="form.fileList" :instance="instance" :limit="9" isShowTip/>
+            </el-form-item>
             </el-form>
           </template>
         </ai-card>
@@ -127,7 +130,6 @@ export default {
         landFourTo: [{required: true, message: '请输入土地四至', trigger: 'blur'}],
         useSituation: [{required: true, message: '请输入使用情况', trigger: 'blur'}],
         fileList: [{required: true, message: '请上传图片', trigger: 'blur'}],
-
       }
     },
     ...mapState(['user'])
diff --git a/project/xiushan/apps/AppLandTransfer/components/Add.vue b/project/xiushan/apps/AppLandTransfer/components/Add.vue
index ce49ba09..01e71b71 100644
--- a/project/xiushan/apps/AppLandTransfer/components/Add.vue
+++ b/project/xiushan/apps/AppLandTransfer/components/Add.vue
@@ -44,14 +44,14 @@
                 </el-col>
                 <el-col :span="20">
                   <el-form-item label="流转形式" prop="circulateType">
-                    <ai-select v-model="form.circulateType" placeholder="请选择" :selectList="$dict.getDict('circulateType')"></ai-select>
+                    <ai-select v-model="form.circulateType" placeholder="请选择" :selectList="$dict.getDict('landCirculateType')"></ai-select>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row type="flex">
                 <el-col :span="20">
                   <el-form-item label="土地面积/㎡" prop="landArea">
-                     <ai-select v-model="form.landArea" placeholder="请选择" :selectList="$dict.getDict('')"></ai-select>
+                    <el-input v-model="form.landArea" placeholder="请输入土地面积" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="20">
@@ -99,15 +99,15 @@
       <template slot="content">
         <ai-card title="基本信息">
           <template #right>
-              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,forms=data">修改</span>
+              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,form=data">修改</span>
             </template>
           <template #content>
             <ai-wrapper>
-              <ai-info-item label="土地流出方" :value="data.landOutflowName"></ai-info-item>
+              <ai-info-item label="土地流出方" :value="data.landOutflowName" ></ai-info-item>
               <ai-info-item label="土地流出方证件号码" :value="data.landOutflowNumber"></ai-info-item>
               <ai-info-item label="土地承接方" :value="data.landUndertakeName"></ai-info-item>
               <ai-info-item label="土地承接方证件号码" :value="data.landUndertakeNumber"></ai-info-item>
-              <ai-info-item label="流转形式">{{ $dict.getLabel('circulateType',data.circulateType) }}</ai-info-item>
+              <ai-info-item label="流转形式">{{ $dict.getLabel('landCirculateType',data.circulateType) }}</ai-info-item>
               <ai-info-item label="土地面积" :value="data.landArea"></ai-info-item>
               <ai-info-item label="每亩年租金" :value="data.yearRent"></ai-info-item>
               <ai-info-item label="开始日期" :value="data.startDate"></ai-info-item>
@@ -148,7 +148,7 @@ export default {
         endDate:'' ,
         landInfo: '',
         landUse: '',
-        fileList: {},
+        fileList: [],
       },
       data: {},
       isEdit: false,
@@ -176,7 +176,7 @@ export default {
 
   },
   created() {
-    this.$dict.load('circulateType')
+    this.$dict.load('landCirculateType')
     if(this.params && this.params.id) {
       this.id = this.params.id
       this.getDetail(this.params.id)
@@ -200,7 +200,7 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.instance.post(`/applandcirculateinfo/addOrUpdate`, {
-            ...this.forms,
+            ...this.form,
             id: this.params.id || '',
           }).then(res => {
             if (res.code == 0) {
@@ -225,5 +225,9 @@ export default {
   ::v-deep .footer {
     background: #FFF !important;
   }
+
+  ::v-deep .ai-info-item label {
+    width: 130px;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/project/xiushan/apps/AppLandTransfer/components/List.vue b/project/xiushan/apps/AppLandTransfer/components/List.vue
index e8435550..fb9834c7 100644
--- a/project/xiushan/apps/AppLandTransfer/components/List.vue
+++ b/project/xiushan/apps/AppLandTransfer/components/List.vue
@@ -6,16 +6,16 @@
         <ai-search-bar>
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
-            <ai-select v-model="readType" @change="onChange" placeholder="流转形式" :selectList="$dict.getDict('readType')"></ai-select>
+            <ai-select v-model="circulateType" @change="onChange" placeholder="流转形式" :selectList="$dict.getDict('landCirculateType')"></ai-select>
           </template>
           <template #right>
             <el-input size="small" placeholder="查询合同编号/流出方/承接方/证件号码" v-model="search.name" clearable @clear="page.current = 1, searchObj.name = '',getTableData()" 
             suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/>
             <!-- 导入导出 -->
-            <ai-import :instance="instance" :dict="dict" importUrl="/appcreditdishonestperson/import" url="/appcreditdishonestperson/downloadTemplate" name="失信被执行人信息" @success="getTableData(), $message.success('导入成功!')">
+            <ai-import :instance="instance" :dict="dict" importUrl="/applandcirculateinfo/import" url="/applandcirculateinfo/downloadTemplate" name="土地流转经营信息" @success="getTableData(), $message.success('导入成功!')">
               <el-button size="small">导入</el-button>
             </ai-import>
-            <ai-download :instance="instance" url="/appcreditdishonestperson/export" :params="search" fileName="土地流转经营信息"
+            <ai-download :instance="instance" url="/applandcirculateinfo/export" :params="search" fileName="土地流转经营信息"
                          :disabled="tableData.length == 0">
               <el-button size="small">导出</el-button>
             </ai-download>
@@ -26,7 +26,7 @@
           <el-table-column slot="options" label="操作"  align="center">
             <template slot-scope="{ row }">
               <el-button type="text" @click="toAdd(row.id)">详情</el-button>
-              <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
+              <!-- <el-button type="text" @click="toAdd(row.id)">编辑</el-button> -->
               <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
             </template>
           </el-table-column>
@@ -48,6 +48,7 @@ export default {
   data() {
     return {
       search: {name: ""},
+      select: {circulateType: ''},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       readType:'',
@@ -59,7 +60,7 @@ export default {
       return [
         { prop: "landOutflowName", label: '土地流出方', align: "center", width: "200px", },
         { prop: "landArea", label: '土地面积/㎡', align: "center", width: "200px", },
-        { prop: "circulateType", label: '流转形式', align: "center", width: "200px", },
+        { prop: "circulateType", label: '流转形式', align: "center", width: "200px", dict: "landCirculateType" },
         { prop: "landUndertakeName", label: '土地承接方', align: "center", width: "200px", },
         { prop: "landUndertakeNumber", label: '承接方证件号码', align: "center", width: "200px", },
         { prop: "contractNo", label: '合同编号', align: "center", width: "200px", },
@@ -70,7 +71,7 @@ export default {
     ...mapState(['user'])
   },
   created() {
-    this.$dict.load('readType')
+    this.$dict.load('landCirculateType')
     this.getTableData()
     this.areaId = this.user.info.areaId
   },
@@ -85,7 +86,11 @@ export default {
         }
       })
     },
-    onChange() {},
+    onChange(v) {
+      this.tableData = []
+      this.select.circulateType = v;
+      this.getTableData()
+    },
     toAdd(id) {
       this.$emit('change', {
         type: 'Add',
diff --git a/project/xiushan/apps/creditScore/scorePersonal/spList.vue b/project/xiushan/apps/creditScore/scorePersonal/spList.vue
index 8eae750c..1ea77a53 100644
--- a/project/xiushan/apps/creditScore/scorePersonal/spList.vue
+++ b/project/xiushan/apps/creditScore/scorePersonal/spList.vue
@@ -32,7 +32,8 @@
           <el-table-column label="操作" slot="options" fixed="right" align="center" width="180">
             <template v-slot="{row}">
               <div class="table-options">
-                <el-button type="text" :disabled="!$permissions('app_appvillagerintegralfamily_detail')" title="详情"
+                <!-- :disabled="!$permissions('app_appvillagerintegralfamily_detail')" -->
+                <el-button type="text"  title="详情"
                            @click="goDetail(row)">详情
                 </el-button>
               </div>