Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/contractManagement/acquisitionContract.vue

@@ -304,6 +304,10 @@
           {
             value: '已完成',
             type: 2,
+          },
+           {
+            value: '审批中',
+            type: 4,
           },
           {
             value: '全部合同',

src/views/contractManagement/collectionContract.vue

@@ -236,6 +236,10 @@
           {
             value: '已完成',
             type: 2,
+          },
+           {
+            value: '审批中',
+            type: 4,
           },
           {
             value: '全部合同',

src/views/contractManagement/purchaseContract.vue

@@ -303,6 +303,10 @@
           {
             value: '已完成',
             type: 2,
+          },
+           {
+            value: '审批中',
+            type: 4,
           },
           {
             value: '全部合同',

src/views/contractManagement/salesContract.vue

@@ -336,6 +336,10 @@
           {
             value: '未回款',
             type: 3,
+          },
+           {
+            value: '审批中',
+            type: 4,
           },
           {
             value: '全部合同',
@@ -546,7 +550,6 @@
       },
 
       getList() {
-        
         getList({
             compId: localStorage.getItem('ws-pf_compId'),
             contractType: this.contractType,

src/views/contractManagement/storageContract.vue

@@ -222,6 +222,10 @@
             value: '已完成',
             type: 2,
           },
+          {
+            value: '审批中',
+            type: 4,
+          },
           {
             value: '全部合同',
             type: '',

src/views/personnelManagement/cardReplacementManagement.vue

@@ -50,6 +50,7 @@
             <template slot-scope="scope">
               <el-button v-if='scope.row.approveStatus' @click="pass(scope.row)" type="primary">通过</el-button>
               <el-button v-if='scope.row.approveStatus' @click="reject(scope.row)" type="primary">驳回</el-button>
+              <span v-if="scope.row.status">{{scope.row.status}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -59,18 +60,6 @@
         layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
       </el-pagination>
     </div>
-    <el-dialog width='50%' :visible.sync="dialogVisible2" :title="title1">
-      <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}"
->
-        <div style='width:100%;justify-content: space-between;' class='flex'>
-          <div style='width:33.333%;text-align:left;'>{{item.operateUser}}</div>
-          <div style='width:33.333%;text-align:center;'>{{item.dealMsg!='请款'?item.approveResult==1?'通过':'驳回':item.dealMsg}}</div>
-          <div style='width:33.333%;text-align:right;'>{{item.operateDate}}</div>
-        </div>
-        <div v-if='index<recordList.length-1' style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
-        <div v-else style='width:100%;text-align:left;'>审核意见：{{item.verifyRemark}}</div>
-      </div>
-    </el-dialog>
     <WinseaContentModal v-model="fujianshow" :title="title"
       @on-cancel="handleClose">
     </WinseaContentModal>

src/views/personnelManagement/leaveList.vue

@@ -1,8 +1,14 @@
 //请假管理
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="8">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="left"> 
+        <el-col :span="24">
+          <el-button style="margin-left:20px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
+          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">待审核</el-button>
+          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">已通过</el-button>
+          <el-button @click="typeChange(3)" :type="searchType == 3?'primary':''">已驳回</el-button>
+        </el-col>
         <el-date-picker v-model="value2" type="daterange" align="left" unlink-panels range-separator="至"
           start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
@@ -32,7 +38,19 @@
       <el-table-column prop="startDate" label="开始日期"></el-table-column>
       <el-table-column prop="endDate" label="结束日期"> </el-table-column>
       <el-table-column prop="leaveDuration" label="时长"></el-table-column>
-      <el-table-column width='150' prop="approveStatus" label="状态"></el-table-column>
+      <el-table-column width='150' prop="approveStatus" label="状态">
+        <template slot-scope="scope">
+              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
+              <span v-else>{{scope.row.status}}</span>
+            </template>
+      </el-table-column>
+      <el-table-column prop="address" label="操作">
+            <template slot-scope="scope">
+              <el-button v-if='scope.row.approveStatus' @click="pass(scope.row)" type="primary">通过</el-button>
+              <el-button v-if='scope.row.approveStatus' @click="reject(scope.row)" type="primary">驳回</el-button>
+              <span v-if="scope.row.status">{{scope.row.status}}</span>
+            </template>
+          </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
       :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
@@ -43,6 +61,9 @@
   import {
     getLeavePc,
   } from '@/model/personnelManagement/index'
+  import {
+    woekflowhandle
+  } from '@/model/tasksport/index'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
 
@@ -82,7 +103,7 @@
         outerVisibleAdd: false,
         outerVisibleReturn: false,
         contractType: 2,
-        searchType: 1,
+        searchType: '',
         // 提交类型
         submitType: true,
         size: 10,
@@ -153,6 +174,20 @@
         this.searchType = state
         this.getList()
       },
+      typeChange(num) {
+        if (num == null || num == '') {
+          this.searchType = ''
+        } 
+        else if (num == 1) {
+          this.searchType = 1
+        }else if(num == 2){
+          this.searchType = 2
+        }else{
+          this.searchType = 3
+        }
+        this.currentPage = 1
+        this.getList()
+      },
       //列表查询
       getList() {
         getLeavePc({
@@ -160,6 +195,7 @@
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             searchKeyWord: this.searchKeyWord,
+            searchType:this.searchType,
             theStartDate: this.startDate,
             theEndDate: this.endDate,
           })
@@ -182,6 +218,74 @@
         this.currentPage = 1
         this.getList()
       },
+      pass(row){
+        if(row.taskId){
+          this.$confirm('确认通过请假申请？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            woekflowhandle({
+              taskId: row.taskId,
+              approved:true,
+              auditMind: '34',
+              needReapply: true,
+            }).toPromise()
+            .then((response) => {
+              this.$message({
+                message: '通过成功!',
+                type: 'success',
+              })
+              this.getList()
+            }).catch((response) => {
+              this.$message({
+                message: '通过失败!',
+                type: 'error',
+              })
+            })
+          })
+        }else{
+          this.$message({
+            message: '暂无此权限!',
+            type: 'warning',
+          })
+        }
+      },
+      reject(row){
+        if(row.taskId){
+          this.$confirm('确认驳回请假申请？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            woekflowhandle({
+              taskId: row.taskId,
+              approved:false,
+              auditMind: '34',
+              needReapply: true,
+            }).toPromise()
+            .then((response) => {
+              this.$message({
+                message: '驳回成功!',
+                type: 'success',
+              })
+              this.getList()
+            }).catch((response) => {
+              this.$message({
+                message: '驳回失败!',
+                type: 'error',
+              })
+            })
+          })
+        }else{
+          this.$message({
+            message: '暂无此权限!',
+            type: 'warning',
+          })
+        }
+      },
     },
   }
 </script>