chenrui hace 2 meses
padre
commit
6c7164389b

BIN
public/templ/外贸产品查询模板.xlsx


+ 3 - 3
src/views/salesManagement/salesQueryNew/detail.vue

@@ -779,11 +779,11 @@ export default {
     .form-grid{
       div{
         display: inline-block;
-        width:160px;
+        width:130px;
         label{
           display: inline-block;
-          text-align: right;
-          width:90px;
+          // text-align: right;
+          // width:90px;
         }
       }
     }

+ 1 - 1
src/views/setting/tireSubsidySetting/index.vue

@@ -13,7 +13,7 @@
       <a-tab-pane key="SUBSIDY_YEAR_FEE" tab="增量补贴(年度)" force-render>
         <addSubsidyList pageType="SUBSIDY_YEAR_FEE"></addSubsidyList>
       </a-tab-pane>
-      <a-tab-pane key="SUBSIDY_AMOUNT" tab="返利金额" force-render>
+      <a-tab-pane key="SUBSIDY_AMOUNT" tab="返利基数" force-render>
         <rebateAmountList pageType="SUBSIDY_AMOUNT"></rebateAmountList>
       </a-tab-pane>
     </a-tabs>

+ 9 - 9
src/views/setting/tireSubsidySetting/rebateAddModal.vue

@@ -21,7 +21,7 @@
           <a-form-model-item label="开始时间" v-if="itemSn&&timeInfo">
             {{ timeInfo }}
           </a-form-model-item>
-          <a-form-model-item label="返利金额" prop="ruleValue1">
+          <a-form-model-item label="返利基数" prop="ruleValue1">
             <a-input-number
               id="costAddModal-ruleValue1"
               v-model="form.ruleValue1"
@@ -29,10 +29,10 @@
               style="width:90%;"
               :max="100"
               :precision="2"
-              placeholder="请输入返利金额"/>
+              placeholder="请输入返利基数"/>
             <span style="margin-left:10px;">元</span>
           </a-form-model-item>
-          <a-form-model-item label="当前返利金额" v-if="rebateList&&rebateList.length>0">
+          <a-form-model-item label="当前返利基数" v-if="rebateList&&rebateList.length>0">
             {{ (rebateList[0].ruleValue1||rebateList[0].ruleValue1==0)?toThousands(rebateList[0].ruleValue1) :'--' }}
           </a-form-model-item>
         </a-form-model>
@@ -78,21 +78,21 @@ export default {
       form: {
         defaultFlag: 1, // 0指定客户  1默认
         dealerSn: undefined, // 客户名称
-        ruleValue1: undefined, // 返利金额
+        ruleValue1: undefined, // 返利基数
         ruleType: undefined, // 弹窗类型
         effectType: 0
       },
       // 必填项判断
       rules: {
-        ruleValue1: [{ required: true, message: '请输入返利金额', trigger: 'blur' }]
+        ruleValue1: [{ required: true, message: '请输入返利基数', trigger: 'blur' }]
       },
-      rebateList: null, // 当前返利金额 数据
+      rebateList: null, // 当前返利基数 数据
       itemSn: null, // 当前行ruleSn
       timeInfo: null// 开始时间
     }
   },
   methods: {
-    // 获取当前返利金额  历史记录
+    // 获取当前返利基数  历史记录
     getHistoryData (ajaxData) {
       this.spinning = true
       getSubsidyRuleList(ajaxData).then(res => {
@@ -144,7 +144,7 @@ export default {
       if (code != 'IN_USE') {
         this.$confirm({
           title: '提示',
-          content: '将重新生成新的返利金额,并结束当前月份的返利金额。',
+          content: '将重新生成新的返利基数,并结束当前月份的返利基数。',
           centered: true,
           onOk () {
             createSubsidyRule(_this.form).then(res => {
@@ -157,7 +157,7 @@ export default {
           }
         })
       } else {
-        const tipWord = '已存在【启用中】的返利金额'
+        const tipWord = '已存在【启用中】的返利基数'
         _this.setInfoModal(tipWord)
       }
     },

+ 1 - 1
src/views/setting/tireSubsidySetting/rebateAmountList.vue

@@ -121,7 +121,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '开始时间', dataIndex: 'newRuleStartDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结束时间', dataIndex: 'ruleEndDate', width: '12%', align: 'center', scopedSlots: { customRender: 'endDate' } },
-        { title: '返利金额', dataIndex: 'ruleValue1', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '返利基数', dataIndex: 'ruleValue1', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '状态', dataIndex: 'statusDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],