Browse Source

Merge branch 'pre' of http://git.dgtis.com/sunlupeng/pointsMall-admin

sunlupeng 1 year ago
parent
commit
c4b65042df

+ 9 - 0
src/api/pointManage.js

@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+//积分加减
+export function addSub(data) {
+  return request({
+    url: '/mall-integral/addSub',
+    method: 'post',
+    data
+  })
+}
+
 export function pointRulesTypeList(data) {
   return request({
     url: '/mall-integral/getTypes',

+ 1 - 0
src/permission.js

@@ -52,6 +52,7 @@ const myRoles = [
   'pointRulesList', 
   'pointList', 
   'pointsDetailList',
+  'pointsPlusOrMinus',
 
   'activityManage', 
   'activityList', 

+ 1 - 0
src/router/index.js

@@ -66,6 +66,7 @@ export const asyncRouterMap = [
       { path: 'pointRulesList', component: _import('pointManage/pointRulesList'), name: 'pointRulesList', meta: { title: '积分规则列表', noCache: true }},
       { path: 'pointList', component: _import('pointManage/pointList'), name: 'pointList', meta: { title: '积分列表', noCache: true }},
       { path: 'pointsDetailList', component: _import('pointManage/pointsDetailList'), name: 'pointsDetailList', meta: { title: '积分明细列表', noCache: true }},
+      { path: 'pointsPlusOrMinus', component: _import('pointManage/pointsPlusOrMinus'), name: 'pointsPlusOrMinus', meta: { title: '积分加减列表', noCache: true }},
     ]
   },
   {

+ 14 - 9
src/views/activityManage/activityList.vue

@@ -57,7 +57,7 @@
         <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="70%">
             <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="110px" style='width:700px; margin-left:50px;'>
                 <el-form-item label="活动类型" prop="type">
-                    <el-select v-model="dataForm.type" filterable placeholder="请选择" style="width: 350px"
+                    <el-select :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.type" filterable placeholder="请选择" style="width: 350px"
                         value-key="value"  @change="clickType">
                         <el-option :key="item.dictValue" v-for="item in typeList" :label="item.dictLabel"
                             :value="item.dictValue">
@@ -87,7 +87,7 @@
                 <el-form-item label="开始日期" prop="startCron">
                 <el-input v-model="dataForm.startCron" placeholder="请输入cron执行表达式" style="width: 350px">
                     <template slot="append">
-                    <el-button type="primary" @click="handleShowCronStart">
+                    <el-button type="primary" :disabled="dialogStatus == 'update'?true:false" @click="handleShowCronStart">
                         生成表达式
                         <i class="el-icon-time el-icon--right"></i>
                     </el-button>
@@ -97,7 +97,7 @@
                 <el-form-item label="结束日期" prop="endCron">
                     <el-input v-model="dataForm.endCron" placeholder="请输入cron执行表达式" style="width: 350px">
                         <template slot="append">
-                            <el-button type="primary" @click="handleShowCronEnd">
+                            <el-button type="primary" :disabled="dialogStatus == 'update'?true:false" @click="handleShowCronEnd">
                                 生成表达式
                                 <i class="el-icon-time el-icon--right"></i>
                             </el-button>
@@ -105,28 +105,29 @@
                     </el-input>
                 </el-form-item>
                 <el-form-item v-if="dataForm.type=='3'"  label="关联奖池" prop="prizePoolId">
-                    <el-select v-model="dataForm.prizePoolId" clearable placeholder="请选择奖池" class="filter-item" style="width: 350px">
+                    <el-select :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.prizePoolId" clearable placeholder="请选择奖池" class="filter-item" style="width: 350px">
                         <el-option :key="item.id" v-for="item in prizePoolList" :label="item.title" :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item v-else label="关联兑换卷" prop="relationCoupon">
-                    <el-radio-group v-model="dataForm.relationCoupon">
+                    <el-radio-group :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.relationCoupon">
                         <el-radio :label="'0'">否</el-radio>
                         <el-radio :label="'1'">是</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="dataForm.type!='3' && dataForm.relationCoupon=='1'"  label="兑换券" prop="couponIds">
-                    <el-select v-model="dataForm.couponIds" clearable multiple collapse-tags placeholder="请选择兑换券" class="filter-item" style="width: 350px">
+                    <el-select :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.couponIds" clearable multiple collapse-tags placeholder="请选择兑换券" class="filter-item" style="width: 350px">
                         <el-option :key="item.id" v-for="item in couponsList" :label="item.couponName" :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item v-if="dataForm.type=='3'" label="抽奖次数" prop="prizeNum">
-                    <el-input-number style="width: 350px" :min="1" :step="1" v-model="dataForm.prizeNum"></el-input-number>
+                    <el-input-number :disabled="dialogStatus == 'update'?true:false" style="width: 350px" :min="1" :step="1" v-model="dataForm.prizeNum"></el-input-number>
                 </el-form-item>
                 <el-form-item v-if="dataForm.relationCoupon=='1' || dataForm.type=='3'" label="兑换截至时间" prop="couponEndTime">
                     <el-date-picker 
+                    :disabled="dialogStatus == 'update'?true:false"
                     format="yyyy-MM-dd HH:mm:ss"
                     value-format="yyyy-MM-dd HH:mm:ss"
                     type="datetime" v-model="dataForm.couponEndTime" 
@@ -134,11 +135,11 @@
                     style="width: 350px">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="活动连接">
+                <el-form-item  v-if="dataForm.type=='1'" label="活动连接" prop="activityUrl">
                     <el-input v-model="dataForm.activityUrl" style="width: 350px"></el-input>
                 </el-form-item>
                 <el-form-item label="参与人">
-                    <el-select v-model="dataForm.participants" multiple filterable placeholder="请选择" style="width: 350px">
+                    <el-select :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.participants" multiple filterable placeholder="请选择" style="width: 350px">
                         <el-option :key="item.loginId" v-for="item in participantsList" :label="item.userName" :value="item.loginId">
                         </el-option>
                     </el-select>
@@ -274,6 +275,10 @@ export default {
                 prizeNum: [
                     { required: true, message: "请设置抽奖次数", trigger: "blur" }
                 ],
+                activityUrl: [
+                    { required: true, message: "请填写活动连接", trigger: "blur" }
+                ],
+                
             },
             fileImgUrl: this.upLoadUrl,
             typeList:[],

+ 16 - 15
src/views/commendManage/ceoCiteList.vue

@@ -6,10 +6,10 @@
         <el-option :key="item.dictValue" v-for="item in typeList" :label="item.dictLabel" :value="item.dictValue">
         </el-option>
       </el-select>
-      <el-select v-model="listQuery.category" clearable placeholder="表彰类别" class="filter-item" style="width: 200px">
+      <!-- <el-select v-model="listQuery.category" clearable placeholder="表彰类别" class="filter-item" style="width: 200px">
         <el-option :key="item.dictValue" v-for="item in categoryList" :label="item.dictLabel" :value="item.dictValue">
         </el-option>
-      </el-select>
+      </el-select> -->
       <el-input clearable class="filter-item" style="width: 200px;" placeholder="客户名称"
         v-model="listQuery.customerName"></el-input>
       <el-input clearable class="filter-item" style="width: 200px;" placeholder="表彰名称"
@@ -38,8 +38,8 @@
       </el-table-column>
       <el-table-column align="center" prop="typeName" min-width="100" label="表彰类型">
       </el-table-column>
-      <el-table-column align="center" prop="categoryName" min-width="100" label="表彰类别">
-      </el-table-column>
+      <!-- <el-table-column align="center" prop="categoryName" min-width="100" label="表彰类别">
+      </el-table-column> -->
       <el-table-column align="center" min-width="100" label="表彰人员">
         <template slot-scope="props">
           <el-popover trigger="hover">
@@ -107,14 +107,15 @@
                 <el-form-item label="表彰类型">
                   <el-input disabled class="filter-item" v-model="dataForm.typeName"></el-input>
                 </el-form-item>
-                <el-form-item label="表彰类别" prop="category">
+                <!-- <el-form-item label="表彰类别" prop="category">
                   <el-select v-model="dataForm.category" clearable placeholder="表彰类别" class="filter-item" style="width: 100%" @change="handleClickChangeType">
                     <el-option :key="item.dictValue" v-for="item in categoryList" :label="item.dictLabel" :value="item.dictValue">
                     </el-option>
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="奖励积分" prop="integral">
-                  <el-input-number style="width: 100%;" :disabled="dataForm.category=='30' && dataForm.type!='1'?false:true" :min="0" :step="1" v-model="dataForm.integral"></el-input-number>
+                  <el-input-number style="width: 100%;" :min="0" :step="1" v-model="dataForm.integral"></el-input-number>
+                  <!-- <el-input-number style="width: 100%;" :disabled="dataForm.category=='30' && dataForm.type!='1'?false:true" :min="0" :step="1" v-model="dataForm.integral"></el-input-number> -->
                 </el-form-item>
                 <el-form-item label="审批内容" prop="content">
                   <el-input type="textarea" :rows="2" placeholder="请输入审批内容" v-model="dataForm.content"></el-input>
@@ -227,14 +228,14 @@ export default {
                     return false;
                 }
             }
-            if(val.flag == true){
-                if(!val.category){
-                    this.$alert("请选择表彰类别", "提示", {
-                        confirmButtonText: "确定",
-                    });
-                    return false;
-                }
-            }
+            // if(val.flag == true){
+            //     if(!val.category){
+            //         this.$alert("请选择表彰类别", "提示", {
+            //             confirmButtonText: "确定",
+            //         });
+            //         return false;
+            //     }
+            // }
             return true;
         },
     complete(flag) {

+ 4 - 4
src/views/commendManage/citeList.vue

@@ -6,10 +6,10 @@
         <el-option :key="item.dictValue" v-for="item in typeList" :label="item.dictLabel" :value="item.dictValue">
         </el-option>
       </el-select>
-      <el-select v-model="listQuery.category" clearable placeholder="表彰类别" class="filter-item" style="width: 200px">
+      <!-- <el-select v-model="listQuery.category" clearable placeholder="表彰类别" class="filter-item" style="width: 200px">
         <el-option :key="item.dictValue" v-for="item in categoryList" :label="item.dictLabel" :value="item.dictValue">
         </el-option>
-      </el-select>
+      </el-select> -->
       <el-input clearable class="filter-item" style="width: 200px;" placeholder="客户名称"
         v-model="listQuery.customerName"></el-input>
       <el-input clearable class="filter-item" style="width: 200px;" placeholder="表彰名称"
@@ -38,8 +38,8 @@
       </el-table-column>
       <el-table-column align="center" prop="typeName" min-width="100" label="表彰类型">
       </el-table-column>
-      <el-table-column align="center" prop="categoryName" min-width="100" label="表彰类别">
-      </el-table-column>
+      <!-- <el-table-column align="center" prop="categoryName" min-width="100" label="表彰类别">
+      </el-table-column> -->
       <el-table-column align="center" min-width="100" label="表彰人员">
         <template slot-scope="props">
           <el-popover trigger="hover">

+ 10 - 10
src/views/commendManage/operateCiteList.vue

@@ -105,12 +105,12 @@
     <el-dialog :close-on-click-modal="false" title="表彰审批" :visible.sync="dialogFormVisible" width="40%">
             <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="80px">
               
-                <el-form-item label="表彰类别" prop="category">
+                <!-- <el-form-item label="表彰类别" prop="category">
                   <el-select v-model="dataForm.category" clearable placeholder="表彰类别" class="filter-item" style="width: 100%">
                     <el-option :key="item.dictValue" v-for="item in categoryList" :label="item.dictLabel" :value="item.dictValue">
                     </el-option>
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="审批内容" prop="content">
                   <el-input type="textarea" :rows="2" placeholder="请输入审批内容" v-model="dataForm.content"></el-input>
                 </el-form-item>
@@ -211,14 +211,14 @@ export default {
                     return false;
                 }
             }
-            if(val.flag == true){
-                if(!val.category){
-                    this.$alert("请选择表彰类别", "提示", {
-                        confirmButtonText: "确定",
-                    });
-                    return false;
-                }
-            }
+            // if(val.flag == true){
+            //     if(!val.category){
+            //         this.$alert("请选择表彰类别", "提示", {
+            //             confirmButtonText: "确定",
+            //         });
+            //         return false;
+            //     }
+            // }
             return true;
         },
     complete(flag) {

+ 7 - 7
src/views/couponsManage/couponsList.vue

@@ -71,39 +71,39 @@
                         </el-upload>
                 </el-form-item>
         <el-form-item label="类型" prop="couponType">
-          <el-select v-model="dataForm.couponType" clearable placeholder="请选择类型" class="filter-item" style="width: 300px">
+          <el-select :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.couponType" clearable placeholder="请选择类型" class="filter-item" style="width: 300px">
             <el-option :key="item.type" v-for="item in typeList" :label="item.name" :value="item.type">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="使用类型" prop="useType">
-          <el-select v-model="dataForm.useType" clearable placeholder="请选择类型" class="filter-item" style="width: 300px">
+          <el-select :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.useType" clearable placeholder="请选择类型" class="filter-item" style="width: 300px">
             <el-option :key="item.dictValue" v-for="item in dataTypeList" :label="item.dictLabel" :value="item.dictValue">
                         </el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-if="dataForm.useType=='1'" label="商品" prop="skuIds">
-          <el-select v-model="dataForm.skuIds" clearable multiple collapse-tags placeholder="请选择商品" class="filter-item" style="width: 300px">
+          <el-select :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.skuIds" clearable multiple collapse-tags placeholder="请选择商品" class="filter-item" style="width: 300px">
             <el-option :key="item.skuId" v-for="item in goodsList" :label="item.name" :value="item.skuId">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-else label="分类" prop="categorys">
-          <el-select v-model="dataForm.categorys" clearable  multiple collapse-tags placeholder="请选择分类" class="filter-item" style="width: 300px">
+          <el-select :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.categorys" clearable  multiple collapse-tags placeholder="请选择分类" class="filter-item" style="width: 300px">
             <el-option :key="item.dictValue" v-for="item in categorysList" :label="item.dictLabel" :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-if="dataForm.couponType=='2'" label="截止日期" prop="enableEndTime">
-          <el-date-picker style="width: 300px" class="filter-item" value-format="yyyy-MM-dd"
+          <el-date-picker :disabled="dialogStatus == 'update'?true:false" style="width: 300px" class="filter-item" value-format="yyyy-MM-dd"
             v-model="dataForm.enableEndTime" type="date" placeholder="截止日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="数量" prop="num">
-          <el-input-number :min="1" :precision="0" :step="1" v-model="dataForm.num"></el-input-number>
+          <el-input-number :disabled="dialogStatus == 'update'?true:false" :min="1" :precision="0" :step="1" v-model="dataForm.num"></el-input-number>
         </el-form-item>
         <el-form-item label="状态">
-          <el-radio-group v-model="dataForm.status">
+          <el-radio-group :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.status">
             <el-radio :label="'0'">关闭</el-radio>
             <el-radio :label="'1'">开启</el-radio>
           </el-radio-group>

+ 8 - 0
src/views/pointManage/pointList.vue

@@ -86,6 +86,14 @@
                 <el-table-column align="center" min-width="200px" label="积分说明" prop="comment">
                 </el-table-column>
                 <el-table-column align="center" min-width="80px" label="积分" prop="integral">
+                    <template slot-scope="scope">
+                        <span style="color: #67C23A;font-weight: 600;font-size: 14px;" v-if="scope.row.pm == 0">
+                            + {{ scope.row.integral }}
+                        </span>
+                        <span style="color: #F56C6C;font-weight: 600;font-size: 14px;" v-else>
+                            - {{ scope.row.integral }}
+                        </span>
+                    </template>
                 </el-table-column>
                 <el-table-column align="center" min-width="80px" label="生成时间" prop="createTime">
                 </el-table-column>

+ 9 - 1
src/views/pointManage/pointsDetailList.vue

@@ -37,7 +37,15 @@
             </el-table-column>
             <el-table-column align="center" min-width="200px" label="积分说明" prop="comment">
             </el-table-column>
-            <el-table-column align="center" min-width="80px" label="积分" prop="integral">
+            <el-table-column align="center" min-width="80px" label="积分">
+                <template slot-scope="scope">
+                    <span style="color: #67C23A;font-weight: 600;font-size: 14px;" v-if="scope.row.pm == 0">
+                        + {{ scope.row.integral }}
+                    </span>
+                    <span style="color: #F56C6C;font-weight: 600;font-size: 14px;" v-else>
+                        - {{ scope.row.integral }}
+                    </span>
+                </template>
             </el-table-column>
             <el-table-column align="center" min-width="80px" label="获取时间" prop="createTime">
                 </el-table-column>

+ 232 - 0
src/views/pointManage/pointsPlusOrMinus.vue

@@ -0,0 +1,232 @@
+<template>
+    <div class="app-container calendar-list-container">
+  
+      <!-- 查询和其他操作 -->
+      <div class="filter-container">
+        <el-input clearable class="filter-item" style="width: 200px;" placeholder="请输入姓名"
+                v-model="listQuery.userName"></el-input>
+        <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
+        <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-edit">添加</el-button>
+      </div>
+  
+      <!-- 查询结果 -->
+      <el-table size="small" :data="list" v-loading="listLoading" element-loading-text="正在查询中。。。" border fit
+        highlight-current-row>
+        <el-table-column type="index" label="序号" header-align="center" align="center">
+        </el-table-column>
+  
+        <el-table-column align="center" min-width="80px" label="姓名" prop="userName">
+            </el-table-column>
+            <el-table-column align="center" min-width="150px" label="部门" prop="deptName">
+            </el-table-column>
+            <el-table-column align="center" min-width="80px" label="积分">
+                <template slot-scope="scope">
+                    <span style="color: #67C23A;font-weight: 600;font-size: 14px;" v-if="scope.row.pm == 0">
+                        + {{ scope.row.integral }}
+                    </span>
+                    <span style="color: #F56C6C;font-weight: 600;font-size: 14px;" v-else>
+                        - {{ scope.row.integral }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" min-width="200px" label="备注" prop="comment">
+            </el-table-column>
+            <el-table-column align="center" min-width="80px" label="创建时间" prop="createTime">
+                </el-table-column>
+        </el-table>
+  
+      <!-- 分页 -->
+      <div class="pagination-container">
+        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+          :current-page="listQuery.page" :page-sizes="[10, 20, 30, 50]" :page-size="listQuery.limit"
+          layout="total, sizes, prev, pager, next, jumper" :total="total">
+        </el-pagination>
+      </div>
+  
+      <!-- 添加或修改对话框 -->
+      <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="45%">
+        <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px"
+          style='width:700px; margin-left:50px;'>
+  
+          <el-form-item label="员工" prop="loginId">
+            <el-select v-model="dataForm.loginId" filterable placeholder="请选择" style="width: 350px">
+                        <el-option :key="item.loginId" v-for="item in loginIdList" :label="item.userName" :value="item.loginId">
+                        </el-option>
+                    </el-select>
+          </el-form-item>
+          <el-form-item label="积分" prop="integral">
+                  <el-input-number
+                  style="width: 350px"
+                    :precision="0"
+                    :step="1"
+                    v-model="dataForm.integral"
+                  ></el-input-number>
+                </el-form-item>
+                <el-form-item  label="备注">
+              <el-input type="textarea" :rows="2" style="width: 350px" v-model="dataForm.msg"></el-input>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">取消</el-button>
+          <el-button type="primary"  @click="createData">确定</el-button>
+        </div>
+      </el-dialog>
+  
+    </div>
+  </template>
+    
+  <style>
+  .demo-table-expand {
+    font-size: 0;
+  }
+  
+  .demo-table-expand label {
+    width: 200px;
+    color: #99a9bf;
+  }
+  
+  .demo-table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+  }
+  </style>
+    
+  <script>
+  import { getPointDetailList, addSub } from "@/api/pointManage";
+  import { allUserList } from "@/api/public";
+  import waves from "@/directive/waves"; // 水波纹指令
+  import Tinymce from '@/components/Tinymce'
+  
+  export default {
+    components: { Tinymce },
+    directives: { waves },
+    data() {
+      return {
+        loginIdList:[],
+        list: [],
+        total: 0,
+        listLoading: false,
+        listQuery: {
+          page: 1,
+          limit: 10,
+          integralType:100,
+          userName: '',
+        },
+        dataForm: {
+          integral: undefined,
+          loginId: '',
+          msg:'',
+        },
+        dialogFormVisible: false,
+        dialogStatus: '',
+        textMap: {
+          update: "编辑",
+          create: "创建",
+        },
+        rules: {
+          integral: [{ required: true, message: "积分不能为空", trigger: "blur" }],
+          loginId: [{ required: true, message: "请选积分加减人员", trigger: "blur" }],
+        },
+      }
+    },
+    created() {
+        this.getAllUserList(); 
+      this.getList();
+    },
+    methods: {
+        getAllUserList() {
+            allUserList().then(response => {
+                this.loginIdList = response.data.data;
+            }).catch(() => {});
+        },
+      resetForm() {
+        this.dataForm = {
+            integral: undefined,
+          loginId: '',
+          msg:'',
+        };
+      },
+      handleCreate() {
+  
+        this.resetForm();
+        this.dialogFormVisible = true;
+        this.dialogStatus = "create";
+        this.$nextTick(() => {
+          this.$refs["dataForm"].clearValidate();
+        });
+      },
+      createData() {
+        this.$refs["dataForm"].validate((valid) => {
+          if (valid) {
+            console.log(this.dataForm);
+            addSub(this.dataForm)
+              .then((response) => {
+                this.dialogFormVisible = false;
+                this.$notify({
+                  title: "成功",
+                  message: "创建成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              })
+              .catch(() => { });
+          }
+        });
+      },
+  
+      getList() {
+        this.listLoading = true
+        getPointDetailList(this.listQuery).then(response => {
+          this.list = response.data.data.items
+          this.total = response.data.data.total
+          this.listLoading = false
+        }).catch(() => {
+  
+        })
+      },
+  
+      handleFilter() {
+        this.listQuery.page = 1
+        this.getList()
+      },
+  
+      handleSizeChange(val) {
+        this.listQuery.limit = val
+        this.getList()
+      },
+  
+      handleCurrentChange(val) {
+        this.listQuery.page = val
+        this.getList()
+      },
+    }
+  }
+  </script>
+  <style>
+  .ad-avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  
+  .ad-avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  
+  .ad-avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  
+  .ad-avatar {
+    display: block;
+  }
+  </style>
+    

+ 1 - 1
src/views/raffleManage/raffleDataList.vue

@@ -67,7 +67,7 @@
       >
         <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="80px" style='width: 700px; margin-left:50px;'>
             <el-form-item  label="奖品类型" prop="prizeType">
-              <el-select v-model="dataForm.prizeType" clearable placeholder="请选择类型" class="filter-item" style="width: 300px" @change="clickPrizeType">
+              <el-select :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.prizeType" clearable placeholder="请选择类型" class="filter-item" style="width: 300px" @change="clickPrizeType">
                 <el-option :key="item.dictValue" v-for="item in dataTypeList" :label="item.dictLabel" :value="item.dictValue">
                         </el-option>
                 </el-select>

+ 1 - 1
src/views/raffleManage/raffleList.vue

@@ -79,7 +79,7 @@
             <el-input style="width: 300px" v-model="dataForm.title"></el-input>
           </el-form-item>
           <el-form-item  label="状态">
-              <el-radio-group v-model="dataForm.status">
+              <el-radio-group :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.status">
                   <el-radio :label="'0'">关闭</el-radio>
                   <el-radio :label="'1'">开启</el-radio>
               </el-radio-group>