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

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}`
     }
   })
 }

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
     }
   })
 }

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
     }
   })
 }