Merge branch 'master' of http://123.56.95.229:10010/r/高精

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

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
@@ -315,7 +324,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '取消操作'
+          message: '已取消操作'
         })
       })
     },
@@ -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