发票+任务+舱位

src/views/finance/feeSettlement/columns.tsx

@@ -238,8 +238,8 @@ export const searchFormSchema: FormSchema[] = [
     }
   },
   {
-    field: 'applicationNO',
-    label: '申请单号',
+    field: 'number',
+    label: '业务编号',
     colProps: { span: 4 },
     component: 'Input'
   },

src/views/finance/feeSettlement/index.vue

@@ -57,7 +57,7 @@
                 <span class="iconfont icon-dingdan"></span>
                 新建发票结算
             </a-button>
-            <a-button v-repeat type="link" >
+            <a-button v-repeat type="link">
                 <span class="iconfont icon-dingdan"></span>
                 生成凭证
             </a-button>
@@ -91,7 +91,7 @@
 </template>
 <script setup lang="ts">
 import { ref, reactive, onMounted, defineExpose, computed } from 'vue'
-import { PaymentSettlementGetList,PaymentSettlementDelete,PaymentSettlementSetLock } from './api.js'
+import { PaymentSettlementGetList, PaymentSettlementDelete, PaymentSettlementSetLock } from './api.js'
 import { BasicTable, useTable, TableAction } from '/@/components/Table'
 import { formatParams } from '/@/hooks/web/common'
 import { columns, searchFormSchema, detailColumns, feeColumns, feeColumnsSum } from './columns'
@@ -100,7 +100,7 @@ import { SvgIcon } from '/@/components/Icon'
 const { createMessage } = useMessage()
 import { useGo } from '/@/hooks/web/usePage'
 const go = useGo()
