update

src/api.js

@@ -97,6 +97,10 @@ export default {
 	delUser: params => {
 		return axios.delete(`${baseURL}/api/admin/user`, { params: params });
 	},
+	// 删除管理员
+	getUserInfo: params => {
+		return axios.get(`${baseURL}/api/admin/user`, { params: params });
+	},
 	// 获取数据
 	getPlayerRecord: params => {
 		return axios.get(`${baseURL}/api/admin/player/record/list`, { params: params });

src/views/data/index.vue

@@ -28,9 +28,9 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="4">
-                    <el-form-item label="比赛日期">
+                    <el-form-item label="持股日期">
                         <el-date-picker
-                        v-model="queryParams.date"
+                        v-model="queryParams.stock_date"
                         type="date"
                         placeholder="选择日期"
                         format="yyyy-MM-dd"
@@ -131,24 +131,24 @@
                         <template slot="append">万元</template>
                     </el-input>
                 </el-form-item>
+                <el-form-item label="开超市" prop="is_markt">
+                    <el-switch
+                        v-model="form.is_markt">
+                    </el-switch>
+                </el-form-item>
                 <el-form-item label="股票名称" prop="today_stock">
                     <div v-for="(item,index) in form.today_stock" :key='index' style="margin-bottom:5px;">
                         <!-- <el-select  filterable v-model="item.name" placeholder="请选择股票" style="width:48%;display:inline-block">
                             <el-option v-for="item in stockList" :key='item.id' :label="item.label" :value="item.label"></el-option>
                         </el-select> -->
-                        <el-input style="width:48%;display:inline-block" v-model="item.name" placeholder="请输入股票名称"></el-input>
-                        &nbsp;<el-input style="width:39%" clearable v-model="item.fund" placeholder="资金">
+                        <el-input style="width:48%;display:inline-block" v-model="item.name" placeholder="请输入股票名称" :disabled="form.is_markt==true"></el-input>
+                        &nbsp;<el-input style="width:39%" clearable v-model="item.fund" placeholder="资金" :disabled="form.is_markt==true">
                             <template slot="append">万元</template>
                         </el-input>
                         <i @click="form.today_stock.splice(index,1)" style="margin-top:5px;" class="el-icon-circle-close del"></i>
                     </div>
                     <el-button @click="addCode" type="primary" size="small" plain>新增股票</el-button>
                 </el-form-item>
-                <el-form-item label="开超市" prop="is_markt">
-                    <el-switch
-                        v-model="form.is_markt">
-                    </el-switch>
-                </el-form-item>
                 <el-form-item label="股票截图" prop="today_stock_img">
                     <div class="imgs" v-for="(item,index) in form.today_stock_img" :key='index'>
                         <img  width="150" :src="item" alt="">
@@ -181,10 +181,11 @@ export default {
             loading:false,
             queryParams:{
                 match_id:0,
-                page:1
+                page:1,
+                stock_date:this.getNowDate()
             },
             form:{
-                
+                stock_date:this.getNowDate()
             },
             list:[{},{}],
             total:0,
@@ -220,6 +221,14 @@ export default {
         }
     },
     methods:{
+        getNowDate(){
+            var y=new Date().getFullYear() 
+            var m=Number(new Date().getMonth() + 1)
+            var d = new Date().getDate()
+            m=m>9?m:'0'+m;
+            d=d>9?d:'0'+d
+            return y+'-'+m+'-'+d;
+        },
         downloadExcel(){
             this.$api.downloadRecords(this.queryParams).then((res)=>{
                 var elink = document.createElement('a');
@@ -276,7 +285,8 @@ export default {
             this.title='新增数据';
             this.form={
                 today_stock:[{code: "", name:"",fund:''}],
-                today_stock_img:[]
+                today_stock_img:[],
+                stock_date:this.getNowDate()
             }
         },
         addCode(){

src/views/match/group.vue

@@ -27,6 +27,7 @@
         </el-form>
         <el-table v-loading='loading' :data="list" style="width: 100%;margin-top:10px;" height="50vh">
                 <el-table-column align="center" prop="name" label="分组名称"/>
+                <el-table-column align="center" prop="match_name" label="比赛名称"/>
                 <el-table-column align="center"  prop="join_count" label="参赛人数"/>
                 <el-table-column align="center"  prop="out_count" label="退赛人数"/>
                 <el-table-column align="center"  prop="date" label="操作">

src/views/user/index.vue

@@ -35,7 +35,7 @@
                 <!-- <el-table-column align="center"  prop="date" label="资产"/> -->
                 <el-table-column align="center"  prop="date" label="操作">
                     <template slot-scope="scope">
-                        <el-button @click="title='编辑用户',open=true,form=scope.row" size="mini" type="warning">编辑</el-button>
+                        <el-button @click="edit(scope.row.id)" size="mini" type="warning">编辑</el-button>
                         <el-button @click="del(scope.row.id)" size="mini" type="danger">删除</el-button>
                     </template>
                 </el-table-column>
@@ -127,6 +127,13 @@ export default {
             this.title='新增用户';
             this.form={}
         },
+        edit(id){
+            this.title = "编辑用户"
+            this.$api.getUserInfo({id:id}).then(res=>{
+                this.form = res.data.data
+                this.open = true
+            })
+        },
         /** 提交按钮 */
         submitForm() {
             this.$refs["form"].validate(valid => {