新增津贴状态

src/api/axios.js

 import axios from 'axios'
 import qs from 'qs'
 // axios.defaults.baseURL = 'http://192.168.1.101:8300' // 本地荣
-// axios.defaults.baseURL = 'http://192.168.1.102:8300' // 本地钱
-axios.defaults.baseURL = 'http://139.196.213.18:8300' // beta环境
+axios.defaults.baseURL = 'http://192.168.1.102:8300' // 本地钱
+// axios.defaults.baseURL = 'http://139.196.213.18:8300' // beta环境
 let loadingInstance // 创建Loading 的实例
 // axios.defaults.headers.post['Content-Type'] = 'application/json; charset=utf-8'
 // axios.defaults.crossDomain = true

src/api/constant.js

@@ -24,5 +24,11 @@ const MINGPAY_RECORDS_STATUS = {
   WAITING_PERMIT: 'WAITING_PERMIT', // 退款等待审批
   REFUND_SUCCESS: 'REFUND_SUCCESS' // 退款成功
 }
+// 津贴状态
+const MINGPAY_SUBSIDY_STATUS = {
+  SUCCESS: 'SUCCESS',
+  WAITING_PERMIT: 'WAITING_PERMIT',
+  REFUSE_PERMIT: 'REFUSE_PERMIT'
+}
 
-export { MINGPAY_CONSTANT, MINGPAY_ACCOUNT_STATUS, MINGPAY_CHARGE_ORDERSTATUS, MINGPAY_RECORDS_STATUS }
+export { MINGPAY_CONSTANT, MINGPAY_ACCOUNT_STATUS, MINGPAY_CHARGE_ORDERSTATUS, MINGPAY_RECORDS_STATUS, MINGPAY_SUBSIDY_STATUS }

src/components/pages/PaymentManagement/AllowancePayment.vue

@@ -24,12 +24,17 @@
         <span slot="recipient">成员</span>
         <span slot="money">金额</span>
         <span slot="type" slot-scope="type">{{ type === 'TRAVEL' ? '交通补助' : '餐补' }}</span>
-        <span slot="grantNumber">单号</span>
+        <!-- <span slot="grantNumber">单号</span> -->
         <span slot="agentId">经办人</span>
         <span slot="createTime" slot-scope="createTime">
           {{ createTimeToStr(createTime) }}
         </span>
         <span slot="remark">备注</span>
+        <span slot="couponRecordStatus" slot-scope="couponRecordStatus">
+          <a-badge v-if="couponRecordStatus === MINGPAY_SUBSIDY_STATUS.WAITING_PERMIT" status="processing" text="审批中" />
+          <a-badge v-else-if="couponRecordStatus === MINGPAY_SUBSIDY_STATUS.SUCCESS" status="success" text="已完成" />
+          <a-badge v-else-if="couponRecordStatus === MINGPAY_SUBSIDY_STATUS.FAILED" status="error" text="审批未通过" />
+        </span>
         <span slot="action" slot-scope="text, record, index" class="operationTable">
           <a href="javascript:;" @click="toAllowanceDetails(record, text, index)">查看详情</a>
         </span>
@@ -90,12 +95,13 @@
 <script>
 import { config } from './../../../api/config.js'
 import { $http } from './../../../api/axios.js'
-import { MINGPAY_RECORDS_STATUS } from './../../../api/constant'
+import { MINGPAY_SUBSIDY_STATUS } from './../../../api/constant'
 import moment from 'moment'
 export default {
   name: 'AllowancePayment',
   data () {
     return {
+      MINGPAY_SUBSIDY_STATUS: MINGPAY_SUBSIDY_STATUS,
       spinning: false,
       delayTime: 100,
       formItemLayout: {
@@ -111,7 +117,7 @@ export default {
       columns: [{
         title: '成员',
         dataIndex: 'recipient',
-        width: '20%'
+        width: '200px'
       }, {
         title: '金额',
         dataIndex: 'money'
@@ -119,13 +125,19 @@ export default {
         title: '津贴类型',
         dataIndex: 'type',
         scopedSlots: { customRender: 'type' }
-      }, {
-        title: '单号',
-        dataIndex: 'grantNumber'
-      }, {
+      },
+      // {
+      //   title: '单号',
+      //   dataIndex: 'grantNumber'
+      // },
+      {
         title: '经办人',
         dataIndex: 'agentId'
       }, {
+        title: '状态',
+        dataIndex: 'couponRecordStatus',
+        scopedSlots: { customRender: 'couponRecordStatus' }
+      }, {
         title: '备注',
         dataIndex: 'remark'
       }, {