-const [registerTable, { reload, setLoading, getSelectRows, getRawDataSource }] = useTable({
+const [registerTable, { reload, setLoading, getSelectRows, getForm }] = useTable({
     api: async (p) => {
         const res: API.DataResult = await PaymentSettlementGetList(p)
         return new Promise((resolve) => {
@@ -108,7 +108,23 @@ const [registerTable, { reload, setLoading, getSelectRows, getRawDataSource }] =
         })
     },
     beforeFetch: (p) => {
-        return formatParams(p)
+        const data = formatParams(p)
+        data.otherQueryCondition = {}
+        if (getForm().getFieldsValue().number) {
+            data.otherQueryCondition.number = getForm().getFieldsValue().number
+        }
+        let queryData1 = [] as any
+        if (formatParams(p).queryCondition) {
+            queryData1 = JSON.parse(formatParams(p).queryCondition)
+        }
+        let i = queryData1.length
+        while (i--) {
+            if (queryData1[i].FieldName === 'number') {
+                queryData1.splice(i, 1)
+            }
+        }
+        data.queryCondition = JSON.stringify(queryData1)
+        return data
     },
     columns,
     formConfig: {
@@ -187,10 +203,10 @@ function handleLock() {
 function GoDetailed(row) {
     if (row.modeText == '发票结算') {
         go("/feeSettlementDetail?id=" + row.id + '&type=invoice')
-    } 
+    }
     if (row.modeText == '自由结算') {
         go("/feeSettlementDetail?id=" + row.id + '&type=free')
-    } 
+    }
 }
 
 

src/views/operation/invoiceApply/columns.tsx

@@ -84,7 +84,7 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'applicationNO',
+    field: 'number',
     label: '编号',
     component: 'Input',
     colProps: { span: 4 },
@@ -125,7 +125,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '所属分部',
-    dataIndex: 'orgName',
+    dataIndex: 'saleDeptName',
     width: 100,
     align: 'left',
   },

src/views/operation/invoiceApply/index.vue

@@ -29,7 +29,7 @@
               </a-tooltip>
               <a-tooltip placement="top" :mouseEnterDelay="0.5">
                 <template #title>
-                  <span>删除</span>
+                  <span>提交审核</span>
                 </template>
                 <span class="ds-action-svg-btn">
                   <a-popconfirm title="确定提交审核吗？" @confirm="handleApply" ok-text="是" cancel-text="否">
@@ -39,7 +39,7 @@
               </a-tooltip>
               <a-tooltip placement="top" :mouseEnterDelay="0.5">
                 <template #title>
-                  <span>删除</span>
+                  <span>撤销审核</span>
                 </template>
                 <span class="ds-action-svg-btn">
                   <a-popconfirm title="确定撤销审核吗？" @confirm="handleWithdraw" ok-text="是" cancel-text="否">
@@ -76,8 +76,9 @@
             <span v-else>{{ record.currency }}</span>
           </template>
           <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>
+            <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>
@@ -125,7 +126,7 @@ import { formatParams } from '/@/hooks/web/common'
 import { useAppStore } from '/@/store/modules/app'
 const appStore = useAppStore()
 //   表格
-const [registerTable, { reload, getPaginationRef, getSelectRows, getRawDataSource }] = useTable({
+const [registerTable, { reload, getForm, getSelectRows, getRawDataSource }] = useTable({
   title: '',
   api: async (p) => {
     const res: API.DataResult = await GetList(p)
@@ -135,7 +136,23 @@ const [registerTable, { reload, getPaginationRef, getSelectRows, getRawDataSourc
   },
   // 请求前的参数格式化
   beforeFetch: (p) => {
-    return formatParams(p)
+    const data = formatParams(p)
+    data.otherQueryCondition = {}
+    if (getForm().getFieldsValue().number) {
+      data.otherQueryCondition.number = getForm().getFieldsValue().number
+    }
+    let queryData1 = [] as any
+    if (formatParams(p).queryCondition) {
+      queryData1 = JSON.parse(formatParams(p).queryCondition)
+    }
+    let i = queryData1.length
+    while (i--) {
+      if (queryData1[i].FieldName === 'number') {
+        queryData1.splice(i, 1)
+      }
+    }
+    data.queryCondition = JSON.stringify(queryData1)
+    return data
   },
   columns,
   formConfig: {
@@ -154,7 +171,7 @@ const [registerTable, { reload, getPaginationRef, getSelectRows, getRawDataSourc
   indexColumnProps: {
     width: 60,
   },
-  id:'44',
+  id: '44',
   canResize: true,
   immediate: true,
   actionColumn: {
@@ -173,10 +190,10 @@ function GoDetailed(type, data) {
   }
 }
 const copyNo = (e, v) => {
-    e.stopPropagation()
-    navigator.clipboard.writeText(v)
-    createMessage.success("复制成功")
-  }
+  e.stopPropagation()
+  navigator.clipboard.writeText(v)
+  createMessage.success("复制成功")
+}
 // 删除
 function FnDel() {
   let ids = []

src/views/operation/invoiceIssue/columns.tsx

@@ -28,7 +28,7 @@ const FeeRangeList = [
 ]
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'mblno:hblno:bookingNO:customerNo',
+    field: 'number',
     label: '编号检索',
     component: 'Input',
     colProps: { span: 4 },
@@ -608,9 +608,25 @@ export const applySearch: FormSchema[] = [
   },
   {
     label: '申请类型',
-    component: 'Input',
+    component: 'Select',
     colProps: { span: 4 },
-    field: 'feeType',
+    field: 'mode',
+    componentProps: {
+      options: [
+        {
+          label: '普通发票',
+          value: '0',
+        },
+        {
+          label: '电子发票',
+          value: '1',
+        },
+        {
+          label: '纸质发票',
+          value: '2',
+        },
+      ],
+    },
   },
 ]
 

src/views/operation/invoiceIssue/index.vue

@@ -115,7 +115,7 @@ import { useMessage } from '/@/hooks/web/useMessage'
 const { createMessage } = useMessage()
 import { useGo } from '/@/hooks/web/usePage'
 const go = useGo()
-const [registerTable, { reload, setLoading, getSelectRows, getRawDataSource }] = useTable({
+const [registerTable, { reload, setLoading, getSelectRows, getForm }] = useTable({
     api: async (p) => {
         const res: API.DataResult = await GeneralInvoiceGetList(p)
         invoiceAmount.value = res.data.invoiceAmount
@@ -125,7 +125,23 @@ const [registerTable, { reload, setLoading, getSelectRows, getRawDataSource }] =
         })
     },
     beforeFetch: (p) => {
-        return formatParams(p)
+        const data = formatParams(p)
+        data.otherQueryCondition = {}
+        if (getForm().getFieldsValue().number) {
+            data.otherQueryCondition.number = getForm().getFieldsValue().number
+        }
+        let queryData1 = [] as any
+        if (formatParams(p).queryCondition) {
+            queryData1 = JSON.parse(formatParams(p).queryCondition)
+        }
+        let i = queryData1.length
+        while (i--) {
+            if (queryData1[i].FieldName === 'number') {
+                queryData1.splice(i, 1)
+            }
+        }
+        data.queryCondition = JSON.stringify(queryData1)
+        return data
     },
     columns,
     formConfig: {
@@ -229,27 +245,32 @@ function GoDetailed(row) {
 .SvgImg {
     width: 12px;
 }
-.main{
+
+.main {
     flex-direction: column;
 }
+
 .calc {
     position: fixed;
     display: flex;
     bottom: 10px;
     margin-left: 20px;
+
     .title {
-      font-size: 14px;
-      font-weight: 700;
+        font-size: 14px;
+        font-weight: 700;
     }
+
     .count {
-      font-size: 14px;
-      font-weight: 700;
-      color: #257AFA;
+        font-size: 14px;
+        font-weight: 700;
+        color: #257AFA;
     }
+
     .box {
-      background: #F5F9FC;
-      margin-left: 10px;
-      padding: 0 5px;
+        background: #F5F9FC;
+        margin-left: 10px;
+        padding: 0 5px;
     }
-  }
+}
 </style>