Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online

src/api/financialCase.js

@@ -279,3 +279,11 @@ export function batchReject(data) {
     data
   })
 }
+
+export function refreshPayStatus(params) {
+  return request({
+    url: '/pay/manage/online-payment/compensationCallBack',
+    method: 'get',
+    params
+  })
+}

src/views/financial/cashDetails/index.vue

@@ -1006,10 +1006,9 @@ export default {
           numberToCurrencyNo(obj.serviceCharge),
           numberToCurrencyNo(obj.incomeTax),
           numberToCurrencyNo(obj.issuedAmount),
-          numberToCurrencyNo(obj.settleCashAmount),
+          '',
-          numberToCurrencyNo(obj.settleServiceCharge),
+          '',
-          numberToCurrencyNo(obj.settleIncomeTax),
+          '',
-          numberToCurrencyNo(obj.settleIssuedAmount),
           '',
           '',
           '',

src/views/financial/onlinePayDetails/index.vue

@@ -295,12 +295,14 @@
           >
             <template slot-scope="scope">
               <el-button
+                v-show="scope.row.payStatus !== 1"
+                v-has-buttons="['OnlinePayDetailsRefreshStatus']"
                 style="color: #ffad41"
                 type="text"
                 size="small"
-                @click="toFixed(scope.row.pkId)"
+                @click="refreshStatus(scope.row)"
               >
-                {{ '导出' }}
+                刷新状态
               </el-button>
             </template>
           </el-table-column>
@@ -476,6 +478,16 @@ export default {
         return 'success-row'
       }
       return ''
+    },
+    refreshStatus({ businessCode }) {
+      api.refreshPayStatus({ businessCode }).then((res) => {
+        if (res.code === 200) {
+          this.$message.success('刷新成功')
+          this.getDataList()
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
     }
   }
 }