From 695cd30fa0bb262515c7fe942b45975e59130d46 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 14 Mar 2020 11:02:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Inventory/PurchaseInRecord/index.vue         | 2 +-
 src/views/ManufacturingCenter/PartAssignment/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue
index 56f9c850..54aa8850 100644
--- a/src/views/Inventory/PurchaseInRecord/index.vue
+++ b/src/views/Inventory/PurchaseInRecord/index.vue
@@ -156,7 +156,7 @@ export default {
       param[12] = ['入库时间_check', check7]
       param[13] = ['入库开始时间', this.inTime[0]]
       param[14] = ['入库结束时间', this.inTime[1]]
-      var Data = this.CreateData('00', '报表_采购部仓库_入库记录_查询', param)
+      var Data = this.CreateData('2001', '报表_采购部仓库_入库记录_查询', param)
       this.exportExcel_NPOI(Data)
     },
     fetchData() {
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 6334119e..e878789e 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -639,7 +639,7 @@ export default {
       if (this.RequisitionList !== '') {
         var param = []
         param[0] = ['请购单流水号', this.RequisitionList]
-        var Data = this.CreateData('00', '报表_制造中心-制造_零件分配_查询', param)
+        var Data = this.CreateData('2001', '报表_制造中心制造_零件分配_查询', param)
         this.exportExcel_NPOI(Data)
       }
     },

From eb67b4a6a07a8653d18aa4cc0499f70d3a199660 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 14 Mar 2020 11:54:23 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/PurchasingCenter/PurchaseContractReview.js  |  4 ++--
 .../PurchaseContractReview/index.vue                | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/api/PurchasingCenter/PurchaseContractReview.js b/src/api/PurchasingCenter/PurchaseContractReview.js
index 10880f5e..14bc80c1 100644
--- a/src/api/PurchasingCenter/PurchaseContractReview.js
+++ b/src/api/PurchasingCenter/PurchaseContractReview.js
@@ -85,7 +85,7 @@ export function searchTable2(num) {
   })
 }
 // 执行审核
-export function submitApproval(num, num1, num2) {
+export function submitApproval(num, num1, num2, id) {
   return request({
     url: '',
     method: 'post',
@@ -94,7 +94,7 @@ export function submitApproval(num, num1, num2) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '采购管理_合同审核_采购部_修改数据',
-      param: '采购合同流水号=' + num + '&审核情况流水号=' + num1 + '&未通过审核原因=' + num2
+      param: '采购合同流水号=' + num + '&审核情况流水号=' + num1 + '&未通过审核原因=' + num2 + '&审批人=' + id
     }
   })
 }
diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
index 7125ea6f..473494ed 100644
--- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
@@ -164,6 +164,7 @@
 <script>
 import { initContract, initBuyer, searchTable1, searchTable2, submitApproval, initPerson } from '@/api/PurchasingCenter/PurchaseContractReview'
 import axios from 'axios'
