chenrui 3 mēneši atpakaļ
vecāks
revīzija
d9efe9c30c

+ 8 - 7
src/views/dealerManagement/dealerAccount/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="5" :sm="24">
               <a-form-item label="经销商名称">
-                <dealerSubareaScopeList placeholder="请输入经销商名称搜索" ref="dealerSubareaScopeList" id="dealerAccountNewList-senderName" @change="custChange" />
+                <dealerSubareaScopeList placeholder="请输入经销商名称搜索" ref="dealerSubareaScopeList" id="dealerAccountNewList-dealerName" @change="custChange" />
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -27,7 +27,7 @@
             </a-col>
             <a-col :md="4" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="dealerAccountNewList-refresh">查询</a-button>
-              <a-button style="margin:0 5px" @click="resetSearchForm" :disabled="disabled" id="dealerAccountNewList-reset">重置</a-button>
+              <a-button style="margin:0 5px;" @click="resetSearchForm" :disabled="disabled" id="dealerAccountNewList-reset">重置</a-button>
               <a-button
                 type="primary"
                 v-if="$hasPermissions('B_merchantInfo_export')"
@@ -58,7 +58,7 @@
           bordered>
           <!-- 轮胎补贴金额 -->
           <template slot="moneyNum" slot-scope="text, record">
-            <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record)">111111111111</span>
+            <span v-if="$hasPermissions('B_salesDetail')" :id="'dealerAccountNewList-tireMoney'+record.id" class="link-bule" @click="handleDetail(record)">111111111111</span>
             <span v-else>111111111111</span>
           </template>
         </s-table>
