From 3c8104554af2aa13a050cab832a0d704f3a9a062 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 8 Apr 2022 11:30:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E4=BD=93=E7=BB=8F=E6=B5=8E=E8=82=A1?=
 =?UTF-8?q?=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppGroupShareholders/components/Add.vue   | 150 ++++++++++++------
 .../AppGroupShareholders/components/List.vue  |   4 -
 .../AppPublicArrearage/components/Add.vue     |  61 ++++---
 3 files changed, 140 insertions(+), 75 deletions(-)

diff --git a/project/xiushan/apps/AppGroupShareholders/components/Add.vue b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
index 6a168b7f..07daf787 100644
--- a/project/xiushan/apps/AppGroupShareholders/components/Add.vue
+++ b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
@@ -14,13 +14,13 @@
             <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 label="集体经济组织" prop="organizationName">
+                    <el-input v-model="form.organizationName" 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 label="统一社会信用代码" prop="unifiedCode">
+                    <el-input v-model="form.unifiedCode" placeholder="请输入统一社会信用代码"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -29,8 +29,8 @@
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="12">
-                  <el-form-item label="股权证编号" prop="useCertificate">
-                    <el-input v-model="form.useCertificate" placeholder="请输入股权证编号"></el-input>
+                  <el-form-item label="股权证编号" prop="stockCertificateCode">
+                    <el-input v-model="form.stockCertificateCode" placeholder="请输入股权证编号"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -43,11 +43,11 @@
 
         <ai-card title="家庭持股情况">
           <template #right>
-            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" @click="isEdit=false">+添加股权人</span>
+            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" @click="sysInfoDialog = true">+添加股权人</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">
+                      @getList="getDetail" :col-configs="colConfigs" :dict="dict">
             </ai-table>
           </template>
         </ai-card>
@@ -59,7 +59,7 @@
     </ai-detail>
     <ai-detail class="add" v-if="params.id && !isEdit">
       <template slot="title">
-        <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+        <ai-title title="集体经济股权登记详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
       </template>
       <template slot="content">
         <ai-card title="合同信息">
@@ -68,21 +68,49 @@
             </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-info-item label="集体经济组织" :value="data.organizationName"></ai-info-item>
+              <ai-info-item label="统一社会信用代码" :value="data.unifiedCode"></ai-info-item>
+              <ai-info-item label="所在地区" :value="data.areaId"></ai-info-item>
+              <ai-info-item label="股权证编号" :value="data.stockCertificateCode"></ai-info-item>
+              <ai-info-item label="权证照片" isLine>
+                <ai-uploader v-model="data.fileList" :instance="instance" :limit="9" disabled/>
+              </ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
+        <ai-card title="家庭持股情况">
+          <template #right>
+            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" @click="sysInfoDialog = true">+添加股权人</span>
+          </template>
+          <template #content>
+            <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                      @getList="getDetail" :col-configs="colConfigs" :dict="dict">
+            </ai-table>
+          </template>
+        </ai-card>
       </template>
     </ai-detail>
+    <!-- 弹框 -->
+    <ai-dialog title="股权结构" :visible.sync="sysInfoDialog" width="600px" @onConfirm="onConfirm"
+               @closed="sysInfo={}">
+      <el-form size="small" label-width="140px" :rules="dialogRules" ref="dialogForm" :model="table">
+        <el-form-item label="股权人姓名" prop="name">
+          <el-input v-model="table.name" placeholder="请输入股权人姓名" clearable/>
+        </el-form-item>
+        <el-form-item label="身份证号" prop="idNumber">
+          <el-input v-model="table.idNumber" placeholder="请输入身份证号" clearable/>
+        </el-form-item>
+        <el-form-item label="与户主关系" prop="householdRelation">
+          <ai-select v-model="table.householdRelation" placeholder="请选择" :selectList="$dict.getDict('householdRelation')" />
+        </el-form-item>
+        <el-form-item label="持股数量" prop="shareholdingNumber">
+          <el-input v-model="table.shareholdingNumber" placeholder="请输入持股数量" clearable/>
+        </el-form-item>
+        <el-form-item label="持股金额(元)" prop="shareholdingAmount">
+          <el-input v-model="table.shareholdingAmount" placeholder="请输入持股金额" clearable/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
   </section>
 </template>
 
