From 00b7d03e68cf7b37f3593f55a525b26ddb202907 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 20 Apr 2019 10:26:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=AC=BE=E5=AE=A1=E6=A0=B8*2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/PurchasingCenter/FundApproval.js      |   8 +-
 .../PurchaseContractRequestFund.js            |   2 +-
 .../PurchasingCenter/FundApproval1/index.vue  | 296 ++++++++++++++++++
 .../OfflineContractRequestFund/index.vue      |  12 +
 .../PurchaseContractRequestFund/index.vue     |  14 +-
 5 files changed, 326 insertions(+), 6 deletions(-)
 create mode 100644 src/views/PurchasingCenter/FundApproval1/index.vue

diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js
index 9b76969f..4fe0d204 100644
--- a/src/api/PurchasingCenter/FundApproval.js
+++ b/src/api/PurchasingCenter/FundApproval.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询审批/付款
+// 查询审核/审批/付款
 export function initApproval(pageCurrent, pageSize, state) {
   return request({
     url: '',
@@ -13,7 +13,7 @@ export function initApproval(pageCurrent, pageSize, state) {
     }
   })
 }
-// 执行审批/付款
+// 执行审核/审批/付款
 export function execApproval(num1, num2, reason, person, state) {
   return request({
     url: '',
@@ -25,7 +25,7 @@ export function execApproval(num1, num2, reason, person, state) {
     }
   })
 }
-// 查询离线合同审批/付款
+// 查询离线合同审核/审批/付款
 export function initApprovalOffline(pageCurrent, pageSize, state) {
   return request({
     url: '',
@@ -62,7 +62,7 @@ export function searchRequsetFundDetail2(num) {
     }
   })
 }
-// 执行审批/付款（离线合同）
+// 执行审核/审批/付款（离线合同）
 export function execApprovalOffline(num1, num2, reason, person, state) {
   return request({
     url: '',
diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js
index d93c810c..4c8c7443 100644
--- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js
+++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js
@@ -47,7 +47,7 @@ export function searchSupplier() {
     }
   })
 }
