From e39c38b1a3f14ecd24799907485587995f524c15 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 14 Sep 2023 15:30:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=B6=E5=AE=83=E8=9E=8D?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherfinancialpolicymanagementAdd.vue     | 56 ++++++++++++-------
 .../otherfinancialpolicymanagementInfo.vue    |  2 +-
 .../jinrongzhengceFlow/relation/otherInfo.vue | 33 ++++++++---
 3 files changed, 61 insertions(+), 30 deletions(-)

diff --git a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue
index af3d6c6eab..ab3e86d716 100644
--- a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue
+++ b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue
@@ -11,7 +11,7 @@
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-left: 0px">
           <el-col :span="24" style="border-right: 0px">
-            <div class="span-sty" style="border-right: 0px">其他融名称:</div>
+            <div class="span-sty" style="border-right: 0px">其它融名称:</div>
             <el-form-item><span class="addinputInfo">
               {{ formobj.bankShortName }} {{ formobj.productTypeValue }} {{ formobj.period !=='' ? formobj.period + '期' : '' }} {{ formobj.maxLoanRatio !== '' ? formobj.maxLoanRatio + '%' : '' }}
             </span></el-form-item>
@@ -19,8 +19,8 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <div class="span-sty">资方简称</div>
-            <el-form-item>
+            <div class="span-sty"><span class="icon">*</span>资方简称</div>
+            <el-form-item prop="bankSid">
               <el-select class="addinputInfo" v-model="formobj.bankSid" @change="bankShortChange" placeholder="请选择" clearable filterable>
                 <el-option v-for="item in bankShort_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
               </el-select>
@@ -37,23 +37,23 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <div class="span-sty">业务类型</div>
-            <el-form-item>
+            <div class="span-sty"><span class="icon">*</span>业务类型</div>
+            <el-form-item prop="busTypeKey">
               <el-select class="addinputInfo" v-model="formobj.busTypeKey" placeholder="请选择" @change="busTypeChange" clearable filterable>
                 <el-option v-for="item in busType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <div class="span-sty">车辆大类</div>
-            <el-form-item>
+            <div class="span-sty"><span class="icon">*</span>车辆大类</div>
+            <el-form-item prop="vehCategoryKey">
               <el-select class="addinputInfo" v-model="formobj.vehCategoryKey" placeholder="请选择" @change="vehCategoryChange" clearable filterable>
                 <el-option v-for="item in vehCategory_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <div class="span-sty">车辆功能</div>
+            <div class="span-sty"><span class="icon">*</span>车辆功能</div>
             <el-form-item>
               <el-select class="addinputInfo" v-model="formobj.vehTypeKeyList" placeholder="请选择" clearable filterable multiple>
                 <el-option v-for="item in vehicleFunction_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
@@ -63,44 +63,44 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <div class="span-sty">产品类别</div>
-            <el-form-item>
+            <div class="span-sty"><span class="icon">*</span>产品类别</div>
+            <el-form-item prop="productTypeKey">
               <el-select class="addinputInfo" v-model="formobj.productTypeKey" @change="productTypeChange" placeholder="请选择" clearable filterable>
                 <el-option v-for="item in productType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <div class="span-sty">最高融资比例(%)</div>
-            <el-form-item>
+            <div class="span-sty"><span class="icon">*</span>最高融资比例(%)</div>
+            <el-form-item prop="maxLoanRatio">
               <el-input v-model="formobj.maxLoanRatio" @keyup.native="UpNumber" class="addinputInfo" clearable placeholder=""/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <div class="span-sty">最高融资额(元)</div>
-            <el-form-item>
+            <div class="span-sty"><span class="icon">*</span>最高融资额(元)</div>
+            <el-form-item prop="maxLoanAmount">
               <el-input v-model="formobj.maxLoanAmount" @keyup.native="UpNumber" class="addinputInfo" clearable placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <div class="span-sty">期数</div>
-            <el-form-item>
+            <div class="span-sty"><span class="icon">*</span>期数</div>
+            <el-form-item prop="periodKey">
               <el-select class="addinputInfo" v-model="formobj.periodKey" @change="periodQTRChange" placeholder="请选择" clearable filterable>
                 <el-option v-for="item in period_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <div class="span-sty">年利率(%)</div>
-            <el-form-item>
+            <div class="span-sty"><span class="icon">*</span>年利率(%)</div>
+            <el-form-item prop="yearRatio">
               <el-input v-model="formobj.yearRatio" @keyup.native="UpNumber" class="addinputInfo" clearable placeholder=""/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <div class="span-sty">有效期至</div>