+import { mapGetters } from 'vuex'
 
 export default {
   data() {
@@ -222,6 +223,14 @@ export default {
       contractValue: '' // 显示表2和变更合同用的变量
     }
   },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
   created() {
     this.fetchData()
     this.searchTable1()
@@ -300,7 +309,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        submitApproval(this.ProcurementContractNum, 1, '').then(response => {
+        submitApproval(this.ProcurementContractNum, 1, '', this.id).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('审核成功')
             this.dialogVisible3 = false
@@ -326,7 +335,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       }).then(({ value }) => {
-        submitApproval(this.ProcurementContractNum, 2, value).then(response => {
+        submitApproval(this.ProcurementContractNum, 2, value, this.id).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('审核成功')
             this.dialogVisible3 = false

From 8358199e053724c2aa4048e6eb8c8907d12bb641 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 14 Mar 2020 12:09:10 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/PurchasingCenter/PurchaseContractApproval.js |  4 ++--
 .../PurchaseContractApproval/index.vue               | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/api/PurchasingCenter/PurchaseContractApproval.js b/src/api/PurchasingCenter/PurchaseContractApproval.js
index ffc2c6c5..e19d7dd7 100644
--- a/src/api/PurchasingCenter/PurchaseContractApproval.js
+++ b/src/api/PurchasingCenter/PurchaseContractApproval.js
@@ -72,7 +72,7 @@ export function searchTable2(num) {
   })
 }
 // 执行审批
-export function submitApproval(num, num1, num2) {
+export function submitApproval(num, num1, num2, id) {
   return request({
     url: '',
     method: 'post',
@@ -81,7 +81,7 @@ export function submitApproval(num, num1, num2) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '采购管理_合同审批_采购部_修改数据',
-      param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2
+      param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2 + '&审核人=' + id
     }
   })
 }
diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
index 6fdae74f..9ba54063 100644
--- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
@@ -146,6 +146,8 @@
 import { initContract, initBuyer, searchTable1, searchTable2, submitApproval } from '@/api/PurchasingCenter/PurchaseContractApproval'
 import QRCode from 'qrcode'
 import $ from 'jquery'
+import { mapGetters } from 'vuex'
+
 export default {
   data() {
     return {
@@ -194,6 +196,14 @@ export default {
       contractValue: '' // 显示表2和变更合同用的变量
     }
   },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
   created() {
     this.fetchData()
     this.searchTable1()
@@ -245,7 +255,7 @@ export default {
     submitApproval(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因).then(response => {
+          submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因, this.id).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('审批成功')
               this.dialogVisible3 = false

From 32e868cf3d5c6bdeb9fa81aa345d5dfc16d546e5 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 14 Mar 2020 17:04:56 +0800
Subject: [PATCH 4/5] a

---
 src/views/PurchasingCenter/PurchaseContractReview/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
index 473494ed..0dc3c1f4 100644
--- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
@@ -324,7 +324,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '取消操作'
+          message: '已取消操作'
         })
       })
     },

From 7ca8fbef232b9aedc4f43eb733d66a13b9ce3e22 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 14 Mar 2020 20:08:39 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=AF=B7=E6=AC=BE=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RequestApprovalQuery.js                   |  6 +-
 .../ContractApprovalQuery/index.vue           | 10 +++
 .../RequestApprovalQuery/index.vue            | 66 +++++++++++++++++--
 3 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/src/api/ManufacturingCenter/RequestApprovalQuery.js b/src/api/ManufacturingCenter/RequestApprovalQuery.js
index bba12053..6e9f60f8 100644
--- a/src/api/ManufacturingCenter/RequestApprovalQuery.js
+++ b/src/api/ManufacturingCenter/RequestApprovalQuery.js
@@ -30,7 +30,7 @@ export function searchTable1(radio, check1, supplier, check2, start, end, check3
     }
   })
 }
-// 采购合同明细查询
+// 查询离线合同请款信息明细
 export function searchTable2(num) {
   return request({
     url: '',
@@ -39,8 +39,8 @@ export function searchTable2(num) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '采购管理_采购合同内容_查询数据',
-      param: '采购合同流水号=' + num
+      name: '采购管理_采购合同_请款明细_查询数据',
+      param: `采购合同请款流水号=${num}`
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
index 96389547..ae856b55 100644
--- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
@@ -74,6 +74,15 @@
             {{ scope.row.审核情况内容 }}
           </template>
         </el-table-column>
+        <el-table-column label="操作" align="center" width="90px" fixed="right">
+          <template slot-scope="scope">
+            <el-tooltip :open-delay="1000" effect="dark" content="物料移出采购计划" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" @click="searchTable2(scope.row)">详情</el-button>
+              </div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
@@ -169,6 +178,7 @@ export default {
       this.contractValue = parseInt(row.采购合同流水号)
       searchTable2(this.contractValue).then(response => {
         this.returns = response.data[0].合同内容
+        this.dialogFormVisible = true
       })
     },
     handleSizeChange1(val) {
diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
index 2d5fea93..1a4e0788 100644
--- a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
@@ -25,6 +25,7 @@
       <el-radio v-model="radio" label="2" style="margin: 0 0 0 10px">通过</el-radio>
       <el-radio v-model="radio" label="3" style="margin: 0 0 0 10px">未过</el-radio>
       <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
+      <el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
     </el-card>
     <el-card style="margin-top: 5px">
       <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
@@ -58,6 +59,15 @@
             {{ scope.row.审核情况内容 }}
           </template>
         </el-table-column>
+        <el-table-column label="操作" align="center" width="90px" fixed="right">
+          <template slot-scope="scope">
+            <el-tooltip :open-delay="1000" effect="dark" content="物料移出采购计划" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" @click="searchTable2(scope.row)">详情</el-button>
+              </div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
@@ -71,6 +81,31 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
+
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="请款信息明细" center width="800px">
+      <el-table :data="gridData1" border highlight-current-row size="mini">
+        <el-table-column min-width="150" align="center" label="合同编号">
+          <template slot-scope="scope">
+            {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column width="120" align="center" label="到货金额(元)" prop="到货金额">
+          <template slot-scope="scope">
+            {{ parseFloat(scope.row.到货金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column width="120" align="center" label="已付金额(元)" prop="已付金额">
+          <template slot-scope="scope">
+            {{ parseFloat(scope.row.已付金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column width="120" align="center" label="请款金额(元)" prop="请款金额">
+          <template slot-scope="scope">
+            {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -92,7 +127,7 @@ export default {
       tableData1: [],
       loading1: false,
       dialogFormVisible: false,
-      returns: ''
+      gridData1: []
     }
   },
   computed: {
@@ -132,10 +167,33 @@ export default {
         this.total1 = response.data.total
       })
     },
+    exportTable() {
+      var check1, check2, check3
+      this.billNames ? check1 = 1 : check1 = 0
+      this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
+      this.personValue ? check3 = 1 : check3 = 0
+      var param = []
+      param[0] = ['查询全部', this.radio]
+      param[1] = ['供应商名称_check', check1]
+      param[2] = ['供应商名称', this.billNames]
+      param[3] = ['时间段_check', check2]
+      if (check2 === 0) {
+        param[4] = ['开始时间', '']
+        param[5] = ['结束时间', '']
+      } else {
+        param[4] = ['开始时间', this.dateRange[0]]
+        param[5] = ['结束时间', this.dateRange[1]]
+      }
+      param[6] = ['人员编号_check', check3]
+      param[7] = ['人员编号', this.personValue]
+      var Data = this.CreateData('2001', '报表_采购管理_情况审核查询_查询数据', param)
+      this.exportExcel_NPOI(Data)
+    },
     searchTable2(row) {
-      this.contractValue = parseInt(row.采购合同流水号)
-      searchTable2(this.contractValue).then(response => {
-        this.returns = response.data[0].合同内容
+      this.gridData1 = []
+      searchTable2(row.采购合同请款流水号).then(response => {
+        this.gridData1 = response.data
+        this.dialogFormVisible = true
       })
     },
     handleSizeChange1(val) {