换班管理功能提交(90%)

imcs-ui/src/views/zuihou/classScheduleMgr/shiftChangeMgr/Index.vue

@@ -253,9 +253,7 @@
               picker.$emit('pick', [start, end]);
             }
           }]
-        },
-        applyList: [],
-        changeList: []
+        }
 	    }
 	  },
 	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
@@ -404,11 +402,9 @@
 	        })
 	        return
 	      }
-	      // 根据换班id查询用户之前的换班的
-        this.queryUserApplyData(row)
-        this.queryUserChangeData(row)
-	      this.$refs.edit.setTenant(row,this.applyList,this.changeList, this.dicts)
-	      this.$refs.edit.type = "edit"
+	      // 根据换班id查询用户之前的换班的          
+		  this.$refs.edit.type = "edit"
+	      this.$refs.edit.setTenant(row, this.dicts)		        
 	      this.dialog.title = this.$t("common.edit")
 	      this.dialog.isVisible = true
 	    },
@@ -531,25 +527,7 @@
                   this.search()
               }
           })
-      },
-      queryUserApplyData(row){
-        shiftChangeMgrApi.queryUserApplyData(row).then(response => {
-          response = response.data
-          if (response.isSuccess) {
-            // 返回修改的用户换班信息
-            this.applyList = response.data
-          }
-        })
-      },
-      queryUserChangeData(row){
-        shiftChangeMgrApi.queryUserChangeData(row).then(response => {
-          response = response.data
-          if (response.isSuccess) {
-            // 返回修改的用户换班信息
-            this.changeList = response.data
-          }
-        })
-      },
+      }	 
 	  }
 	}
 </script>

imcs-ui/src/views/zuihou/classScheduleMgr/shiftChangeMgr/components/Edit.vue

@@ -30,7 +30,7 @@
       <el-form-item :label='$t("calssSchedule.table.staffChange.model")+"："' prop="" style="border-bottom: 1px solid #EEEEEE;">
       	<template>
 				  <el-checkbox-group v-model="tenant.applyList">
-				    <el-checkbox v-for="item in this.applyCheckbox" :key="item.id" :label="item.id">{{item.name.data}}</el-checkbox>
+				    <el-checkbox v-for="item in this.applyCheckbox" :key="item.id" :label="item.id" :value="item.id" @change="changeValue(item, $event)" >{{item.name.data}}</el-checkbox>
 				  </el-checkbox-group>
 				</template>
       </el-form-item>
@@ -55,8 +55,8 @@
       </el-form-item>
       <el-form-item :label='$t("calssSchedule.table.staffChange.remark")+"："' prop="changeList">
       	<template>
-				  <el-checkbox-group v-model="tenant.changeList">
-				    <el-checkbox v-for="item in this.updateCheckbox" :key="item.id" :label="item.id">{{item.name.data}}</el-checkbox>
+				  <el-checkbox-group v-model="tenant.changeList" >
+				    <el-checkbox v-for="item in this.updateCheckbox" :key="item.id" :label="item.id" :value="item.id" @change="changeValue(item, $event)" >{{item.name.data}}</el-checkbox>
 				  </el-checkbox-group>
 				</template>
       </el-form-item>
@@ -98,11 +98,9 @@ export default {
       width: this.initWidth(),
       confirmDisabled: false,
       loginUserId: null,
-      deptUserList: [],
-        applyList: [],
-        changeList: [],
-      applyCheckbox: [1471036400953458688],  // 【更换班表-申请人】
-      updateCheckbox: [1471036672111017984],  // 【更换班表-更换人】
+      deptUserList: [],      
+      applyCheckbox: [],  // 【更换班表-申请人】
+      updateCheckbox: [],  // 【更换班表-更换人】
       dicts:{
         NATION: {}
       },
@@ -143,10 +141,7 @@ export default {
 	    return this.$store.state.account.user
 	  },
   },
-  created() {
-      // 调用常量-审核状态
-      // this.queryUserApplyData()
-      // this.queryUserChangeData()
+  created() {     
   },
   mounted () {
   	// this.applyList = this.$constWKS.CASCADERLIST,
@@ -196,7 +191,7 @@ export default {
           this.applyClassList(false, userId, moment(val).format('YYYY-MM-DD'))
       }
   	},
-    initTenant () {
+    initTenant () {      
       return {
         id: '',
         name: '',
@@ -220,14 +215,14 @@ export default {
       }
     },
     setTenant (val, dicts) {
-    	if(val){
-    		this.tenant = { ...val }
-        this.type = "edit"
-    	}
-    	if(this.type ==="edit"){
-    	  this.applyClassList(true, val.applyUserId, val.applyTime)
+    	if(val){        
+        this.queryUserApplyData(val)
+        this.queryUserChangeData(val)
+        this.tenant = { ...val }
+        this.applyClassList(true, val.applyUserId, val.applyTime)
         this.applyClassList(false, val.changeUserId, val.changeTime)
-      }
+    		
+    	}    	
       // 字典表
       this.dicts = dicts
     },
@@ -240,6 +235,9 @@ export default {
       this.$refs.form.resetFields()
       this.tenant = this.initTenant()
     },
+    changeValue(item, event){
+        console.log(item)
+    },
     submitForm () {
       this.$refs.form.validate((valid) => {
         if (valid) {
@@ -324,8 +322,8 @@ export default {
         response = response.data
         if (response.isSuccess) {
             // 返回修改的用户换班信息
-            this.applyList = response.data
-            console.log(this.applyList)
+            this.tenant.applyList = response.data
+            console.log(this.tenant.applyList)
         }
       })
     },
@@ -334,8 +332,8 @@ export default {
         response = response.data
         if (response.isSuccess) {
             // 返回修改的用户换班信息
-            this.changeList = response.data
-            console.log(this.changeList)
+            this.tenant.changeList = response.data
+            console.log(this.tenant.changeList)
         }
       })
     },