付款全流程测试

src/views/finance/paymentSettlement/columns.tsx

@@ -17,6 +17,7 @@ export const columns: BasicColumn[] = [
     title: '结算单位',
     dataIndex: 'customerName',
     sorter: true,
+    align: 'left',
     width: 130
   },
   {
@@ -24,6 +25,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'billType',
     sorter: true,
     width: 80,
+    align: 'left',
     customRender: ({ text }) => {
       if (text === 1) {
         return '收费'
@@ -37,12 +39,14 @@ export const columns: BasicColumn[] = [
     title: '结算方式',
     dataIndex: 'modeText',
     sorter: true,
+    align: 'left',
     width: 80
   },
   {
     title: '币别',
     dataIndex: 'currency',
     sorter: true,
+    align: 'left',
     width: 80
   },
   {
@@ -69,31 +73,36 @@ export const columns: BasicColumn[] = [
     title: '未开票',
     dataIndex: 'unInvoiceAmount',
     sorter: true,
+    align: 'left',
     width: 100
   },
   {
     title: '结算时间',
     dataIndex: 'settlementDate',
     sorter: true,
-    width: 100
+    align: 'left',
+    width: 90
   },
   {
     title: '结算人',
     dataIndex: 'createByName',
     sorter: true,
+    align: 'left',
     width: 100
   },
   {
     title: '结算账户',
     dataIndex: 'customerBank',
     sorter: true,
-    width: 100
+    align: 'left',
+    width: 120
   },
   {
     title: '银行账号',
     dataIndex: 'customerAccount',
     sorter: true,
-    width: 100
+    align: 'left',
+    width: 120
   },
   {
     title: '原始金额',
@@ -106,12 +115,14 @@ export const columns: BasicColumn[] = [
     title: '申请单号',
     dataIndex: 'applicationNO',
     sorter: true,
-    width: 100
+    align: 'left',
+    width: 120
   },
   {
     title: '总账凭证号',
     dataIndex: 'ledgerVoucherNO',
     sorter: true,
+    align: 'left',
     width: 100
   }
 ]

src/views/finance/paymentSettlement/detail/components/businessTable.vue

@@ -80,6 +80,13 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   import { Divider } from 'ant-design-vue'
   import { formatParams } from '/@/hooks/web/common'
+  import { useRoute, useRouter } from 'vue-router'
+  import { useGo } from '/@/hooks/web/usePage'
+  import { useMultipleTabStore } from '/@/store/modules/multipleTab'
+  const tabStore = useMultipleTabStore()
+  const go = useGo()
+  const route = useRoute()
+  const router = useRouter()
   const emit = defineEmits(['save', 'refresh'])
   const { createMessage } = useMessage()
   const props = defineProps({
@@ -246,10 +253,18 @@
     })
     loading.value = true
     Save(bPostData.value).then(res => {
-      console.log(bPostData.value)
       loading.value = false
-      if (res.succeeded) {
+      if (route.path == '/payment-settlement/create') {
+        // 新建
         createMessage.success('添加成功！')
+        const { fullPath } = route //获取当前路径
+        tabStore.closeTabByKey(fullPath, router)
+        setTimeout(() => {
+          go(`/payment-settlement/detail?id=${res.data.id}&type=1`)
+        }, 50)
+      } else {
+        // 保存
+        createMessage.success('保存成功！')
         if (res?.data?.id) {
           emit('refresh', res.data.id)
         }

src/views/finance/paymentSettlement/detail/index.vue

@@ -19,6 +19,7 @@
         ></ActionBar>
         <Divider
           type="vertical"
+          style="margin-top: 12px"
           class="action-divider"
         />
         <!-- <a-dropdown>

src/views/finance/paymentSettlement/index.vue

@@ -19,6 +19,7 @@
           ></ActionBar>
           <Divider
             type="vertical"
+            style="margin-top: 12px;"
             class="action-divider"
           />
           <div style="padding-top: 8px;">

src/views/operation/paidApply/detail/columns.tsx

@@ -559,6 +559,7 @@ export const searchFormSchema: FormSchema[] = [
         immediate: true,
         onChange: (v, obj) => {
           if (v && obj) formModel.customerId = obj.id
+          if (!v && !obj) formModel.customerId = null
         }
       }
     }

src/views/operation/paidApply/detail/index.vue

@@ -84,11 +84,16 @@
   import { BasicForm, useForm } from '/@/components/Form'
   import ApplyInfo from './components/applyInfo.vue'
   import { numberThousandFormat } from '/@/utils/commonUtil'
+  import { useMultipleTabStore } from '/@/store/modules/multipleTab'
   // 业务表格
   import BusinessTable from './components/businessTable.vue'
+  import { useGo } from '/@/hooks/web/usePage'
   const { createMessage } = useMessage()
-  import { useRoute } from 'vue-router'
+  const tabStore = useMultipleTabStore()
+  const go = useGo()
+  import { useRoute, useRouter } from 'vue-router'
   const route = useRoute()
+  const router = useRouter()
   const visible = ref(false)
   import { formSchema } from './columns'
   import { Save, Get, Delete, ApplyAudit } from '../api'
@@ -136,10 +141,17 @@
     Save(postData).then(res => {
       loading.value = false
       visible.value = false
-      if (res.succeeded) {
+      if (route.fullPath == '/paid-apply/create') {
+        // 新建成功
+        // 关闭当前页面
+        const { fullPath } = route //获取当前路径
+        tabStore.closeTabByKey(fullPath, router)
+        setTimeout(() => {
+          go(`/paid-apply/detail?id=${res.data.id}`)
+        }, 50)
+      } else {
         createMessage.success('保存成功')
         bid.value = res.data.id
-        visible.value = false
         init()
       }
     }).catch(() => {

src/views/operation/paidApply/index.vue

@@ -13,13 +13,15 @@
         <template v-if="column.dataIndex == 'applicationNO'">
           <span style="cursor: pointer"><span><span @click="copyNo($event, record.applicationNO)" class="iconfont icon-fuzhi11"></span>{{ record.applicationNO }}</span></span>
         </template>
-         <!-- <template v-if="column.dataIndex == 'statusText'">
-          <span v-if="record.status == 0" class="ds-blue-tag">{{ record.statusText }}</span>
-          <span v-else-if="record.status == 1" class="ds-green-tag">{{ record.statusText }}</span>
-          <span v-else-if="/^2|3|4|5|6$/.test(record.status)" class="ds-orange-tag">{{ record.statusText }}</span>
-          <span v-else-if="/^7|8$/.test(record.status)" class="ds-red-tag">{{ record.statusText }}</span>
-          <span v-else class="ds-purple-tag">{{ record.statusText }}</span>
-        </template> -->
+         <template v-if="column.dataIndex == 'statusText'">
+          <span>
+            <span v-if="record.status == 0" class="ds-blue-tag">{{ record.statusText }}</span>
+            <span v-else-if="record.status == 1" class="ds-green-tag">{{ record.statusText }}</span>
+            <span v-else-if="/^2|3|4|5|6$/.test(record.status)" class="ds-orange-tag">{{ record.statusText }}</span>
+            <span v-else-if="/^7|8$/.test(record.status)" class="ds-red-tag">{{ record.statusText }}</span>
+            <span v-else class="ds-purple-tag">{{ record.statusText }}</span>
+          </span>
+        </template>
         <template v-if="column.key === 'action'">
           <TableAction :actions="[
             {