فهرست منبع

Merge branch 'develop_yh53_1' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh53_1

lilei 3 ماه پیش
والد
کامیت
a34f07cfd6

+ 2 - 2
src/views/dealerManagement/tireStorageManagement/list.vue

@@ -45,7 +45,7 @@
           <!-- 省仓状态 -->
           <template slot="tireStatus" slot-scope="text, record">
             <a-switch
-              id="tireStorageManagement-enableFlag"
+              :id="'tireStorageManagement-enableFlag'+record.id"
               v-if="$hasPermissions('B_serviceCenter_enable')"
               checkedChildren="启用"
               unCheckedChildren="禁用"
@@ -61,7 +61,7 @@
               v-if="$hasPermissions('B_serviceCenter_dealer')"
               class="button-info"
               @click="handleChangeRecord(record)"
-              id="provincialWarehouse-edit-btn">变更记录</a-button>
+              :id="'tireStorageManagement-record-btn'+record.id">变更记录</a-button>
             <span v-else>--</span>
           </template>
         </s-table>

+ 5 - 5
src/views/setting/tireSubsidySetting/addSubsidyModal.vue

@@ -91,9 +91,9 @@
             <div v-for="item in feeDataList" :key="item.id" style="display:flex;align-items:baseline;">
               <span>{{ item.effectType==1?'当前':'次月' }}增量补贴({{ pageType==='SUBSIDY_QUARTER_FEE'?'季':'年' }}度):</span>
               <div>
-                <p v-if="item.ruleTarget1">大于等于{{ item.ruleTarget1 }}条,每条补贴{{ item.ruleValue1 }}元</p>
-                <p v-if="item.ruleTarget2">大于等于{{ item.ruleTarget1 }}条,每条补贴{{ item.ruleValue2 }}元</p>
-                <p v-if="item.ruleTarget3">大于等于{{ item.ruleTarget1 }}条,每条补贴{{ item.ruleValue3 }}元</p>
+                <p v-if="item.ruleTarget1">大于等于{{ item.ruleTarget1 }}条,每条补贴{{ item.ruleValue1 }}元;</p>
+                <p v-if="item.ruleTarget2">大于等于{{ item.ruleTarget1 }}条,每条补贴{{ item.ruleValue2 }}元;</p>
+                <p v-if="item.ruleTarget3">大于等于{{ item.ruleTarget1 }}条,每条补贴{{ item.ruleValue3 }}元;</p>
               </div>
             </div>
           </div>
@@ -305,8 +305,8 @@ export default {
       margin-left:60px;
     }
     .formBoxList{
-      div:last-child{
-        margin-top:10px;
+      div{
+        margin-bottom:5px;
       }
     }
     .ant-modal-body {

+ 3 - 3
src/views/setting/tireSubsidySetting/costAddModal.vue

@@ -53,7 +53,7 @@
             </a-radio-group>
           </a-form-model-item>
           <div class="formList formBoxList" v-if="feeDataList&&feeDataList.length>0">
-            <div v-for="item in feeDataList" :key="item.id">{{ item.effectType==1?'当前':'次月' }}{{ pageType==='SERVICE_FEE'?'服务费比例':'运费补贴' }}:{{ item.ruleValue1 }}{{ pageType==='SERVICE_FEE'?'%':'元' }}</div>
+            <div v-for="item in feeDataList" :key="item.id">{{ item.effectType==1?'当前':'次月' }}{{ pageType==='SERVICE_FEE'?'服务费比例':'运费补贴' }}:{{ item.ruleValue1 }}{{ pageType==='SERVICE_FEE'?'%':'元' }};</div>
           </div>
         </a-form-model>
         <div class="btn-cont">
@@ -229,8 +229,8 @@ export default {
       margin-left:42px;
     }
     .formBoxList{
-      div:last-child{
-        margin-top:10px;
+      div{
+        margin-bottom:5px;
       }
     }
     .ant-modal-body {