sunny před 2 roky
rodič
revize
df299e4120
2 změnil soubory, kde provedl 21 přidání a 13 odebrání
  1. 9 1
      src/api/public.js
  2. 12 12
      src/views/welfareManage/welfareList.vue

+ 9 - 1
src/api/public.js

@@ -14,4 +14,12 @@ export function companyTypeList(query) {
       method: 'post',
       data:query
     })
-}
+  }
+
+  export function allUserList(query) {
+    return request({
+      url: '/sys/user/getAll',
+      method: 'post',
+      data:query
+    })
+  }

+ 12 - 12
src/views/welfareManage/welfareList.vue

@@ -57,7 +57,7 @@
         </div>
         <!-- 添加或修改对话框 -->
         <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="70%">
-            <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px" style='width:700px;margin-left:50px;'>
+            <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="title">
                     <el-input v-model="dataForm.title" style="width: 350px"></el-input>
                 </el-form-item>
@@ -80,7 +80,7 @@
                 </el-form-item>
                 <el-form-item label="参与人">
                     <el-select v-model="participants" multiple filterable placeholder="请选择" style="width: 350px">
-                        <el-option :key="item.type" v-for="item in participantsList" :label="item.name" :value="item.type">
+                        <el-option :key="item.loginId" v-for="item in participantsList" :label="item.userName" :value="item.loginId">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -116,7 +116,7 @@
   
 <script>
 import { createItem, updateItem, welfareList, welfareState } from "@/api/welfareManage";
-import { companyTypeList, depTypeList } from "@/api/public";
+import { allUserList } from "@/api/public";
 import waves from "@/directive/waves"; // 水波纹指令
 import Tinymce from '@/components/Tinymce'
 
@@ -130,16 +130,16 @@ export default {
             participants:[],
             participantsList: [
                 {
-                    type: '1',
-                    name: '张三'
+                    loginId: '1',
+                    userName: '张三'
                 },
                 {
-                    type: '2',
-                    name: '李四'
+                    loginId: '2',
+                    userName: '李四'
                 },
                 {
-                    type: '3',
-                    name: '王五'
+                    loginId: '3',
+                    userName: '王五'
                 },
             ],
             list: [
@@ -214,7 +214,7 @@ export default {
         }
     },
     created() {
-        // this.getDepTypeList(); 
+        // this.getAllUserList(); 
         // this.getList();
     },
     methods: {
@@ -372,8 +372,8 @@ export default {
             })
 
         },
-        getDepTypeList() {
-            depTypeList().then(response => {
+        getAllUserList() {
+            allUserList().then(response => {
                 this.participantsList = response.data.data;
             }).catch(() => {
                 this.participantsList = []