结算添加积分清单 特约商户添加字段

src/api/fingertipIntegral.js

@@ -79,3 +79,11 @@ export function activityDel(params) {
     params
   })
 }
+
+export function settlementRecordList(params) {
+  return request({
+    url: '/api/convenience/fingertipIntegral/settlementRecordList',
+    method: 'get',
+    params
+  })
+}

src/views/fingertipIntegral/options.js

@@ -0,0 +1,58 @@
+export const sourceOptions = [
+  {
+    value: 'REAL_NAME_AUTHENTICATION',
+    label: '实名认证'
+  },
+  {
+    value: 'HANDLING',
+    label: '处理办件'
+  },
+  {
+    value: 'APPLY',
+    label: '申请办件'
+  },
+  {
+    value: 'TIMEOUT',
+    label: '超期办件扣分'
+  },
+  {
+    value: 'VERY_SATISFIED',
+    label: '非常满意得分'
+  },
+  {
+    value: 'NEGATIVE_COMMENT',
+    label: '差评扣分'
+  },
+  {
+    value: 'READ',
+    label: '阅读'
+  },
+  {
+    value: 'SEND_A_CIRCLE_OF_FRIENDS',
+    label: '发朋友圈'
+  },
+  {
+    value: 'CONSUMPTION',
+    label: '消费'
+  },
+  {
+    value: 'MERCHANT_SETTLEMENT',
+    label: '商户结算'
+  },
+  {
+    value: 'POINT_REFUND',
+    label: '积分回退'
+  },
+  {
+    value: 'REGULATORY_PUNISHMENT_AND_REWARD',
+    label: '监管惩罚'
+  },
+  {
+    value: 'SPECIAL_WORK_TYPE',
+    label: '特殊工单类型奖励积分(医保卫生)'
+  },
+  {
+    value: 'TITLE_EVALUATION',
+    label: '称号评比'
+  }
+]

src/views/fingertipIntegral/recordList.vue

@@ -51,6 +51,7 @@
 <script>
 import Pagination from '@/components/Pagination'
 import { recordList } from '@/api/fingertipIntegral'
+import { sourceOptions } from './options'
 export default {
   components: { Pagination },
   filters: {
@@ -79,64 +80,7 @@ export default {
       },
       list: undefined,
 
-      sourceOptions: [
+      sourceOptions
-        {
-          value: 'REAL_NAME_AUTHENTICATION',
-          label: '实名认证'
-        },
-        {
-          value: 'HANDLING',
-          label: '处理办件'
-        },
-        {
-          value: 'APPLY',
-          label: '申请办件'
-        },
-        {
-          value: 'TIMEOUT',
-          label: '超期办件扣分'
-        },
-        {
-          value: 'VERY_SATISFIED',
-          label: '非常满意得分'
-        },
-        {
-          value: 'NEGATIVE_COMMENT',
-          label: '差评扣分'
-        },
-        {
-          value: 'READ',
-          label: '阅读'
-        },
-        {
-          value: 'SEND_A_CIRCLE_OF_FRIENDS',
-          label: '发朋友圈'
-        },
-        {
-          value: 'CONSUMPTION',
-          label: '消费'
-        },
-        {
-          value: 'MERCHANT_SETTLEMENT',
-          label: '商户结算'
-        },
-        {
-          value: 'POINT_REFUND',
-          label: '积分回退'
-        },
-        {
-          value: 'REGULATORY_PUNISHMENT_AND_REWARD',
-          label: '监管惩罚'
-        },
-        {
-          value: 'SPECIAL_WORK_TYPE',
-          label: '特殊工单类型奖励积分(医保卫生)'
-        },
-        {
-          value: 'TITLE_EVALUATION',
-          label: '称号评比'
-        }
-      ]
     }
   },
   watch: {

src/views/fingertipIntegral/settlementList.vue

@@ -38,7 +38,7 @@
         @click="handleExport"
       >导出</el-button>
     </div>
-    <el-table :data="list" border style="width: 100%">
+    <el-table v-loading="loading" :data="list" border style="width: 100%">
       <el-table-column label="用户名" prop="residentInformation.name" />
       <el-table-column label="店名" prop="residentInformation.speciallyBusinessInfo.name" />
       <el-table-column label="结算积分数" prop="num" />
@@ -88,6 +88,13 @@
             style="font-size:12px;padding:10px 20px;border-radius:21px"
             @click="handleDelivery(scope.row)"
           >收到发票</el-button>
+          <el-button
+            v-if="scope.row.dealStatus != '1'"
+            type="primary"
+            size="mini"
+            style="font-size:12px;padding:10px 20px"
+            @click="handleRExport(scope.row)"
+          >导出结算积分</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -142,7 +149,8 @@
 
 <script>
 import Pagination from '@/components/Pagination'
-import { settlementList, settlementDeal } from '@/api/fingertipIntegral'
+import { settlementList, settlementDeal, settlementRecordList } from '@/api/fingertipIntegral'
+import { sourceOptions } from './options'
 export default {
   components: { Pagination },
   filters: {
@@ -235,10 +243,14 @@ export default {
         listQuery.startDate = dateArr[0] / 1000
         listQuery.endDate = dateArr[1] / 1000
       }
+      this.loading = true
       settlementList(listQuery).then(res => {
+        this.loading = false
         this.list = res.d.records
         this.total = res.d.total
         // this.pageSize = res.d.pageSize
+      }).catch(() => {
+        this.loading = false
       })
     },
     handleEdit(item) {
@@ -318,6 +330,51 @@ export default {
         })
       )
     },
