Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue

@@ -11,7 +11,7 @@
         <div class="titwu">出库申请</div>
         <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
           <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">发起部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.pcApplyDept }}</span></el-form-item>
             </el-col>
@@ -25,7 +25,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">销售部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.staffDeptName }}</span></el-form-item>
             </el-col>
@@ -91,7 +91,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">车型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
             </el-col>
@@ -317,6 +317,19 @@ export default {
 .addinputInfo {
   margin-left: 110px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 /*表格列设置fixed后固定列出现下边框的设置*/
 /deep/ .el-table__fixed {
   height: 100% !important;

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue

@@ -13,7 +13,7 @@
         <div class="titwu">出库申请</div>
         <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
           <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">发起部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.pcApplyDept }}</span></el-form-item>
             </el-col>
@@ -27,7 +27,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">销售部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.staffDeptName }}</span></el-form-item>
             </el-col>
@@ -93,7 +93,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">车型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
             </el-col>
@@ -565,4 +565,17 @@ export default {
 .rowClass{
   border-top: 1px solid #E0E3EB;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue

@@ -11,7 +11,7 @@
         <div class="titwu">出库申请</div>
         <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
           <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">发起部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.pcApplyDept }}</span></el-form-item>
             </el-col>
@@ -25,7 +25,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">销售部门</div>
               <el-form-item><span class="addinputInfo">{{ formobj.staffDeptName }}</span></el-form-item>
             </el-col>
@@ -91,7 +91,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">车型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
             </el-col>
@@ -437,4 +437,17 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue

@@ -101,8 +101,12 @@
             <el-table-column prop="vehTypeValue" label="车辆功能" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="serviceAmountTypeValue" label="服务费类型" align="center" width="120" />
-            <el-table-column prop="serviceAmount" label="服务费" align="center" width="100" />
-            <el-table-column prop="downPayRatioLeast" label="最低首付比例" align="center" width="120" />
+            <el-table-column prop="serviceAmount" label="服务费" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.serviceAmountTypeValue !== '固定金额' ? scope.row.serviceAmount + '%' : scope.row.serviceAmount + '元' }}</span>
+              </template>
+            </el-table-column>>
+            <el-table-column prop="downPayRatioLeast" label="最低首付比例(%)" align="center" width="120" />
             <el-table-column prop="vehAccidentAmount" label="单车意外险/年" align="center" width="120" />
             <el-table-column prop="depositPremium" label="保险保证金" align="center" width="110" />
             <el-table-column prop="depositSettle" label="落户保证金" align="center" width="110" />

anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue

@@ -79,7 +79,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <div class="span-sty"><span><span class="icon">*</span>首付比例</span></div>
+            <div class="span-sty"><span><span class="icon">*</span>首付比例(%)</span></div>
             <el-form-item prop="downPayRatioKey">
               <el-select class="addinputInfo" v-model="formobj.downPayRatioKey" @change="downPayRatioChange" placeholder="请选择" clearable filterable>
                 <el-option v-for="item in downPayRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
@@ -87,7 +87,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <div class="span-sty"><span><span class="icon">*</span>最低首付比例</span></div>
+            <div class="span-sty"><span><span class="icon">*</span>最低首付比例(%)</span></div>
             <el-form-item prop="downPayRatioLeastKey">
               <el-select class="addinputInfo" v-model="formobj.downPayRatioLeastKey" @change="downPayRatioLeastChange" placeholder="请选择" clearable filterable>
                 <el-option v-for="item in downPayRatioLeast_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
@@ -97,7 +97,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <div class="span-sty"><span><span class="icon">*</span>保证金比例</span></div>
+            <div class="span-sty"><span><span class="icon">*</span>保证金比例(%)</span></div>
             <el-form-item prop="bondRatioKey">
               <el-select class="addinputInfo" v-model="formobj.bondRatioKey" @change="bondRatioChange" placeholder="请选择" clearable filterable>
                 <el-option v-for="item in bondRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>

anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementInfo.vue

@@ -53,17 +53,17 @@
             <el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : '否' }}</span></el-form-item>
           </el-col>
           <el-col :span="6">
-            <div class="span-sty"><span>首付比例</span></div>
+            <div class="span-sty"><span>首付比例(%)</span></div>
             <el-form-item><span class="addinputInfo">{{ formobj.downPayRatio }}</span></el-form-item>
           </el-col>
           <el-col :span="6">
-            <div class="span-sty"><span>最低首付比例</span></div>
+            <div class="span-sty"><span>最低首付比例(%)</span></div>
             <el-form-item><span class="addinputInfo">{{ formobj.downPayRatioLeast }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
-            <div class="span-sty"><span>保证金比例</span></div>
+            <div class="span-sty"><span>保证金比例(%)</span></div>
             <el-form-item><span class="addinputInfo">{{ formobj.bondRatio }}</span></el-form-item>
           </el-col>
           <el-col :span="6">