From 3dd68388cb58903ee3f14d0578f2227b21f40f50 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 26 Oct 2021 14:15:04 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=EF=BC=9A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E5=AD=98=E6=A1=A3=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                           | 10 ++++++++--
 .../expenditureContract/ExpenditureContractDetail.vue  |  4 ++--
 .../expenditureContract/ExpenditureContractList.vue    |  8 ++++----
 .../modules/RevenueContractAduitModule.vue             |  4 ++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 15f9aae..28e902d 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -21,7 +21,7 @@ const submitAudit = (param) => postAction('/contract/payIncomeContract/submitAud
 // 获取不存在成员单位的工作组信息
 const getWorkingGroupListByNotCompany = (param) => getAction('/project/payWorkingGroup/queryListByNotCompany', param)
 // 收入合同存档
-const archiveRevenueContract = (param) => postAction('contract/payIncomeContract/archive', param)
+const archiveRevenueContract = (param) => postAction('/contract/payIncomeContract/archive', param)
 // 根据部门id获取用户信息
 const queryUserByDepartId = (param) => getAction('/sys/user/listRoleAndDepart', param)
 // 企业联系人新建重名校验
@@ -78,6 +78,10 @@ const checkCompanyAduit = (param) => getAction('/payMailContract/payMailContract
 const getAllDepartTreeList = (param) => getAction('/sys/sysDepart/queryTreeAllList', param)
 // 验证项目是否关联合同
 const getIsAssociatedProject = (param) => getAction('/contract/payIncomeContract/getAssociatedProject', param)
+// 支出合同审核
+const aduitExpenditureContract = (param) => postAction('/contract/paySpendingContract/audit', param)
+// 支出合同存档
+const archiveExpenditureContract = (param) => postAction('/contract/paySpendingContract/archive', param)
 
 export {
   getWorkingGroupById,
@@ -118,5 +122,7 @@ export {
   sysReminders,
   checkCompanyAduit,
   getAllDepartTreeList,
-  getIsAssociatedProject
+  getIsAssociatedProject,
+  aduitExpenditureContract,
+  archiveExpenditureContract
 }
diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
index 27ffb05..c8396ba 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractDetail.vue
@@ -203,7 +203,7 @@
 <script>
 import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_revenue_contract.png'
-import { archiveRevenueContract, getExpenditureContractById } from '../../../api/incomePaymentsApi'
+import { archiveExpenditureContract, getExpenditureContractById } from '../../../api/incomePaymentsApi'
 import RevenueContractAduitModule from '../revenueContract/modules/RevenueContractAduitModule'
 
 export default {
@@ -373,7 +373,7 @@ export default {
             contractId: id,
             contractStatus: 5
           }
-          archiveRevenueContract(param).then((res) => {
+          archiveExpenditureContract(param).then((res) => {
             if (res.success) {
               that.$message.success(res.message)
               that.initDetailData()
diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
index 50a5153..72a926c 100644
--- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
+++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue
@@ -121,7 +121,7 @@ import IconImg from '@assets/imgs/icon/icon_revenue_contract.png'
 import { JeroListMixin } from '../../../mixins/JeroListMixin'
 import { RangeDateMixin } from '../../../mixins/RangeDateMixin'
 import JDate from '../../../components/tools/JDate'
-import { archiveRevenueContract } from '../../../api/incomePaymentsApi'
+import { archiveExpenditureContract } from '../../../api/incomePaymentsApi'
 import RevenueContractAduitModule from '../revenueContract/modules/RevenueContractAduitModule'
 
 export default {
@@ -161,8 +161,8 @@ export default {
         }, {
           title: '合同编号',
           align: 'center',
-          dataIndex: 'contractNum',
           width: 280,
+          dataIndex: 'contractNum',
           scopedSlots: { customRender: 'projectName' }
         }, {
           title: '合同名称',
@@ -231,7 +231,7 @@ export default {
      * @param id
      */
     toContractDetail(id) {
-      console.log(id)
+      debugger
       this.$router.push({
         path: '/contractManagement/ExpenditureContractDetail',
         query: {
@@ -265,7 +265,7 @@ export default {
             contractId: id,
             contractStatus: 5
           }
-          archiveRevenueContract(param).then((res) => {
+          archiveExpenditureContract(param).then((res) => {
             if (res.success) {
               that.$message.success(res.message)
               that.loadData()
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
index a3094ab..1651af3 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { aduitRevenueContract } from '../../../../api/incomePaymentsApi'
+import { aduitRevenueContract, aduitExpenditureContract } from '../../../../api/incomePaymentsApi'
 import { USER_INFO } from '../../../../store/mutation-types'
 import Vue from 'vue'
 import pick from 'lodash.pick'
@@ -98,7 +98,7 @@ export default {
           if (this.contractType === 1) {
             methodFunction = aduitRevenueContract
           } else {
-            methodFunction = ''
+            methodFunction = aduitExpenditureContract
           }
           methodFunction(formData).then((res) => {
             if (res.success) {