+    handleRExport(item) {
+      const that = this
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['商户姓名', '日期', '群众姓名', '积分数量', '积分交易备注', '积分来源']
+        const filterVal = ['businessName', 'createDate', 'massesName', 'num', 'remark', 'source']
+        this.loading = true
+        // const listQuery = JSON.parse(JSON.stringify(this.listQuery))
+        // const { dateArr } = listQuery
+        // if (dateArr) {
+        //   listQuery.startDate = dateArr[0] / 1000
+        //   listQuery.endDate = dateArr[1] / 1000
+        // }
+        // listQuery.size = 999999
+        settlementRecordList({ id: item.id }).then(res => {
+          setTimeout(() => {
+            this.loading = false
+          }, 3000)
+
+          const data = that.formatDJson(filterVal, res.d)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data: data,
+            filename: '积分清单'
+          })
+        }).catch(() => {
+          this.loading = false
+        })
+      })
+    },
+    formatDJson(filterVal, jsonData) {
+      return jsonData.map(v =>
+        filterVal.map(j => {
+          let value
+          if (j === 'createDate') {
+            value = this.$options.filters['parseTime'](v[j])
+          } else if (j === 'source') {
+            value = this.$options.filters['optionsFilter'](v[j], sourceOptions)
+          } else {
+            value = v[j]
+          }
+          // if (!value && value !== 0) value = "N/A";
+          return value
+        })
+      )
+    },
     handleDelivery(item) {
       this.$confirm('是否收到发票?', '提示', {
         confirmButtonText: '确定',

src/views/speciallyBusiness/list.vue

@@ -172,6 +172,9 @@
           <el-form-item label="商户图片" prop="images">
             <CutUploadImage :init-url="form.images" multiple @imgupload="UploadCbk" />
           </el-form-item>
+          <el-form-item label="营业执照" prop="businessLicense">
+            <CutUploadImage :init-url="form.businessLicense" @imgupload="bUploadCbk" />
+          </el-form-item>
           <el-form-item label="商户地址" prop="address">
             <el-input
               v-model="form.address"
@@ -259,6 +262,7 @@ export default {
         name: undefined,
         nameZ: undefined,
         images: [],
+        businessLicense: undefined,
         address: undefined,
         addressZ: undefined,
         introduce: undefined,
@@ -376,6 +380,7 @@ export default {
           name: undefined,
           nameZ: undefined,
           images: [],
+          businessLicense: undefined,
           address: undefined,
           addressZ: undefined,
           introduce: undefined,
@@ -432,6 +437,9 @@ export default {
     UploadCbk(data) {
       this.form.images = data
     },
+    bUploadCbk(data) {
+      this.form.businessLicense = data
+    },
     // jumpStaff(item) {
     //   const { name, id } = item
     //   this.$router.push({