Browse Source

提交查看审批流

caojunjie 4 years ago
parent
commit
f547c97cc8
3 changed files with 83 additions and 15 deletions
  1. 10 0
      src/api/system/viewApproval.js
  2. 1 1
      src/views/finance/charge/index.vue
  3. 72 14
      src/views/viewApproval.vue

+ 10 - 0
src/api/system/viewApproval.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询数据
+export function listCharge(data) {
+  return request({
+    url: '/warehouse/paths/projectEndQueryPendingVal',
+    method: 'post',
+    data: data
+  })
+}

+ 1 - 1
src/views/finance/charge/index.vue

@@ -456,7 +456,7 @@
         <el-table-column label="品名" align="center" prop="fProductName"/>
         <el-table-column label="品名" align="center" prop="fProductName"/>
         <el-table-column label="业务日期" align="center" prop="fBsdate">
         <el-table-column label="业务日期" align="center" prop="fBsdate">
           <template slot-scope="scope">
           <template slot-scope="scope">
-            <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
+            <span>{{ scope.row.fBsdate.slice(0, 10)}}</span>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
         <el-table-column label="费用名称" align="center" prop="fFeeName"/>
         <el-table-column label="费用名称" align="center" prop="fFeeName"/>

+ 72 - 14
src/views/viewApproval.vue

@@ -1,47 +1,105 @@
 <template>
 <template>
   <el-dialog
   <el-dialog
-    title="标题"
+    title="查看审批流"
     :close-on-click-modal="false"
     :close-on-click-modal="false"
     :before-close="closeDialog"
     :before-close="closeDialog"
     :visible.sync="visible"
     :visible.sync="visible"
     :modal="false"
     :modal="false"
-    width="75%">
+    width="75%"
+  >
+    <el-table :data="auditList" tooltip-effect="dark" stripe style="width: 100%; margin-bottom: 20px">
+      <el-table-column
+        prop="levelId"
+        width="80"
+        label="序号"
+        type="index"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="nickName"
+        header-align="center"
+        align="center"
+        width="130"
+        label="节点人"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="auditStatus"
+        header-align="center"
+        width="130"
+        align="center"
+        label="状态"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.auditStatus === 'O'">提交</span>
+          <span v-if="scope.row.auditStatus === 'S'">待审</span>
+          <span v-if="scope.row.auditStatus === 'N'">等待</span>
+          <span v-if="scope.row.auditStatus === 'B'">审核退回</span>
+          <span v-if="scope.row.auditStatus === 'A'">审核通过</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="auditMsg"
+        header-align="center"
+        align="center"
+        label="意见"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="auditItem"
+        header-align="center"
+        width="250"
+        align="center"
+        label="提交时间"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.auditItem !== undefined">{{ scope.row.auditItem.slice(0,10)}}</span>
+          <span v-else>{{scope.row.auditItem}}</span>
+        </template>
+      </el-table-column>
+    </el-table>
     <span slot="footer" class="dialog-footer">
     <span slot="footer" class="dialog-footer">
-      <el-button @click="closeDia">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+      <el-button type="primary" @click="closeDia">关 闭</el-button>
     </span>
     </span>
   </el-dialog>
   </el-dialog>
 </template>
 </template>
 
 
 <script>
 <script>
-import {addCharge,reviewer,modify} from '@/api/system/auditPaths-add-or-update'
+import { listCharge } from '@/api/system/viewApproval'
 
 
 export default {
 export default {
-  data () {
+  data() {
     return {
     return {
       visible: false,
       visible: false,
+      auditList:[]
     }
     }
   },
   },
   methods: {
   methods: {
-    init (val) {
+    init(val) {
       this.optionsUsers = []
       this.optionsUsers = []
       this.visible = true
       this.visible = true
-      if (typeof val !== 'undefined') {
-        console.log(val)
-        this.queryAuditPath(val)
-      } else {
+      this.addCharge()
+    },
+    addCharge() {
+      let data = {
+        id: 448,
+        actId: 110
       }
       }
+      listCharge(data).then(data => {
+        console.log(data)
+        this.auditList = data.data
+      })
     },
     },
     // 表单提交
     // 表单提交
-    dataFormSubmit () {
+    dataFormSubmit() {
 
 
     },
     },
-    closeDialog (done) {
+    closeDialog(done) {
       this.visible = false
       this.visible = false
       this.$emit('refreshDataList')
       this.$emit('refreshDataList')
       Object.assign(this.$data, this.$options.data.call(this))
       Object.assign(this.$data, this.$options.data.call(this))
     },
     },
-    closeDia () {
+    closeDia() {
       this.visible = false
       this.visible = false
       this.$emit('refreshDataList')
       this.$emit('refreshDataList')
       Object.assign(this.$data, this.$options.data.call(this))
       Object.assign(this.$data, this.$options.data.call(this))