Merge branch 'dev1.0.1' of http://192.168.0.200:3000/suf/factoring-trade-c-front-end into chang1

src/api/myTrade/acceptanceManagement/index.js

@@ -194,8 +194,9 @@ export function getHisDetails(params) {
 // 验收单-申请审核
 export function applyApproval(params) {
   return request({
-    url: '/acceptance/applyApproval/' + params,
-    method: 'get'
+    url: '/acceptance/applyApproval',
+    method: 'get',
+    params
   })
 }
 

src/views/myTrade/acceptanceManagement/index.vue

@@ -68,7 +68,7 @@ export default {
         status: '',
         fastSearch: ''
       },
-      applyId: ''
+      applyRow: {}
     }
   },
   computed: {
@@ -201,13 +201,14 @@ export default {
 
     // 申请
     apply(row) {
-      this.applyId = row.id
+      this.applyRow = row
       this.$refs.receiveDialog.show = true
     },
 
     // 确认申请
     applySure() {
-      applyApproval(this.applyId).then(res => {
+      const { id, taskId } = this.applyRow
+      applyApproval({ Loading: true, id, taskId }).then(res => {
         if (res.success) {
           this.$message.success('申请成功')
           this.$refs.receiveDialog.show = false

src/views/myTrade/acceptanceManagement/indexTable.js

@@ -108,8 +108,7 @@ export default {
                   icon: 'iconfont icon-orange icon-a-Group8151',
                   category: 'apply'
                 })
-              }
-              if ((row.stage === '录入验收单' || row.stage === '签署确认') && !row.businessApprovalStatus) {
+              } else if (row.stage === '录入验收单' || row.stage === '签署确认') {
                 btnList.push({
                   msg: '处理',
                   icon: 'iconfont icon-orange icon-a-Group8151',