Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/finance/feeSettlement/columns.tsx

@@ -407,7 +407,7 @@ export const detailForm: FormSchema[] = [
             }
             GetClientBankList(data).then((res) => {
               res.data.forEach(item => {
-                item.showName = item.bankName + ' ' + item.bankAccountNo
+                item.showName = item.bankName + ' ' + item.account
               })
               resolve(res)
             })
@@ -420,7 +420,7 @@ export const detailForm: FormSchema[] = [
         onChange: (e, obj) => {
           if (obj) {
             formModel.customerBankId = obj.id
-            formModel.customerAccount = obj.bankAccountNo
+            formModel.customerAccount = obj.account
           }
           if (!obj && !e) {
             formModel.customerBankId = ''
@@ -495,8 +495,8 @@ export const detailForm: FormSchema[] = [
             }
             getBankList(data).then(res => {
               res.data.forEach(item=>{
-                item.label = item.bankName + ' ' + item.bankAccountNo
-                item.value = item.bankName + ' ' + item.bankAccountNo
+                item.label = item.bankName + ' ' + item.account
+                item.value = item.bankName + ' ' + item.account
               })
               bankList.value = res.data
             })

src/views/finance/feeSettlement/detail/invoiceTable.vue

@@ -28,7 +28,7 @@
             </template>
             <template #right>
               <div class="right-table">
-                <BasicTable class="ds-table" @register="registerTable1">
+                <BasicTable class="ds-table" @selection-change="onSelectChangeDetail" @register="registerTable1">
                   <template #tableTitle>
                     <div>
                       <span class="bold">结算费用明细</span>
@@ -202,10 +202,6 @@ const [registerTable1, { getSelectRows: getSelectRowsDetail, setTableData }] = u
   showIndexColumn: false,
   pagination: false,
   striped: false,
-  rowSelection: {
-    onChange: onSelectChangeDetail,
-    fixed: true,
-  },
   bordered: true,
   indexColumnProps: {
     width: 60,
@@ -375,13 +371,13 @@ function addInfos() {
       currenciesData.value = res.data
       res.data.forEach(item => {
         item.exchangeRates.forEach(ite => {
-          if (ite.currency != 'RMB') {
+          if (ite.currency != currency.value) {
             cuArr.push({
               currency: ite.currency,
               id: item.id
             })
           }
-          if (ite.currency == 'RMB') {
+          if (ite.currency == currency.value) {
             ite.exchangeRate = 1
           }
         })
@@ -395,7 +391,7 @@ function addInfos() {
             const data = {
               currencyFrom: 'RMB',
               currencyTo: item.currency,
-              feeType: item.feeType
+              feeType: 1
             }
             GetExchangeRate(data).then(res => {
               exchangarr.value.push(res.data)
@@ -685,7 +681,7 @@ function init() {
   }, 200)
 }
 const totalAmount = ref(0)
-function onSelectChangeDetail() {
+function onSelectChangeDetail({keys,row}) {
   const list = getSelectRowsDetail()
   if (route.query.type == 'free') {
     totalAmount.value = 0

src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx

@@ -402,7 +402,7 @@ export const detailForm: FormSchema[] = [
             }
             GetClientBankList(data).then((res) => {
               res.data.forEach(item => {
-                item.showName = item.bankName + ' ' + item.bankAccountNo
+                item.showName = item.bankName + ' ' + item.account
               })
               resolve(res)
             })
@@ -415,7 +415,7 @@ export const detailForm: FormSchema[] = [
         onChange: (e, obj) => {
           if (obj) {
             formModel.customerBankId = obj.id
-            formModel.customerAccount = obj.bankAccountNo
+            formModel.customerAccount = obj.account
           }
           if (!obj && !e) {
             formModel.customerBankId = ''
@@ -490,8 +490,8 @@ export const detailForm: FormSchema[] = [
             }
             getBankList(data).then(res => {
               res.data.forEach(item=>{
-                item.label = item.bankName + ' ' + item.bankAccountNo
-                item.value = item.bankName + ' ' + item.bankAccountNo
+                item.label = item.bankName + ' ' + item.account
+                item.value = item.bankName + ' ' + item.account
               })
               bankList.value = res.data
             })

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

@@ -52,13 +52,10 @@
                         <template #overlay>
                             <a-menu @click="onClick">
                                 <a-menu-item :key="0">
-                                    <a href="javascript:;">普通发票</a>
+                                    <a href="javascript:;">全电普票（电子）</a>
                                 </a-menu-item>
                                 <a-menu-item :key="1">
-                                    <a href="javascript:;">电子发票</a>
-                                </a-menu-item>
-                                <a-menu-item :key="2">
-                                    <a href="javascript:;">纸质发票</a>
+                                    <a href="javascript:;">全电专票（电子）</a>
                                 </a-menu-item>
                             </a-menu>
                         </template>
@@ -204,9 +201,8 @@ const tabStore = useMultipleTabStore()
 const userStore = useUserStore()
 const go = useGo()
 const CategoryData = [
-    { value: 0, label: '普通发票' },
-    { value: 1, label: '电子发票' },
-    { value: 2, label: '纸质发票' },
+    { value: 0, label: '全电普票（电子）' },
+    { value: 1, label: '全电专票（电子）' },
 ]
 const bankList = ref([]) as any
 const showTooltip = ref(false)