-// 查询离线合同待请款信息
+// 采购合同请款
 export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) {
   return request({
     url: '',
diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue
new file mode 100644
index 00000000..54602e00
--- /dev/null
+++ b/src/views/PurchasingCenter/FundApproval1/index.vue
@@ -0,0 +1,296 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
+        <el-table-column label="供应商" align="center" min-width="170">
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="请款时间" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.请款时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="请款人" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
+          <template slot-scope="scope">
+            {{ scope.row.请款金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审核" align="center" width="320">
+          <template slot-scope="scope">
+            <el-popover placement="right" width="400" trigger="click">
+              <el-table :data="gridData1" stripe size="mini" show-summary>
+                <el-table-column width="50" align="center" type="index" label="序号"/>
+                <el-table-column min-width="150" align="center" label="采购合同编号">
+                  <template slot-scope="scope">
+                    {{ scope.row.采购合同编号 }}
+                  </template>
+                </el-table-column>
+                <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
+                  <template slot-scope="scope">
+                    {{ scope.row.请款金额 }}
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
+            </el-popover>
+            <el-button type="primary" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
+            <el-button type="danger" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent1"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize1"
+          :total="total1"
+          style="display:inline-block;width:50%"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
+        <el-table-column label="供应商" align="center" min-width="170">
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="请款时间" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.请款时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="请款人" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
+          <template slot-scope="scope">
+            {{ scope.row.请款金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审核" align="center" width="320">
+          <template slot-scope="scope">
+            <el-popover placement="right" width="400" trigger="click">
+              <el-table :data="gridData2" stripe size="mini" show-summary>
+                <el-table-column width="50" align="center" type="index" label="序号"/>
+                <el-table-column min-width="150" align="center" label="离线合同编号">
+                  <template slot-scope="scope">
+                    {{ scope.row.离线合同编号 }}
+                  </template>
+                </el-table-column>
+                <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
+                  <template slot-scope="scope">
+                    {{ scope.row.请款金额 }}
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
+            </el-popover>
+            <el-button type="primary" size="mini" icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
+            <el-button type="danger" size="mini" icon="el-icon-close" @click="noApprovalOffline(scope.row)">不通过</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent2"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize2"
+          :total="total2"
+          style="display:inline-block;width:50%"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange2"
+          @current-change="handleCurrentChange2"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { initApproval, execApproval, initApprovalOffline, searchRequsetFundDetail1, searchRequsetFundDetail2, execApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: '', // 管理审核
+  data() {
+    return {
+      tableData1: [],
+      pageSize1: 10,
+      pageCurrent1: 1,
+      total1: 0,
+      tableData2: [],
+      pageSize2: 10,
+      pageCurrent2: 1,
+      total2: 0,
+      gridData1: [],
+      gridData2: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.searchTable1()
+      this.searchTable2()
+    },
+    searchTable1() {
+      initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => {
+        console.log(response.data)
+        this.tableData1 = response.data.rows
+        this.total1 = response.data.total
+      })
+    },
+    handleSizeChange1(val) {
+      this.pageSize1 = val
+      this.pageCurrent1 = 1
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable1()
+    },
+    searchTable2() {
+      initApprovalOffline(this.pageCurrent2, this.pageSize2, 0).then(response => {
+        console.log(response.data.rows)
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+      })
+    },
+    handleSizeChange2(val) {
+      this.pageSize2 = val
+      this.pageCurrent2 = 1
+      this.searchTable2()
+    },
+    handleCurrentChange2(val) {
+      this.pageCurrent2 = val
+      this.searchTable2()
+    },
+    searchTable01(row) { // 查看详情（请款信息包含的合同）
+      searchRequsetFundDetail1(row.采购合同请款流水号).then(response => {
+        this.gridData1 = response.data
+      })
+    },
+    searchTable02(row) { // 查看详情（请款信息包含的合同）
+      searchRequsetFundDetail2(row.离线合同请款流水号).then(response => {
+        this.gridData2 = response.data
+      })
+    },
+    yesApproval(row) { // 通过审核
+      this.$confirm('确定审核通过?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        execApproval(row.采购合同请款流水号, 1, '通过', this.id, 0).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('执行成功')
+            this.searchTable1()
+          } else { this.$message.error('执行失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消操作'
+        })
+      })
+    },
+    noApproval(row) { // 不通过审核
+      this.$prompt('请输入不通过原因', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(({ value }) => {
+        execApproval(row.采购合同请款流水号, 2, value, this.id, 0).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('执行成功')
+            this.searchTable1()
+          } else { this.$message.error('执行失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消操作'
+        })
+      })
+    },
+    yesApprovalOffline(row) { // 通过审核
+      this.$confirm('确定审核通过?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        execApprovalOffline(row.离线合同请款流水号, 1, '通过', this.id, 0).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('执行成功')
+            this.searchTable2()
+          } else { this.$message.error('执行失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消操作'
+        })
+      })
+    },
+    noApprovalOffline(row) { // 不通过审核
+      this.$prompt('请输入不通过原因', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(({ value }) => {
+        execApprovalOffline(row.离线合同请款流水号, 2, value, this.id, 0).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('执行成功')
+            this.searchTable2()
+          } else { this.$message.error('执行失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消操作'
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .searchForm .el-form-item{
+    margin-bottom: 5px;
+  }
+  .el-tag{
+    margin: 0
+  }
+</style>
diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
index 985cda03..e7eab390 100644
--- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
@@ -54,6 +54,18 @@
           </template>
         </el-table-column>
         <el-table-column label="请款付款情况" align="center">
+          <el-table-column label="审核情况内容" width="100" align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
+              <el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
+              <el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="未通过审核原因" width="110" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
+            </template>
+          </el-table-column>
           <el-table-column label="审批情况内容" width="100" align="center">
             <template slot-scope="scope">
               <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index 2a23805d..28522fcc 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -107,6 +107,18 @@
           </template>
         </el-table-column>
         <el-table-column label="请款付款情况" align="center">
+          <el-table-column label="审核情况内容" width="100" align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
+              <el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
+              <el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="未通过审核原因" width="110" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
+            </template>
+          </el-table-column>
           <el-table-column label="审批情况内容" width="100" align="center">
             <template slot-scope="scope">
               <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
@@ -122,7 +134,7 @@
           <el-table-column label="付款情况" width="100" align="center">
             <template slot-scope="scope">
               <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
-              <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
+              <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已付款</el-tag>
               <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
             </template>
           </el-table-column>