新增成交记录

src/api/business/category.js

@@ -53,7 +53,7 @@ export function deleteCategory(data) {
     data
   })
 }
-
+// 修改成交记录明细
 export function editDealRecord(data) {
   return request({
     url: '/bidrecord/update',
@@ -61,6 +61,14 @@ export function editDealRecord(data) {
     data
   })
 }
+// 获取成交记录明细
+export function getDealRecordDetail(data) {
+  return request({
+    url: '/bidrecord/findDetail',
+    method: 'post',
+    data
+  })
+}
 
 export function getCategory(query) {
   return request({
@@ -70,11 +78,11 @@ export function getCategory(query) {
   })
 }
 // 获取成交记录
-export function getDealRecord(query) {
+export function getDealRecord(data) {
   return request({
     url: '/bidrecord/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data
   })
 }
 // 添加成交记录

src/views/mall/dealRecord.vue

@@ -4,16 +4,13 @@
       <el-button type="primary" size="mini" class="mr10" @click="onBack">返回</el-button>
       <el-button type="danger" size="mini" class="mr10" @click="onAdd">添加记录</el-button>
     </div>
-    <!-- <div class="search-line">
-
-    </div> -->
     <el-form ref="searchForm" :inline="true" :model="searchForm" class="demo-form-inline">
-      <el-form-item label="价格范围" prop="priceRangeStart">
-        <el-input-number v-model="searchForm.priceRangeStart" :precision="2" :step="1" controls-position="right" size="small"/>
+      <el-form-item label="价格范围" prop="startPrice">
+        <el-input-number v-model="searchForm.startPrice" :precision="2" :step="1" controls-position="right" size="small"/>
       </el-form-item>
-      <el-form-item prop="priceRangeEnd">
+      <el-form-item prop="endPrice">
         ~
-        <el-input-number v-model="searchForm.priceRangeEnd" :precision="2" :step="1" controls-position="right" size="small"/>
+        <el-input-number v-model="searchForm.endPrice" :precision="2" :step="1" controls-position="right" size="small"/>
       </el-form-item>
       <el-form-item label="交易日期" prop="dateRange">
         <el-date-picker
@@ -44,14 +41,14 @@
       <el-table-column align="center" label="成交平台" prop="platform"/>
       <el-table-column align="center" label="链接地址" prop="link"/>
 
-      <el-table-column align="center" label="交易日期" prop="bidtime">
+      <el-table-column align="center" label="交易日期" prop="bidTime">
         <template slot-scope="scope">
-          {{ scope.row.bidtime | filterTime }}
+          {{ scope.row.bidTime | filterTime }}
         </template>
       </el-table-column>
-      <el-table-column align="center" label="更新时间" prop="bidtime">
+      <el-table-column align="center" label="更新时间" prop="updateTime">
         <template slot-scope="scope">
-          {{ scope.row.bidtime | filterTime }}
+          {{ scope.row.updateTime }}
         </template>
       </el-table-column>
       <el-table-column align="left" label="操作" class-name="small-padding fixed-width">
@@ -61,10 +58,14 @@
         </template>
       </el-table-column>
     </el-table>
+    <Pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     <!-- 添加或修改对话框 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="600px" @close="resetForm()">
       <el-form ref="dataForm" :rules="rules" :model="dataForm" status-icon label-position="left" label-width="100px" style="width: 400px; margin-left:50px;">
         <el-form-item label="商品图片" prop="icon">
+          <el-form-item>
+            <el-input v-model="dataForm.id" type="hidden"/>
+          </el-form-item>
           <el-upload
             ref="goodsUploader"
             :headers="headers"
@@ -101,10 +102,10 @@
         <el-form-item label="链接地址" prop="link">
           <el-input v-model="dataForm.link"/>
         </el-form-item>
-        <el-form-item label="交易日期" prop="bidtime">
+        <el-form-item label="交易日期" prop="bidTime">
           <!-- <el-input v-model="dataForm.bidtime"/> -->
           <el-date-picker
-            v-model="dataForm.bidtime"
+            v-model="dataForm.bidTime"
             :picker-options="pickerOptions"
             style="width:300px"
             type="datetime"
@@ -123,10 +124,11 @@
 </template>
 
 <script>
-import { getDealRecord, addDealRecord, deleteDealRecord, editDealRecord } from '@/api/business/category'
+import { getDealRecord, addDealRecord, deleteDealRecord, editDealRecord, getDealRecordDetail } from '@/api/business/category'
 import { getToken } from '@/utils/auth'
 import { uploadPath } from '@/api/business/storage'
 import moment from 'moment'
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 // const validateIcon = (rule, value, callback) => {
 //   if (!this.dataForm.images.length === 0) {
 //     callback(new Error('请至少上传一张商品图片'))
@@ -136,7 +138,7 @@ import moment from 'moment'
 // }
 export default {
   name: 'Category',
-  components: { },
+  components: { Pagination },
   filters: {
     filterTime(val) {
       let time = ''
@@ -148,21 +150,23 @@ export default {
   },
   data() {
     return {
+      listLoading: false,
       uploadPath,
       dataForm: {
+        id: '',
         price: '',
         extra: '',
         platform: '',
         link: '',
-        bidtime: '',
+        bidTime: '',
         buyer: '',
         images: [],
         icon: ''
       },
       searchForm: {
-        priceRangeStart: 0,
-        priceRangeEnd: 0,
-        dateRange: undefined
+        startPrice: undefined,
+        endPrice: undefined,
+        dateRange: []
       },
       dialogFormVisible: false,
       dialogStatus: '',
@@ -187,7 +191,7 @@ export default {
             message:
               '格式不正确，请输入正整数！'
           }],
-        bidtime: [{ required: true, message: '请输入交易时间', trigger: 'blur' }],
+        bidTime: [{ required: true, message: '请输入交易时间', trigger: 'blur' }],
         platform: [
           { required: true, message: '请输入成交平台', trigger: 'blur' }
         ],
@@ -229,6 +233,14 @@ export default {
             picker.$emit('pick', [start, end])
           }
         }]
+      },
+      total: 0,
+      listQuery: {
+        page: 1,
+        limit: 10,
+        name: undefined,
+        sort: 'create_time',
+        order: 'desc'
       }
     }
   },
@@ -266,7 +278,7 @@ export default {
           this.handleEdit()
           break
         default:
-          throw new Error('未定义的state参数')
+          throw new Error('Undefined parameters exist.')
       }
     },
     onSearchSubmit() {
@@ -274,6 +286,7 @@ export default {
     },
     resetSearchForm(formName) {
       this.$refs[formName].resetFields()
+      this.getList()
     },
     uploadOverrun() {
       this.$message({
@@ -286,19 +299,34 @@ export default {
     },
     getList() {
       this.listLoading = true
+      let newData = {}
+      if (this.searchForm.dateRange.length === 2) {
+        newData = {
+          startBidTime: this.searchForm.dateRange[0] / 1000,
+          endBidTime: this.searchForm.dateRange[1] / 1000
+        }
+      }
       const data = Object.assign({}, {
         cid: this.rowId
-      }, this.searchForm)
+      }, this.searchForm, newData, this.listQuery)
+      // const data = Object.assign({}, {
+      //   cid: this.rowId
+      // })
+      delete data.dateRange
       getDealRecord(data).then(res => {
-        if (res && res.data && res.data.data) {
-          this.dataList = res.data.data
+        if (res && res.data.data && res.data.data.data) {
+          this.dataList = res.data.data.data
+          this.total = res.data.data.total
         }
         this.listLoading = false
       }).catch((err) => {
-        if (err && err.data && err.data.code === 1001 && err.data.data) {
-          this.dataList = err.data.data
+        if (err && err.data.data && err.data.data.code === 1001 && err.data.data.data) {
+          this.dataList = err.data.data.data
+          this.total = err.data.data.total
         }
         this.listLoading = false
+      }).finally(() => {
+        this.listLoading = false
       })
     },
     resetForm() {
@@ -319,7 +347,7 @@ export default {
           const data = Object.assign({
             cid: this.rowId - 0
           }, this.dataForm)
-          data.bidtime = data.bidtime / 1000
+          data.bidTime = data.bidTime / 1000
           data.price = data.price - 0
           data.id = data.id - 0
           addDealRecord(data).then((res) => {
@@ -359,20 +387,26 @@ export default {
     handleOpenDialog(row) {
       this.dialogStatus = 'edit'
       this.dialogFormVisible = true
-      Object.assign(this.dataForm, row)
+      getDealRecordDetail({ id: row.id }).then(res => {
+        res.data.data.images = res.data.data.images.split(';')
+        this.dataForm = res.data.data
+      })
     },
     handleEdit() {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
           const data = Object.assign({
-            cid: this.rowId - 0
           }, this.dataForm)
-          data.bidtime = data.bidtime / 1000
+          data.bidTime = data.bidTime / 1000
           data.price = data.price - 0
           data.id = data.id - 0
           editDealRecord(data).then((res) => {
             this.dialogStatus = ''
             this.dialogFormVisible = false
+            this.$notify.success({
+              title: '成功',
+              message: '修改成功'
+            })
             this.getList()
           }).catch((err) => {
             if (err && err.data && err.data.code === 1001 && err.data.data) {