@@ -102,7 +102,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '经销商名称', dataIndex: 'org.name', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '轮胎补贴金额(¥)', scopedSlots: { customRender: 'moneyNum' }, width: '12%', align: 'center' },
+        { title: '轮胎补贴金额(¥)', scopedSlots: { customRender: 'moneyNum' }, width: '12%', align: 'right' },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -131,9 +131,6 @@ export default {
     }
   },
   methods: {
-    handleDetail (row) {
-      this.$router.push({ name: 'dealerAccountDetail', params: { sn: row.tenantSn } })
-    },
     // 客户名称 change
     custChange (val) {
       this.queryParam.dealerSn = val.key
@@ -148,6 +145,10 @@ export default {
       this.queryParam.dealerType1 = v[0]
       this.queryParam.dealerType2 = v[1]
     },
+    // 轮胎补贴金额  点击跳转详情页
+    handleDetail (row) {
+      this.$router.push({ name: 'dealerAccountDetail', params: { sn: row.tenantSn } })
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.dealerSn = undefined

+ 3 - 7
src/views/setting/tireSubsidySetting/addSubsidyList.vue

@@ -190,8 +190,8 @@ export default {
               if (data.list[i].ruleEndDate) {
                 data.list[i].ruleEndDate = this.pageType === 'SUBSIDY_QUARTER_FEE' ? this.getYearAndQuarter(data.list[i].ruleEndDate).showWords : this.getYear(data.list[i].ruleEndDate)
               }
-              if (data.list[i].createDate) {
-                data.list[i].isSomeTimeFlag = this.pageType === 'SUBSIDY_QUARTER_FEE' ? this.isSameQuarter(data.list[i].ruleStartDate) : this.isSameYear(data.list[i].createDate)
+              if (data.list[i].ruleStartDate) {
+                data.list[i].isSomeTimeFlag = this.pageType === 'SUBSIDY_QUARTER_FEE' ? this.isSameQuarter(data.list[i].ruleStartDate) : this.isSameYear(data.list[i].ruleStartDate)
               }
             }
           }
@@ -266,12 +266,8 @@ export default {
       const currentDate = new Date()
       const currentYear = currentDate.getFullYear()
 
-      // 解析输入的时间
-      const inputTime = new Date(fixedDate)
-      const inputYear = inputTime.getFullYear()
-
       // 比较年份
-      return currentYear === inputYear
+      return currentYear === fixedDate
     },
     // 当前时间与创建时间是否属于同一季度
     isSameQuarter (inputVal) {

+ 19 - 13
src/views/setting/tireSubsidySetting/addSubsidyModal.vue

@@ -92,8 +92,8 @@
               <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.ruleTarget2">大于等于{{ item.ruleTarget2 }}条,每条补贴{{ item.ruleValue2 }}元;</p>
+                <p v-if="item.ruleTarget3">大于等于{{ item.ruleTarget3 }}条,每条补贴{{ item.ruleValue3 }}元;</p>
               </div>
             </div>
           </div>
@@ -194,6 +194,7 @@ export default {
           const newForm = JSON.parse(JSON.stringify(_this.form))
           delete newForm.defaultFlag
           delete newForm.dealerSn
+          delete newForm.ruleType
           const flag = _this.isValid(newForm)
           if (!flag) {
             _this.$message.error('季度增量补贴【条数】与【补贴】不符合填写规则!')
@@ -225,24 +226,29 @@ export default {
       const { ruleTarget1, ruleValue1, ruleTarget2, ruleValue2, ruleTarget3, ruleValue3 } = obj
 
       // 检查第一阶梯是否填写
-      if (ruleTarget1 === undefined || ruleValue1 === undefined || typeof ruleValue1 !== 'number') {
+      if (!ruleTarget1 || !ruleValue1) {
         return false
       }
 
       // 如果第三阶梯存在,检查第二阶梯是否存在以及值是否正确
-      if (ruleTarget3 !== undefined || ruleValue3 !== undefined) {
-        if (ruleTarget2 === undefined || ruleValue2 === undefined || typeof ruleValue2 !== 'number') {
-          return false
-        }
-        if (ruleValue1 >= ruleValue2 || (ruleValue3 !== undefined && ruleValue2 >= ruleValue3) || ruleTarget1 >= ruleTarget2 || (ruleTarget3 !== undefined && ruleTarget2 >= ruleTarget3)) {
+      if (ruleTarget3 || ruleValue3) {
+        if ((!ruleTarget2 || !ruleValue2) || (!ruleTarget3 || !ruleValue3)) {
           return false
+        } else {
+          if (ruleValue1 >= ruleValue2 || ruleValue2 >= ruleValue3 || ruleTarget1 >= ruleTarget2 || ruleTarget2 >= ruleTarget3) {
+            return false
+          }
         }
       }
 
       // 如果只有第二阶梯存在(没有第三阶梯),检查值是否正确
-      if (ruleTarget2 !== undefined && ruleValue2 !== undefined && (ruleTarget3 === undefined && ruleValue3 === undefined)) {
-        if (ruleValue1 >= ruleValue2 || ruleTarget1 >= ruleTarget2) {
+      if ((ruleTarget2 || ruleValue2) && (!ruleTarget3 && !ruleValue3)) {
+        if (!ruleTarget2 || !ruleValue2) {
           return false
+        } else {
+          if (ruleValue1 >= ruleValue2 || ruleTarget1 >= ruleTarget2) {
+            return false
+          }
         }
       }
       // 所有条件都满足,返回true
@@ -278,6 +284,9 @@ export default {
     },
     // 重置
     resetFormData () {
+      if (this.form.defaultFlag == 0) {
+        this.$refs.dealerSubareaScopeList.resetForm()
+      }
       this.form.defaultFlag = 0
       this.form.dealerSn = undefined
       this.form.ruleTarget1 = undefined
@@ -286,9 +295,6 @@ export default {
       this.form.ruleValue2 = undefined
       this.form.ruleTarget3 = undefined
       this.form.ruleValue3 = undefined
-      if (this.form.defaultFlag == 0) {
-        this.$refs.dealerSubareaScopeList.resetForm()
-      }
       this.feeDataList = null
       this.$refs.ruleForm.resetFields()
     }

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

@@ -198,14 +198,14 @@ export default {
     },
     // 重置
     resetFormData () {
+      if (this.form.defaultFlag == 0) {
+        this.$refs.dealerSubareaScopeList.resetForm()
+      }
       this.form.defaultFlag = 0
       this.form.dealerSn = undefined
       this.form.ruleValue1 = undefined
       this.form.ruleType = undefined
       this.form.effectType = undefined
-      if (this.form.defaultFlag == 0) {
-        this.$refs.dealerSubareaScopeList.resetForm()
-      }
       this.feeDataList = null
       this.$refs.ruleForm.resetFields()
     }

+ 13 - 10
src/views/setting/tireSubsidySetting/editModal.vue

@@ -188,29 +188,33 @@ export default {
       })
     },
     // 为空判断
-    // 为空判断
     isValid (obj) {
       const { ruleTarget1, ruleValue1, ruleTarget2, ruleValue2, ruleTarget3, ruleValue3 } = obj
 
       // 检查第一阶梯是否填写
-      if (ruleTarget1 === undefined || ruleValue1 === undefined || typeof ruleValue1 !== 'number') {
+      if (!ruleTarget1 || !ruleValue1) {
         return false
       }
 
       // 如果第三阶梯存在,检查第二阶梯是否存在以及值是否正确
-      if (ruleTarget3 !== undefined || ruleValue3 !== undefined) {
-        if (ruleTarget2 === undefined || ruleValue2 === undefined || typeof ruleValue2 !== 'number') {
-          return false
-        }
-        if (ruleValue1 >= ruleValue2 || (ruleValue3 !== undefined && ruleValue2 >= ruleValue3) || ruleTarget1 >= ruleTarget2 || (ruleTarget3 !== undefined && ruleTarget2 >= ruleTarget3)) {
+      if (ruleTarget3 || ruleValue3) {
+        if ((!ruleTarget2 || !ruleValue2) || (!ruleTarget3 || !ruleValue3)) {
           return false
+        } else {
+          if (ruleValue1 >= ruleValue2 || ruleValue2 >= ruleValue3 || ruleTarget1 >= ruleTarget2 || ruleTarget2 >= ruleTarget3) {
+            return false
+          }
         }
       }
 
       // 如果只有第二阶梯存在(没有第三阶梯),检查值是否正确
-      if (ruleTarget2 !== undefined && ruleValue2 !== undefined && (ruleTarget3 === undefined && ruleValue3 === undefined)) {
-        if (ruleValue1 >= ruleValue2 || ruleTarget1 >= ruleTarget2) {
+      if ((ruleTarget2 || ruleValue2) && (!ruleTarget3 && !ruleValue3)) {
+        if (!ruleTarget2 || !ruleValue2) {
           return false
+        } else {
+          if (ruleValue1 >= ruleValue2 || ruleTarget1 >= ruleTarget2) {
+            return false
+          }
         }
       }
       // 所有条件都满足,返回true
@@ -244,7 +248,6 @@ export default {
     },
     // 获取编辑数据
     getFormData (getData) {
-      console.log('111111111:', getData)
       this.form = getData
     }
   },