@@ -100,43 +128,43 @@ export default {
     return { 
       id: '',
       form: {
-        useCertificate: '',
+        organizationName: '',
         areaId: '',
         areaName: '',
-        usePerson: '',
-        houseNumber: '',
-        idNumber: '',
-        landOwnership: '',
-        landArea: '',
-        landFourTo: '',
-        useSituation: '',
-        fileList: '',
-
+        unifiedCode: '',
+        stockCertificateCode: '',
+        fileList: [],
       },
+      // tableData: {},
+      table: {},
       isEdit: false,
       radioFrom: '',
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       disabledLevel: 3,
       page: {current: 1, size: 10, total: 0},
-
+      sysInfoDialog: false,
+      data: {},
     }
   }, 
   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'}],
+        organizationName: [{required: true, message: '请输入集体经济组织名称', trigger: 'blur'}],
+        unifiedCode: [{required: true, message: '请输入统一社会信用代码', trigger: 'blur'}],
+        areaId: [{required: true, message: '请选择所在地区', trigger: 'blur'}],
+        stockCertificateCode: [{required: true, message: '请输入股权证编号', trigger: 'blur'}],
         fileList: [{required: true, message: '请上传图片', trigger: 'blur'}],
       }
     },
+    dialogRules() {
+      return {
+        name: [{required: true, message: '请输入股权人姓名', trigger: 'blur'}],
+        idNumber: [{required: true, message: '请输入股权人姓名', trigger: 'blur'}],
+        householdRelation: [{required: true, message: '请选择与户主关系', trigger: 'blur'}],
+        shareholdingNumber: [{required: true, message: '请输入持股数量', trigger: 'blur'}],
+      }
+    },
     ...mapState(['user']),
     colConfigs() {
       return [
@@ -149,12 +177,13 @@ export default {
     }
   },
   created() {
+    this.$dict.load('householdRelation')
     if (this.params && this.params.id) {
       this.id = this.params.id
       this.getDetail(this.params.id)
     }
     this.form.areaId = this.user.info.areaId
-    this.getTableData()
+    // this.getTableData()
   },
   methods: {
     cancel(isRefresh) {
@@ -163,20 +192,40 @@ export default {
         isRefresh: !!isRefresh,
       })
     },
-    getTableData() {
-      this.instance.post("/appcollectiveeconomyequity/list", null, {
-        params: {...this.page }
+    // getTableData() {
+    //   this.instance.post("/appcollectiveeconomyequity/list", null, {
+    //     params: {...this.page }
+    //   }).then(res => {
+    //     if (res?.data) {
+    //       this.data = res.data?.records 
+    //       this.tableData = res.data?.records.shareholderLists
+    //       this.page.total = res.data.total
+    //     }
+    //   })
+    // },
+    getDetail(id) {
+      this.instance.post(`/appcollectiveeconomyequity/queryDetailById`,null, {
+        params: {
+          id: id,
+          ...this.page,
+        }
       }).then(res => {
-        if (res?.data) {
-          this.tableData = res.data?.records.shareholderList
-          this.page.total = res.data.total
+        if (res.code === 0) {
+          this.data = res.data,
+          this.tableData = res.data.shareholderList
+          this.page.total = res.data.shareholderList.length
         }
       })
     },
-    getDetail(id) {
-      this.instance.post(`/appcollectiveeconomyequity/queryDetailById?id=${id}`).then(res => {
-        if (res.code === 0) {
-          this.data = res.data
+    onConfirm() {
+      this.$refs.dialogForm.validate((valid) => {
+        if(valid) {
+          let tableDataList = []
+          tableDataList.push(this.table)
+          this.tableData = tableDataList
+          setTimeout(() => {
+            this.sysInfoDialog = false
+          }, 600)
         }
       })
     },
@@ -186,6 +235,7 @@ export default {
           this.instance.post(`/appcollectiveeconomyequity/addOrUpdate`, {
             ...this.form,
             id: this.params.id || '',
+            shareholderList: this.tableData,
           }).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功')
diff --git a/project/xiushan/apps/AppGroupShareholders/components/List.vue b/project/xiushan/apps/AppGroupShareholders/components/List.vue
index c1610888..89ec9e56 100644
--- a/project/xiushan/apps/AppGroupShareholders/components/List.vue
+++ b/project/xiushan/apps/AppGroupShareholders/components/List.vue
@@ -36,7 +36,6 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
 export default {
   name: "List",
   props: {
@@ -53,7 +52,6 @@ export default {
     }
   },
   computed: {
-    ...mapState(['user']),
     colConfigs() {
       return [
         { prop: "organizationName", label: '集体经济组织名称', align: "center", width: "200px", },
@@ -68,11 +66,9 @@ export default {
     }
   },
   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}
diff --git a/project/xiushan/apps/AppPublicArrearage/components/Add.vue b/project/xiushan/apps/AppPublicArrearage/components/Add.vue
index c8827765..c88ad9b5 100644
--- a/project/xiushan/apps/AppPublicArrearage/components/Add.vue
+++ b/project/xiushan/apps/AppPublicArrearage/components/Add.vue
@@ -14,44 +14,63 @@
             <el-form ref="forms" :model="forms" :rules="formRules" size="small"  label-width="150px">
             <el-row type="flex">
               <el-col :span="20">
-                <el-form-item label="执行案号" prop="executionCode">
+                <el-form-item label="欠费金额(万元)" prop="executionCode">
                   <el-input v-model="forms.executionCode" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item label="执行法院" prop="executionCourt">
-                  <el-input v-model="forms.executionCourt" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="执行时间" prop="executionTime">
-                  <el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:338px">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="履行情况" prop="executionSituation">
+                <el-form-item label="欠费类型名称" prop="executionCourt">
                   <ai-select v-model="forms.executionSituation" placeholder="请选择文档类型" :selectList="$dict.getDict('dishonestPersonSituation')"></ai-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row type="flex">
               <el-col :span="20">
-                <el-form-item label="失信被执行主体" prop="enterpriseName">
+                <el-form-item label="欠费主体" prop="executionTime">
+                  <el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:338px">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item label="失信严重程度" prop="executionSituation">
+                  <ai-select v-model="forms.executionSituation" placeholder="请选择文档类型" :selectList="$dict.getDict('dishonestPersonSituation')"></ai-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row type="flex">
+              <el-col :span="20">
+                <el-form-item label="统一信用代码" prop="enterpriseName">
                   <el-input v-model="forms.enterpriseName" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item label="统一信用代码" prop="unifiedCode">
-                  <el-input v-model="forms.unifiedCode" placeholder="请输入" maxlength="18"></el-input>
+                <el-form-item label="认定日期" prop="unifiedCode">
+                  <el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:338px">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row type="flex">
+              <el-col :span="20">
+                <el-form-item label="失信行为有效期" prop="enterpriseName">
+                  <el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:338px">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item label="欠费统计截止日期" prop="unifiedCode">
+                  <el-date-picker v-model="forms.executionTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width:338px">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+           <el-row type="flex">
+              <el-col :span="12">
+                <el-form-item label="数据来源机构" prop="enterpriseName">
+                  <el-input v-model="forms.enterpriseName" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-form-item label="失信事实" prop="dishonestFact">
-              <el-input v-model="forms.dishonestFact" placeholder="请输入失信事实" type="textarea" show-word-limit maxlength="500" :rows="5"></el-input>
-            </el-form-item>
             </el-form>
           </template>
         </ai-card>