From 1aa54777f758378849784b1cfbabdb845e68018f Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Sat, 25 Apr 2020 12:10:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcurementContractApproval.js                    |  4 ++--
 .../ContractApprovalQuery/index.vue                   |  5 -----
 .../ProcurementContractApproval/index.vue             | 11 ++++++++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js
index 25f5d332..1900dd7c 100644
--- a/src/api/WorkshopProcurement/ProcurementContractApproval.js
+++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js
@@ -58,7 +58,7 @@ export function searchTable2(num) {
     }
   })
 }
-export function submitApproval(num, num1, num2, num3) {
+export function submitApproval(num, num1, num2, num3, num4) {
   return request({
     url: '',
     method: 'post',
@@ -67,7 +67,7 @@ export function submitApproval(num, num1, num2, num3) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '采购管理_合同审批_修改数据',
-      param: '采购合同流水号=' + num + '&请购单流水号=' + num3 + '&审批情况流水号=' + num1 + '&未通过原因=' + num2
+      param: '采购合同流水号=' + num + '&请购单流水号=' + num3 + '&审批情况流水号=' + num1 + '&未通过原因=' + num2 + '&审批人=' + num4
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
index f03e2139..a8e37752 100644
--- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
@@ -49,11 +49,6 @@
             {{ scope.row.合同总额 }}
           </template>
         </el-table-column>
-        <el-table-column label="交货日期" align="center" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.交货日期 }}
-          </template>
-        </el-table-column>
         <el-table-column label="提交时间" align="center" width="90">
           <template slot-scope="scope">
             {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '' }}
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index fef82eb0..0c8dd13c 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -359,6 +359,7 @@
 import { initContract, initBuyer, searchTable1, searchTable2, submitApproval, searchTable3 } from '@/api/WorkshopProcurement/ProcurementContractApproval'
 import $ from 'jquery'
 import QRCode from 'qrcode'
+import { mapGetters } from 'vuex'
 
 export default {
   data() {
@@ -426,6 +427,14 @@ export default {
       contractValue: '' // 显示表2和变更合同用的变量
     }
   },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
   created() {
     this.fetchData()
     this.searchTable1()
@@ -503,7 +512,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.Open_disable = true
-          submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因, this.QGNUM).then(response => {
+          submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因, this.QGNUM, this.id).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('审批成功')
               this.dialogVisible3 = false