From 5b2b5eb799b6e3c4049f21d1107fbc85405dac57 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 8 Apr 2022 15:30:39 +0800
Subject: [PATCH 1/7] bug

---
 project/xiushan/apps/AppGroupShareholders/components/Add.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/xiushan/apps/AppGroupShareholders/components/Add.vue b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
index 4e9207e5..6ab9de6a 100644
--- a/project/xiushan/apps/AppGroupShareholders/components/Add.vue
+++ b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
@@ -74,7 +74,7 @@
       </template>
       <template slot="content">
 
-        <ai-card title="合同信息">
+        <ai-card title="基本信息">
           <template #right>
               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,form=data">修改</span>
             </template>
@@ -84,6 +84,9 @@
               <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="持证人(户主)" :value="data.name"></ai-info-item>
+              <ai-info-item label="股权总数" :value="data.shareholdingNumber"></ai-info-item>
+              <ai-info-item label="股金总额(元)" :value="data.shareholdingAmount"></ai-info-item>
               <ai-info-item label="权证照片" isLine>
                 <ai-uploader v-model="data.fileList" :instance="instance" :limit="9" disabled/>
               </ai-info-item>

From f557e5222c24de91f6d9343a9e06cb4af2713f8b Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 8 Apr 2022 15:54:26 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=82=A1=E6=9D=83=E6=80=BB=E6=95=B0=20=20?=
 =?UTF-8?q?=E8=82=A1=E9=87=91=E6=80=BB=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiushan/apps/AppGroupShareholders/components/Add.vue    | 6 +++---
 .../xiushan/apps/AppGroupShareholders/components/List.vue   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/xiushan/apps/AppGroupShareholders/components/Add.vue b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
index 6ab9de6a..c7297541 100644
--- a/project/xiushan/apps/AppGroupShareholders/components/Add.vue
+++ b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
@@ -84,9 +84,9 @@
               <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="持证人(户主)" :value="data.name"></ai-info-item>
-              <ai-info-item label="股权总数" :value="data.shareholdingNumber"></ai-info-item>
-              <ai-info-item label="股金总额(元)" :value="data.shareholdingAmount"></ai-info-item>
+              <!-- <ai-info-item label="持证人(户主)" :value="data.name"></ai-info-item> -->
+              <ai-info-item label="股权总数" :value="data.totalEquity"></ai-info-item>
+              <ai-info-item label="股金总额(元)" :value="data.totalAmount"></ai-info-item>
               <ai-info-item label="权证照片" isLine>
                 <ai-uploader v-model="data.fileList" :instance="instance" :limit="9" disabled/>
               </ai-info-item>
diff --git a/project/xiushan/apps/AppGroupShareholders/components/List.vue b/project/xiushan/apps/AppGroupShareholders/components/List.vue
index 5a7b61c9..fb1ffad6 100644
--- a/project/xiushan/apps/AppGroupShareholders/components/List.vue
+++ b/project/xiushan/apps/AppGroupShareholders/components/List.vue
@@ -60,7 +60,7 @@ export default {
         { prop: "stockCertificateCode", label: '股权编号', align: "center", width: "200px", },
         { prop: "shareholdingNumber", label: '股权总数', align: "center", width: "200px", },
         { prop: "shareholdingAmount", label: '股金总额(元)', align: "center", width: "200px", },
-        { prop: "areaId", label: '所在地区', align: "center", width: "200px", },
+        { prop: "areaName", label: '所在地区', align: "center", width: "200px", },
         { slot: "options" ,},
       ]
     }

From 8a31e47e7b6c4a378ada1a43969a4270ee5b09ee Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 8 Apr 2022 15:58:38 +0800
Subject: [PATCH 3/7] bug

---
 project/xiushan/apps/AppGroupShareholders/components/Add.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/AppGroupShareholders/components/Add.vue b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
index c7297541..450d998f 100644
--- a/project/xiushan/apps/AppGroupShareholders/components/Add.vue
+++ b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
@@ -27,7 +27,7 @@
                 </el-col>
               </el-row>
               <el-form-item label="所在地区" prop="areaId">
-                <ai-area-select clearable always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel" :value-level="4"></ai-area-select>
+                <ai-area-select clearable always-show :instance="instance"  @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel" :value-level="4"></ai-area-select>
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="12">
@@ -82,7 +82,7 @@
             <ai-wrapper>
               <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.areaName"></ai-info-item>
               <ai-info-item label="股权证编号" :value="data.stockCertificateCode"></ai-info-item>
               <!-- <ai-info-item label="持证人(户主)" :value="data.name"></ai-info-item> -->
               <ai-info-item label="股权总数" :value="data.totalEquity"></ai-info-item>

From fd2bbcb344351e51e91e65f361c2a0474c1e9d62 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 8 Apr 2022 16:45:03 +0800
Subject: [PATCH 4/7] 28980

---
 project/xiushan/apps/AppHouseManagement/components/Add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/AppHouseManagement/components/Add.vue b/project/xiushan/apps/AppHouseManagement/components/Add.vue
index 9d3da2d2..96a0f5fa 100644
--- a/project/xiushan/apps/AppHouseManagement/components/Add.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/Add.vue
@@ -16,7 +16,7 @@
                 <el-input v-model="form.useCertificate" placeholder="请输入宅基地使用证书号"></el-input>
               </el-form-item>
               <el-form-item label="所在地区" prop="areaId">
-                <ai-area-select clearable always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel" :value-level="4"></ai-area-select>
+                <ai-area-select clearable always-show :instance="instance" @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel" :value-level="4"></ai-area-select>
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="20">

From 7bedfeca11e6815651034d3095e3aa3a8ae4ff4e Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 8 Apr 2022 16:48:09 +0800
Subject: [PATCH 5/7] 28981

