Browse Source

bug 修复

lilei 2 years ago
parent
commit
ce058ff008

+ 1 - 9
src/views/numsGoodsShelves/redPacket/list.vue

@@ -115,16 +115,8 @@ export default {
     },
     // 编辑/新增
     handleEdit (row) {
-      const _this = this
       if (row) { //  编辑
-        this.$confirm({
-          title: '提示',
-          content: '确认要编辑吗?',
-          centered: true,
-          onOk () {
-            _this.$router.push({ name: 'redPacketEdit', params: { sn: row.rewardRuleSn } })
-          }
-        })
+        this.$router.push({ name: 'redPacketEdit', params: { sn: row.rewardRuleSn } })
       } else {
         this.$router.push({ name: 'redPacketAdd' })
       }

+ 2 - 1
src/views/numsGoodsShelves/redPacket/redPacketStatistics.vue

@@ -161,7 +161,8 @@ export default {
         { title: '员工手机号码', dataIndex: 'userMobile', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '订单编号', dataIndex: 'orderNo', scopedSlots: { customRender: 'orderNo' }, width: '130px', align: 'center' },
         { title: '订单类型', dataIndex: 'orderTypeDictValue', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '订单状态', dataIndex: 'orderSourceDictValue', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '订单状态', dataIndex: 'orderStatusDictValue', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '下单方式', dataIndex: 'orderSourceDictValue', width: '80px', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '下单时间', dataIndex: 'orderDate', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: 'VIN', dataIndex: 'vehicleNumber', width: '140px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '车型', dataIndex: 'vehicleModel', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },