shenji 1 år sedan
förälder
incheckning
07c21096bb

+ 1 - 1
src/views/activiti/doneManage.vue

@@ -87,7 +87,7 @@
           </a-table-column> -->
 
           <!-- 审批操作 -->
-          <a-table-column title="审批操作" dataIndex="deleteReason" :width="100" align="center">
+          <a-table-column title="结果" dataIndex="deleteReason" :width="100" align="center">
             <template slot-scope="t, r, i">
               <template v-if="r.deleteReason == '审批通过'">
                 <!-- <a-tag color="#87d068">{{ t }}</a-tag> -->

+ 10 - 6
src/views/oa/EnrollmentList.vue

@@ -396,13 +396,17 @@
       },
       handleAddUser(){
         console.log(this.userSelected);
-        let u = this.userSelected;
-        let user = {
-          username : u.user_id,
-          realname: u.user_cn_name,
+        if(this.userSelected.user_id){
+          let u = this.userSelected;
+          let user = {
+            username : u.user_id,
+            realname: u.user_cn_name,
+          }
+          this.handleEdit(user,'新增');
+          this.newUserVisible = false;
+        }else{
+          this.$message.warning('请先选择员工')
         }
-        this.handleEdit(user,'新增');
-        this.newUserVisible = false;
       },
       handleSubmit(id){
         let that = this;

+ 1 - 1
src/views/oa/my-plan/add/savePlan.vue

@@ -244,7 +244,7 @@ export default {
                                 this.$message.success('新增成功')
                                 this.addForm.resetFields() // 清空表单
                                 this.$refs.JEditor.myValue = ''
-                                this.calTableMethod()
+                                this.fatherMethod()
                             }
                         })
                     }