sale-client 4.1.230 → 4.2.1-ronghao

package/src/filiale/ronghao/CardList.vue

@@ -333,23 +333,25 @@ let cancelGen = function *(self, data) {
             this.$showAlert('不能撤销不是当天的操作', 'warning', 1500)
             return
           }
-          let temp = {
-            items: 'u.f_userinfo_id,b.f_collection_type,case when (b.f_calculation = \'\' or b.f_calculation is null) then \'系统结算\' else b.f_calculation end f_calculation',
-            tableName: 't_userfiles u left join t_gasbrand b on u.f_gasbrand_id = b.id',
-            condition: `f_userfiles_id = '${row.f_userfiles_id}' and f_table_state = '正常'`,
-            orderName: 'u.f_userinfo_id desc'
-          }
-          let calculation = await Vue.resetpost('api/af-revenue/sql/indicatorStatistics', {data: temp}, {resolveMsg: null, rejectMsg: null})
-          const data = calculation.data
-          console.log('123465', data)
-          if (data[0].f_calculation !== '系统结算') {
-            // this.$showAlert('该表型为表端结算表不能撤销操作', 'warning', 1500)
-            // 查询指令是否上表
-            let http = new HttpResetClass()
-            const instruct = await http.load('POST', 'api/af-revenue/logic/cancelGetInstructList', { id: row.id }, {resolveMsg: null, rejectMsg: null})
-            if (instruct.data.length > 0) {
-              this.$showMessage('此次收费相关信息已全部成功上传至表端，现不支持对该收费信息进行撤销操作', ['confirm'])
-              return
+          if (row.type === '物联网收费') {
+            let temp = {
+              items: 'u.f_userinfo_id,b.f_collection_type,case when (b.f_calculation = \'\' or b.f_calculation is null) then \'系统结算\' else b.f_calculation end f_calculation',
+              tableName: 't_userfiles u left join t_gasbrand b on u.f_gasbrand_id = b.id',
+              condition: `f_userfiles_id = '${row.f_userfiles_id}' and f_table_state = '正常'`,
+              orderName: 'u.f_userinfo_id desc'
+            }
+            let calculation = await Vue.resetpost('api/af-revenue/sql/indicatorStatistics', {data: temp}, {resolveMsg: null, rejectMsg: null})
+            const data = calculation.data
+            console.log('123465', data)
+            if (data[0].f_calculation !== '系统结算') {
+              // this.$showAlert('该表型为表端结算表不能撤销操作', 'warning', 1500)
+              // 查询指令是否上表
+              let http = new HttpResetClass()
+              const instruct = await http.load('POST', 'api/af-revenue/logic/cancelGetInstructList', { id: row.id }, {resolveMsg: null, rejectMsg: null})
+              if (instruct.data.length > 0) {
+                this.$showMessage('此次收费相关信息已全部成功上传至表端，现不支持对该收费信息进行撤销操作', ['confirm'])
+                return
+              }
             }
           }
         }

package/src/filiale/ronghao/CardMeterChargeCancel.vue

@@ -405,6 +405,11 @@ export default {
           return
         }
       }
+      let b = this.$login.toStandardDateString() + ' 00:00:00'
+      if (this.model.f_date < b && this.model.f_payment.length === 0) {
+        this.$showAlert('请选择退款方式！', 'warning', 1500)
+        return
+      }
       this.show = true
     },
     close () {