Merge remote-tracking branch 'origin/dev' into dev

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"></ai-area-select>
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="12">
@@ -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>
@@ -82,8 +82,10 @@
             <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.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>
@@ -176,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'}],
       }

project/xiushan/apps/AppGroupShareholders/components/List.vue

@@ -58,9 +58,9 @@ 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: "areaId", 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" ,},
       ]
     }

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"></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'}],

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()
   }
 }

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>