Merge branch 'xqx' of yinet2020/YinetOASystemWeb into master

src/api/activiti/leave/leave.js

@@ -19,3 +19,10 @@ export function findLeave() {
     method: 'get',
   })
 }
+//查询账号名称 部门
+export function getDetail(id) {
+  return request({
+    url: '/system/leave/'+id,
+    method: 'get',
+  })
+}

src/views/system/actform/fawen/write1.vue

@@ -114,7 +114,7 @@
       </table>
     </el-form>
     <div slot="footer" class="dialog-footer"v-show="open3">
-      <el-button type="primary" @click="submitForm(1)">确 定</el-button>
+      <el-button type="primary" @click="submitForm(1)">提交</el-button>
       <el-button type="primary" @click="submitForm(0)">保存草稿</el-button>
       <el-button @click="cancel">取 消</el-button>
     </div>

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

@@ -6,7 +6,7 @@
           <h2 align="center">请假单</h2>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="请假事由" prop="actkey"  v-show="true">
+          <el-form-item label="请假事由" prop="actkey"  v-show="false">
             <el-input v-model="form.actkey" ></el-input>
           </el-form-item>
         </el-col>
@@ -15,7 +15,6 @@
             <el-input
               v-model="form.leavename"
               placeholder="请输入请假人"
-              clearable
               size="small"
               :disabled="true"
             />
@@ -26,7 +25,6 @@
             <el-input
               v-model="form.deptname"
               placeholder="请输入部门"
-              clearable
               size="small"
               :disabled="true"
             />
@@ -171,11 +169,16 @@
         <!--          </p>-->
         <!--        </el-col>-->
         <el-col :span="24" align="center">
-          <el-form-item size="large">
+          <el-form-item size="large" v-show="open3">
             <el-button type="primary" @click="submitForm" style="margin-left: -100px;">提交</el-button>
             <el-button @click="resetForm">重置</el-button>
           </el-form-item>
+          <el-form-item size="large" v-show="open4">
+            <el-button type="primary" @click="submitToDo()" >同意</el-button>
+            <el-button type="primary" @click="deleteToDo()" >拒绝</el-button>
+          </el-form-item>
         </el-col>
+
       </el-form>
     </el-row>
 
@@ -188,10 +191,11 @@
   </div>
 </template>
 <script>
-  import {  addLeave ,findLeave} from "@/api/activiti/leave/leave";
+  import {  addLeave ,findLeave,getDetail} from "@/api/activiti/leave/leave";
   import Treeselect from "@riophae/vue-treeselect";
   import SelectRen from '@/components/SelectRen';
   import SelectUserByDept from "@/components/SelectRen/selectUserByDept";
+  import {deleteToDoItem,submitToDoItem } from "@/api/activiti/form/fw";
   export default {
     name: "Leave",
     components: {
@@ -205,8 +209,11 @@
     data() {
       return {
         open:false,
-        tctitle: "",
+        title: "",
+        open3: false,
+        open4: false,
         leaveList: [],
+        flg: [],
         form: {
           positions: undefined,
           options: undefined,
@@ -258,6 +265,17 @@
       this.getName();
       this.form.actkey = this.data.getactkey;
       this.getList();
+      this.flg = this.data.flg;
+      if(this.flg==undefined){
+        this.open3=true;
+      }else if(this.flg=='1'){
+        this.form = this.data;
+        this.getDetails(this.data.formId);
+        this.open4=true;
+      }else {
+        this.form = this.data;
+        this.getDetails(this.data.formId);
+      }
     },
     methods: {
       //   GetNumberOfDays(date1,date2){//获得天数
@@ -272,7 +290,37 @@
       //       this.options = response.data;
       //     });
       // },
+      //获取详细信息
+      getDetails(id){
+        id=id.split(".")[1]
+        getDetail(id).then(response => {
+          this.form=response.data
+          this.form.daterange=JSON.parse(response.data.daterange)
+        });
+      },
+      submitToDo(){
+        this.loading = true;
+        submitToDoItem(this.form.taskid).then(response => {
+          this.msgSuccess("提交成功");
+          this.$emit('getList');
+        })
+      },
+      //拒绝按钮
+      deleteToDo(){
+        this.$confirm('是否确认拒绝这这个申请吗?', '警告', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteToDoItem(this.form.taskid).then(response => {
+            this.msgSuccess("拒绝成功")
+            this.$emit('getList');
+          })
+
+        }).catch(() => {
+        });
 
+      },
       getName(){
         this.loading = true;
         findLeave().then(response => {
@@ -281,7 +329,6 @@
           this.form.deptname = response.data[1];
           this.qjr = response.data[0];
           this.bumen = response.data[1];
-
           this.loading = false;
         });
 

src/views/system/actwork/havedone.vue

@@ -69,7 +69,7 @@
             size="small"
             type="text"
             icon="el-icon-share"
-            @click="details(scope.row)"
+            @click="detail(scope.row)"
           >审批进度</el-button>
         </template>
       </el-table-column>
@@ -223,7 +223,7 @@
         const form = row || this.form
         this.$router.push({path:'/actwork/havedone/havedetails',query: {bd:form,id:actkey }})
       },
-      details(row){
+      detail(row){
         this.dialogVisible = true
         //查看图片
         var formdata = new FormData