提交修改

src/views/modules/result/record/approval-add-or-update.vue

@@ -23,9 +23,10 @@
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" v-if="auth.approvelCommit === 1 && status !== 5 " @click="commitRecord(2)">通过</el-button>
+      <el-button type="primary" v-if="auth.approvelCommit === 1 && status === 1 " @click="commitRecord(2)">通过</el-button>
-      <el-button type="primary" v-if="auth.waitCommit===1 && status !== 5 " @click="commitRecord(3)">通过</el-button>
+      <el-button type="primary" v-if="auth.waitCommit===1 && status === 1 " @click="commitRecord(3)">通过</el-button>
-      <el-button type="primary" v-if="status === 5 && auth.reject == 1" @click="commitRecord(5)">驳回</el-button>
+      <el-button type="primary" v-if="auth.reject === 1 && status === 5" @click="commitRecord(5)">驳回</el-button>
+      <el-button type="primary" v-if="auth.dissatisfied === 1 && status === 6" @click="commitRecord(6)">申述</el-button>
     </span>
   </el-dialog>
 </template>

src/views/modules/result/record/lzresultrecord.vue

@@ -138,6 +138,10 @@ export default {
         return '审批通过'
       } else if (status === 5) {
         return '驳回'
+      } else if (status === 6) {
+        return '申述中'
+      } else if (status === 7) {
+        return '己终止'
       }
       return ''
     },
@@ -183,7 +187,10 @@ export default {
         {value: '1', label: '审批中'},
         {value: '2', label: '拒绝'},
         {value: '3', label: '审批中'},
-        {value: '4', label: '审批通过'}
+        {value: '4', label: '审批通过'},
+        {value: '5', label: '驳回'},
+        {value: '6', label: '申述中'},
+        {value: '7', label: '己终止'}
       ],
       departmentList1: [],
       departmentList2: [],

src/views/modules/result/record/lzresultrecordapp.vue

@@ -63,8 +63,6 @@
         </div>
       </el-form-item>
 
-
-
       <el-form-item label="备注">
         <el-input v-model="dataForm.remark" placeholder="备注" clearable></el-input>
       </el-form-item>
@@ -73,7 +71,7 @@
         <el-button size="mini" type="primary"   @click="getDataList()">查询</el-button>
       </el-form-item>
 
-      <el-form-item label="">
+      <el-form-item label="" v-if="departmentLevel=='HR'">
         <el-select v-model="dataForm.batchOpt" placeholder="批量操作" clearable filterable>
           <el-option
             v-for="item in batchOpts"
@@ -84,17 +82,17 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item>
+      <el-form-item v-if="departmentLevel=='HR'">
-        <el-button size="mini" type="primary" style="" @click="">提交</el-button>
+        <el-button size="mini" type="primary"  @click="submitBt('你确定要批量操作吗？')">批量操作</el-button>
       </el-form-item>
     </el-form>
 
     <el-tabs type="border-card" v-model="tabValue" @tab-click="tabChange">
-      <el-tab-pane label="审批中" name="1,2,5"></el-tab-pane>
+      <el-tab-pane  label="审批中" name="1,2,5"></el-tab-pane>
-      <el-tab-pane label="全部" name="1,2,3,4,5"></el-tab-pane>
+      <el-tab-pane label="全部" name="1,2,3,4,5,6,7"></el-tab-pane>
-      <el-tab-pane label="批量提交" name="3"></el-tab-pane>
+      <el-tab-pane v-if="departmentLevel=='HR'" label="批量提交" name="3"></el-tab-pane>
       <el-tab-pane label="审批通过" name="4"></el-tab-pane>
-
+      <el-tab-pane v-if="departmentLevel=='HR'" label="申述中" name="6"></el-tab-pane>
       <el-table
         :data="dataList"
         border
@@ -181,6 +179,10 @@ export default {
         return '审批通过'
       } else if (status === 5) {
         return '驳回'
+      } else if (status === 6) {
+        return '申述中'
+      } else if (status === 7) {
+        return '己终止'
       }
       return ''
     },
@@ -197,10 +199,16 @@ export default {
     return {
       batchOpts: [{
         id: 1,
-        opt: '批量提交'
+        opt: '提交审批'
       }, {
         id: 2,
-        opt: '批量终止'
+        opt: '终止流程'
+      }, {
+        id: 3,
+        opt: '申述无效'
+      }, {
+        id: 4,
+        opt: '领导重新打分'
       }],
       Datalist: [{
         Month: 1,
@@ -221,7 +229,8 @@ export default {
         department1: '',
         department2: '',
         department3: '',
-        status: '1,2,5'
+        status: '1,2,5',
+        batchOpt: 1
       },
       dataList: [],
       pageIndex: 1,
@@ -244,7 +253,8 @@ export default {
       tabValue: '1,2,5',
       isChangeDepartmentrtment: 0,
       isHiden: false,
-      departmentReaderOnly: false
+      departmentReaderOnly: false,
+      departmentLevel: 'ME'
     }
   },
   computed: {},
@@ -280,14 +290,15 @@ export default {
         }
       })
     },
-    submitBt (msg = '你确定要提交吗？') {
+    submitBt (msg = '你确定要批量操作吗？') {
       this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         recordIdsSubmit({
-          'recordIds': this.recordIdsSelect.join(',')
+          'recordIds': this.recordIdsSelect.join(','),
+          'batchOpt': this.dataForm.batchOpt
         }).then(data => {
           this.alertInfo(data.msg)
           this.getDataList()
@@ -347,6 +358,7 @@ export default {
         if (data && data.code === 0) {
           this.dataList = data.page.list
           this.totalPage = data.page.totalCount
+          this.departmentLevel = data.departmentLevel
           if (this.isChangeDepartmentrtment === 0) {
             this.departmentList1 = data.departmentList1
             this.departmentList2 = data.departmentList2
@@ -400,7 +412,6 @@ export default {
       this.pageIndex = val
       this.getDataList()
     },
-
     // 多选
     selectionChangeHandle (val) {
       this.dataListSelections = val

src/views/modules/result/record/recorddetail.vue

@@ -50,7 +50,7 @@
             <el-button type="primary"  size="mini" @click="commitApprovalAddOrUpdate('你确定要申述吗？',6)"><label >申述</label></el-button>
           </div>
 
-          <div class="bottom" v-if="this.auth.submited == 1" >
+          <div class="bottom" v-if="this.auth.cancel == 1" >
             <el-button type="primary"  size="mini" @click="commitApprovalYes('你确定要撤回吗？',7)"><label >撤回</label></el-button>
           </div>