-            <el-form-item>
+            <div class="span-sty"><span class="icon">*</span>有效期至</div>
+            <el-form-item prop="validDateTo">
               <el-date-picker class="addinputInfo" value-format="yyyy-MM-dd" format="yyyy-MM-dd" v-model="formobj.validDateTo" type="date" placeholder="选择日期"></el-date-picker>
             </el-form-item>
           </el-col>
@@ -161,7 +161,17 @@ export default {
         useOrgSid: '',
         useOrgName: ''
       },
-      rules: {}
+      rules: {
+        bankSid: [{ required: true, message: '资方简称不能为空', trigger: 'change' }],
+        busTypeKey: [{ required: true, message: '业务类型不能为空', trigger: 'change' }],
+        vehCategoryKey: [{ required: true, message: '车辆大类不能为空', trigger: 'change' }],
+        productTypeKey: [{ required: true, message: '产品类别不能为空', trigger: 'change' }],
+        maxLoanRatio: [{ required: true, message: '最高融资比例不能为空', trigger: 'blur' }],
+        maxLoanAmount: [{ required: true, message: '最高融资额不能为空', trigger: 'blur' }],
+        periodKey: [{ required: true, message: '期数不能为空', trigger: 'change' }],
+        yearRatio: [{ required: true, message: '标准年利率不能为空', trigger: 'blur' }],
+        validDateTo: [{ required: true, message: '有效期不能为空', trigger: 'change' }]
+      }
     }
   },
   methods: {
@@ -327,6 +337,7 @@ export default {
             this.formobj.vehTypeValueList = aa
           } else {
             this.formobj.vehTypeValueList = []
+            this.$message({ showClose: true, type: 'error', message: '车辆功能不能为空' })
           }
           this.submitdisabled = true
           // 保存
@@ -392,4 +403,7 @@ export default {
   margin-left: 110px !important;
   width: calc(100% - 120px);
 }
+/deep/ .el-form-item__error {
+  margin-left: 110px !important;
+}
 </style>
diff --git a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementInfo.vue b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementInfo.vue
index 0b8a0b0170..0108d55e08 100644
--- a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementInfo.vue
+++ b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementInfo.vue
@@ -10,7 +10,7 @@
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-left: 0px">
           <el-col :span="24" style="border-right: 0px">
-            <div class="span-sty" style="border-right: 0px">其他融名称:</div>
+            <div class="span-sty" style="border-right: 0px">其它融名称:</div>
             <el-form-item>
               <span class="addinputInfo">
                 {{ formobj.bankShortName }} {{ formobj.productTypeValue }} {{ formobj.period !=='' ? formobj.period + '期' : '' }} {{ formobj.maxLoanRatio !== '' ? formobj.maxLoanRatio + '%' : '' }}
diff --git a/anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/relation/otherInfo.vue b/anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/relation/otherInfo.vue
index b82d111747..d98f156c1d 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/relation/otherInfo.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/relation/otherInfo.vue
@@ -8,18 +8,22 @@
     </div>
     <div class="">
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #e0e3eb">
+        <el-row style="border-left: 0px">
+          <el-col :span="24" style="border-right: 0px">
+            <div class="span-sty" style="border-right: 0px">其它融名称:</div>
+            <el-form-item>
+              <span class="addinputInfo">
+                {{ formobj.bankShortName }} {{ formobj.productTypeValue }} {{ formobj.period !=='' ? formobj.period + '期' : '' }} {{ formobj.maxLoanRatio !== '' ? formobj.maxLoanRatio + '%' : '' }}
+              </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <div class="span-sty">资方简称</div>
             <el-form-item><span class="addinputInfo">{{ formobj.bankShortName }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
-            <div class="span-sty">其他融名称</div>
-            <el-form-item><span class="addinputInfo">
-              {{ formobj.bankShortName }} {{ formobj.productTypeValue }} {{ formobj.period !=='' ? formobj.maxLoanRatio + '期' : '' }} {{ formobj.maxLoanRatio }}
-            </span></el-form-item>
-          </el-col>
-          <el-col :span="8">
+          <el-col :span="16" class="tlineheightb">
             <div class="span-sty">适用销售部门</div>
             <el-form-item><span class="addinputInfo">{{ formobj.useDeptNames }}</span></el-form-item>
           </el-col>
@@ -131,4 +135,17 @@ export default {
 .addinputInfo {
   margin-left: 100px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>