Bläddra i källkod

feat:更新代码

jinx 4 år sedan
förälder
incheckning
58cba3dfb2
2 ändrade filer med 26 tillägg och 11 borttagningar
  1. 9 9
      src/page/oplog/oplog.vue
  2. 17 2
      src/page/userList/userList.vue

+ 9 - 9
src/page/oplog/oplog.vue

@@ -6,23 +6,25 @@
           <span>时间段:</span>
           <el-date-picker size="large" v-model="searchDate" type="daterange" unlink-panels range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions2" value-format="yyyy-MM-dd" align="center">
           </el-date-picker>
-          <!-- <span>关键字:</span>
-          <el-input @keyup.enter.native="_searchOrderData(1)" ref="searchOrderNumber" v-model="searchOrderNumber" value="" placeholder="留言内容、备注"></el-input> -->
+         <span>关键字:</span>
+          <el-input @keyup.enter.native="_searchOrderData(1)" ref="searchOrderNumber" v-model="searchOrderNumber" value="" placeholder="操作人"></el-input>
           <el-button type="primary" @click="_searchOrderData(1)" color='red'>筛选</el-button>
 
         </div>
         <div class="order-check_bottom">
           <div class="order-management-table">
             <el-table ref="order_table" class='e-table' :data="orders" style="width: 100%">
-              <el-table-column prop="userId" label="用户id">
+              <el-table-column prop="operateUesr" label="操作人">
               </el-table-column>
               <el-table-column prop="createTime" label="操作时间">
               </el-table-column>
+              <el-table-column prop="userName" label="用户名称">
+              </el-table-column>
               <el-table-column label="操作详情">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.type==1">下载场景</span>
-                  <span v-if="scope.row.type==2">新增权益</span>
-                  <span v-if="scope.row.type==3">新增下载</span>
+                  <!-- <span v-if="scope.row.type==1">下载场景</span> -->
+                  <span v-if="scope.row.type==2">会员权益数+{{scope.row.incrementNum}}<br/>剩余下载数+{{scope.row.downloadNum}}</span>
+                  <span v-if="scope.row.type==3">剩余下载数+{{scope.row.downloadNum}}</span>
                 </template>
               </el-table-column>
 
@@ -144,8 +146,6 @@ export default {
       date1 = this.date1 ? this.date1 + ' 00:00:00' : null
       date2 = this.date2 ? this.date2 + ' 23:59:59' : null
 
-      this.orderNum = orderNum = this.searchOrderNumber || null
-
       this.fullscreenLoading = true
 
       let para = {
@@ -153,7 +153,7 @@ export default {
         // type: this.type,
         startDate: date1,
         endDate: date2,
-        // itemName: orderNum || '',
+        searchKey: this.searchOrderNumber,
         pageSize: 10
       }
 

+ 17 - 2
src/page/userList/userList.vue

@@ -174,14 +174,29 @@ export default {
           this.$http
             .post('/manager/user/insertIncrementls', params)
             .then((res) => {
-              this.closeAdd()
-              this._searchOrderData(1)
+              if (res.code == 0) {
+                this.$message({
+                  message: '添加成功',
+                  type: 'success',
+                  duration: 2000
+
+                })
+                this.closeAdd()
+                this._searchOrderData(1)
+              } else {
+                this.$message({
+                  message: '添加失败',
+                  type: 'error',
+                  duration: 2000
+                })
+              }
             })
         } else {
           console.log('请补全信息')
         }
       })
     },
+
     handleCurrentChange (val) {
       let page = val
       if (this.total > 0 && !this.hasClickSearch) {