请假申请

src/api/activiti/leave/leave.js

@@ -11,3 +11,11 @@ export function addLeave(data) {
     data: data
   })
 }
+
+//查询账号名称 部门
+export function findLeave() {
+  return request({
+    url: '/system/leave/list',
+    method: 'get',
+  })
+}

src/views/system/actform/leave/leave.vue

@@ -7,7 +7,7 @@
         </el-col>
         <el-col :span="8">
         <el-form-item label="请假事由" prop="activitiKey"  v-show="false">
-          <el-input v-model="form.activitiKey"></el-input>
+          <el-input v-model="form.activitiKey" ></el-input>
         </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -17,6 +17,7 @@
               placeholder="请输入请假人"
               clearable
               size="small"
+              :disabled="true"
             />
           </el-form-item>
         </el-col>
@@ -27,6 +28,7 @@
               placeholder="请输入部门"
               clearable
               size="small"
+              :disabled="true"
             />
           </el-form-item>
         </el-col>
@@ -128,8 +130,20 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="休息期间应急工作委托人" prop="consignor">
-            <el-input v-model="form.consignor" placeholder="请输入休息期间应急工作委托人" clearable
-                      :style="{width: '100%'}"></el-input>
+<!--            <el-input v-model="form.consignor" placeholder="请输入休息期间应急工作委托人" clearable-->
+<!--                      :style="{width: '100%'}"></el-input>-->
+            <el-input v-model="form.consignor" placeholder="请选择休息期间应急工作委托人" clearable="true" :disabled="true">
+              <template slot="append">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleSelect">
+                  选择人员
+                </el-button>
+              </template>
+            </el-input>
+<!--            <el-input v-model="formData.RecvAccount" v-show="false"/>-->
           </el-form-item>
         </el-col>
 
@@ -168,23 +182,32 @@
 <!--        <el-form-item label="actkey：" prop="mailTheme">-->
 <!--          <el-input v-model="form.actkey" type="textarea" placeholder="" />-->
 <!--        </el-form-item>-->
+    <!-- 选择人员对话框 -->
+    <select-user-by-dept ref="selectUserByDept" :title="title" :open="open"  @ok="selectOK"/>
 
   </div>
 </template>
 <script>
-  import {  addLeave } from "@/api/activiti/leave/leave";
+  import {  addLeave ,findLeave} from "@/api/activiti/leave/leave";
+  import Treeselect from "@riophae/vue-treeselect";
+  import SelectRen from '@/components/SelectRen';
+  import SelectUserByDept from "@/components/SelectRen/selectUserByDept";
   export default {
     name: "Leave",
-    components: {},
+    components: {
+      SelectRen,
+      Treeselect,
+      SelectUserByDept
+    },
     props: {
       data:'',
     },
     data() {
       return {
+        open:false,
+        tctitle: "",
         leaveList: [],
         form: {
-          leavename: undefined,
-          deptname: undefined,
           positions: undefined,
           options: undefined,
           reason: undefined,
@@ -225,16 +248,17 @@
         },
         options: [],
         time: [],
+        qjr:'',
+        bumen:'',
       }
     },
     computed: {},
     watch: {},
     created() {
+      this.getName();
       this.form.activitiKey = this.data;
       this.getList();
     },
-    mounted() {
-    },
     methods: {
   //   GetNumberOfDays(date1,date2){//获得天数
   //   //date1：开始日期，date2结束日期
@@ -248,6 +272,35 @@
   //       this.options = response.data;
   //     });
   // },
+
+      getName(){
+        this.loading = true;
+        findLeave().then(response => {
+          console.log(response.data)
+          this.form.leavename = response.data[0];
+          this.form.deptname = response.data[1];
+          this.qjr = response.data[0];
+          this.bumen = response.data[1];
+
+          this.loading = false;
+        });
+
+      },
+
+      /** ---------------收件人---------------*/
+      /** 写信中的 选择人员 按钮弹窗操作 */
+      handleSelect() {
+        this.$refs.selectUserByDept.childOpen=true;
+        this.open = true;
+        this.title = "选择收件人";
+      },
+      selectOK(zh, xm) {
+        // this.receiverAccount = zh;
+        this.form.consignor=xm;
+        this.open=false;
+      },
+      /** ---------------收件人end---------------*/
+
       hqtime(){
         let s1 =  this.form.daterange;
         let s2 = s1[0];
@@ -263,8 +316,6 @@
           this.form.statistics = time2
         }
        this.time=s1
-
-        alert(this.form.daterange)
         console.log(this.form.daterange)
         console.log(   JSON.stringify(this.time))
       },
@@ -310,16 +361,22 @@
       },
       resetForm() {
         this.form=[];
+        this.form.leavename = this.qjr;
+        this.form.deptname = this.bumen;
         // this.$refs['form'].resetFields()
       }
     }
   }
 </script>
 <style>
+  .v-modal{
+    z-index: 1999 !important;
+  }
   .qjform {
     border: 1px solid #eee;
     overflow: hidden;
-    width: 80%;
+    width: 100%;
+    padding: 0 20px;
     margin: 0 auto;
     box-shadow: 1px 1px 10px #c7c7c7;
   }

src/views/system/actwork/ActToDraft.vue

@@ -18,7 +18,7 @@
         </el-col>
       </el-row>
     </el-container>
-    <el-dialog id="actform" title="流程起草" :visible.sync="actOpen" :before-close="cancel" append-to-body width="90%"
+    <el-dialog id="actform" title="流程起草" :visible.sync="actOpen" :before-close="cancel" append-to-body width="80%"
                top="10" height="90%">
       <!-- 动态引入组件-->
       <component :is="actForm" :data="getactkey" @transferUser="getUser"></component>