---
 project/xiushan/apps/AppGroupShareholders/components/List.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/AppGroupShareholders/components/List.vue b/project/xiushan/apps/AppGroupShareholders/components/List.vue
index fb1ffad6..6e588b8f 100644
--- a/project/xiushan/apps/AppGroupShareholders/components/List.vue
+++ b/project/xiushan/apps/AppGroupShareholders/components/List.vue
@@ -58,8 +58,8 @@ export default {
         { 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: "totalEquity", label: '股权总数', align: "center", width: "200px", },
+        { prop: "totalAmount", label: '股金总额(元)', align: "center", width: "200px", },
         { prop: "areaName", label: '所在地区', align: "center", width: "200px", },
         { slot: "options" ,},
       ]

From 645034f0af475dd264df45a04bd048e6b70680e7 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 8 Apr 2022 17:04:23 +0800
Subject: [PATCH 6/7] 28946

---
 .../xiushan/apps/AppGroupShareholders/components/Add.vue  | 8 +++++---
 .../xiushan/apps/AppHouseManagement/components/Add.vue    | 8 ++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/project/xiushan/apps/AppGroupShareholders/components/Add.vue b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
index 450d998f..b812b4e3 100644
--- a/project/xiushan/apps/AppGroupShareholders/components/Add.vue
+++ b/project/xiushan/apps/AppGroupShareholders/components/Add.vue
@@ -27,7 +27,7 @@
                 </el-col>
               </el-row>
               <el-form-item label="所在地区" prop="areaId">
-                <ai-area-select clearable always-show :instance="instance"  @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel" :value-level="4"></ai-area-select>
+                <ai-area-select clearable always-show :instance="instance"  @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="12">
@@ -84,7 +84,6 @@
               <ai-info-item label="统一社会信用代码" :value="data.unifiedCode"></ai-info-item>
               <ai-info-item label="所在地区" :value="data.areaName"></ai-info-item>
               <ai-info-item label="股权证编号" :value="data.stockCertificateCode"></ai-info-item>
-              <!-- <ai-info-item label="持证人(户主)" :value="data.name"></ai-info-item> -->
               <ai-info-item label="股权总数" :value="data.totalEquity"></ai-info-item>
               <ai-info-item label="股金总额(元)" :value="data.totalAmount"></ai-info-item>
               <ai-info-item label="权证照片" isLine>
@@ -179,7 +178,10 @@ export default {
         organizationName: [{required: true, message: '请输入集体经济组织名称', trigger: 'blur'}],
         unifiedCode: [{required: true, message: '请输入18位统一社会信用代码', trigger: 'blur'},
                       {min: 18, message: '请输入18位统一社会信用代码', trigger: 'blur'}],
-        areaId: [{required: true, message: '所在地区必须选择到村', trigger: 'blur'}],
+        areaId: [
+          {required: true, message: '请选择所在地区', trigger: 'blur'},
+          {pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村'}
+          ],
         stockCertificateCode: [{required: true, message: '请输入股权证编号', trigger: 'blur'}],
         fileList: [{required: true, message: '请上传图片', trigger: 'blur'}],
       }
diff --git a/project/xiushan/apps/AppHouseManagement/components/Add.vue b/project/xiushan/apps/AppHouseManagement/components/Add.vue
index 96a0f5fa..fc2c96f2 100644
--- a/project/xiushan/apps/AppHouseManagement/components/Add.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/Add.vue
@@ -16,7 +16,7 @@
                 <el-input v-model="form.useCertificate" placeholder="请输入宅基地使用证书号"></el-input>
               </el-form-item>
               <el-form-item label="所在地区" prop="areaId">
-                <ai-area-select clearable always-show :instance="instance" @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel" :value-level="4"></ai-area-select>
+                <ai-area-select clearable always-show :instance="instance" @fullname="v=>form.areaName = v" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="20">
@@ -134,7 +134,11 @@ export default {
     rules() {
       return {
         useCertificate: [{required: true, message: '请输入使用证书', trigger: 'blur'}],
-        areaId: [{required: true, message: '所在地区必须选择到村', trigger: 'blur'}],
+        areaId: [
+          // {required: true, message: '所在地区必须选择到村', trigger: 'blur'}
+          {required: true, message: '请选择所在地区', trigger: 'blur'},
+          {pattern: /[^0]0{0,2}$/,message:'所在地区必须选择到村'}
+        ],
         usePerson: [{required: true, message: '请输入使用人', trigger: 'blur'}],
         houseNumber: [{required: true, message: '请输入家庭人口', trigger: 'blur'},
                       {pattern: /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/, message: '请输入正整数',trigger: 'blur'}],

From 8ef80e4f0d6b16fe6a1be4a5f9eabd734b3ac83a Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 8 Apr 2022 17:06:50 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue      | 2 +-
 .../xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
index c57f6c9c..5be11ded 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -282,7 +282,7 @@ export default {
     }
   },
   created() {
-    this.dict.load("auditStatus")
+    this.dict.load("auditStatus", "productRepaymentTimeline", "financialFundPurpose", "enterpriseAuditStatus", "financialLoanApplyStatus","financialOrganizationType")
     this.getDetail()
   }
 }
diff --git a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
index 0a05da67..c357b3fb 100644
--- a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
+++ b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
@@ -233,7 +233,9 @@ export default {
     }
   },
   created() {
-    this.getDetail()
+    this.dict.load("productRepaymentTimeline", "financialFundPurpose","financingDemandApplyType", "enterpriseType", "dishonestPersonSituation", "administrativeSanctionType").then(() => {
+      this.getDetail()
+    })
   }
 }
 </script>