Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

project/xiushan/apps/AppPortalUser/pumList.vue

@@ -5,10 +5,6 @@
                 @change="page.current=1,getTableData()"/>
       <template #content>
         <ai-search-bar>
-          <template #left>
-            <ai-select v-model="search.status" :selectList="dict.getDict('enterpriseStatus')" placeholder="审批状态"
-                       @change="page.current=1,getTableData()"/>
-          </template>
           <template #right>
             <el-input size="small" placeholder="搜索企业名称、法人姓名、登录账号" v-model="search.enterpriseName" clearable
                       @change="page.current=1,getTableData()"/>

project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue

@@ -44,7 +44,7 @@
           <ai-card title="适用范围">
             <template #content>
               <el-form-item label="适用范围" prop="areaId">
-                <ai-area-get :instance="instance" v-model="form.areaId"/>
+                <ai-area-get :instance="instance" v-model="form.areaId" showAll/>
               </el-form-item>
               <el-form-item label="面向对象" prop="faceUser">
                 <el-checkbox-group v-model="form.faceUser">
@@ -95,18 +95,20 @@ export default {
   computed: {
     addTitle() {
       return !!this.$route.query.id ? "编辑金融产品" : "添加金融产品"
-    }
+    },
-  },
+    rules() {
-  data() {
+      return {
-    return {
-      dialog: false,
-      form: {guaranteeMode: [], faceUser: []},
-      rules: {
         productName: [{required: true, message: "请输入产品名称", trigger: 'blur'}],
         loanMin: [{required: true, message: "请输入最低贷款额度", trigger: 'blur'}],
-        loanMax: [{required: true, message: "请输入最高贷款额度", trigger: 'blur'}],
+        loanMax: [
+          {required: true, message: "请输入最高贷款额度", trigger: 'blur'},
+          {validator: (r, v, cb) => v <= this.form.loanMin ? cb("输入的最高贷款需大于最低贷款") : cb()}
+        ],
         interestRateMin: [{required: true, message: "请输入最低参考利率", trigger: 'blur'}],
-        interestRateMax: [{required: true, message: "请输入最高参考利率", trigger: 'blur'}],
+        interestRateMax: [
+          {required: true, message: "请输入最高参考利率", trigger: 'blur'},
+          {validator: (r, v, cb) => v <= this.form.interestRateMin ? cb("输入的最高参考利率需大于最低参考利率") : cb()}
+        ],
         repaymentTimeline: [{required: true, message: "请选择还款期限", trigger: 'blur'}],
         repaymentMethod: [{required: true, message: "请选择还款方式", trigger: 'blur'}],
         guaranteeMode: [{required: true, message: "请选择担保方式", trigger: 'blur'}],
@@ -118,6 +120,12 @@ export default {
       }
     }
   },
+  data() {
+    return {
+      dialog: false,
+      form: {guaranteeMode: [], faceUser: []},
+    }
+  },
   methods: {
     getDetail() {
       let {id} = this.$route.query

project/xiushan/apps/finance/AppFinanceProduct/productDetail.vue

@@ -93,7 +93,8 @@ export default {
       detail: {},
       form: {},
       rules: {
-        status: [{required: true, message: "请选择审批结果"}]
+        status: [{required: true, message: "请选择审批结果"}],
+        remark: [{required: true, message: "请输入审批意见"}],
       }
     }
   },

project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue

@@ -21,7 +21,7 @@
                   </el-row>
                 </el-form-item>
                 <el-form-item label="贷款银行">{{ detail.organizationName }}</el-form-item>
-                <el-form-item label="贷款金额">{{ detail.loanAmount }}</el-form-item>
+                <el-form-item label="贷款金额(万)">{{ detail.loanAmount }}</el-form-item>
                 <el-form-item label="期望使用期限">{{ dict.getLabel('productRepaymentTimeline', detail.hopeLifespan) }}
                 </el-form-item>
                 <el-form-item label="企业主体">
@@ -53,7 +53,7 @@
                 <el-form-item label="贷款经理">{{ detail.auditUserName }}</el-form-item>
                 <el-form-item label="联系方式 ">{{ detail.auditPhone }}</el-form-item>
                 <template v-if="detail.status==1">
-                  <el-form-item label="放款金额">{{ detail.auditAmount }}</el-form-item>
+                  <el-form-item label="放款金额(万)">{{ detail.auditAmount }}</el-form-item>
                   <el-form-item label="放款日期">{{ detail.loanDate }}</el-form-item>
                   <el-form-item label="实际使用期限">{{ dict.getLabel('productRepaymentTimeline', detail.auditLifespan) }}
                   </el-form-item>

project/xiushan/apps/financing/AppGrabLog/grabDetail.vue

@@ -12,7 +12,7 @@
           <ai-card title="融资需求">
             <template #content>
               <el-row type="flex" class="flexWrap">
-                <el-form-item label="意向金额">{{ detail.loanAmount }}</el-form-item>
+                <el-form-item label="意向金额(万)">{{ detail.loanAmount }}</el-form-item>
                 <el-form-item label="期望使用期限">
                   {{ dict.getLabel('productRepaymentTimeline', detail.hopeLifespan) }}
                 </el-form-item>
@@ -37,7 +37,7 @@
                 <el-form-item label="贷款经理">{{ detail.auditUserName }}</el-form-item>
                 <el-form-item label="联系方式">{{ detail.auditPhone }}</el-form-item>
                 <template v-if="detail.status==2">
-                  <el-form-item label="放款金额">{{ detail.auditAmount }}</el-form-item>
+                  <el-form-item label="放款金额(万)">{{ detail.auditAmount }}</el-form-item>
                   <el-form-item label="放款日期">{{ detail.loanDate }}</el-form-item>
                   <el-form-item label="使用期限">
                     {{ dict.getLabel('productRepaymentTimeline', detail.auditLifespan) }}

project/xiushan/apps/financing/AppGrabLog/grabList.vue

@@ -55,7 +55,7 @@ export default {
         {label: "联系方式", prop: "phone"},
         {label: "贷款经理", prop: "auditUserName"},
         {label: "贷款银行", prop: "organizationName"},
-        {label: "放款金额", prop: "auditAmount"},
+        {label: "放款金额(万)", prop: "auditAmount"},
         {label: "状态", prop: "status", dict: "financingDemandStatus"},
         {label: "备注", prop: "remark"},
         {slot: "options"}