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

src/views/finance/feeSettlement/columns.tsx

@@ -1309,7 +1309,7 @@ export const freeTableDetailColums: BasicColumn[] = [
   },
   {
     title: '金额',
-    dataIndex: 'totalAmount',
+    dataIndex: 'amount',
     width: 100,
   },
   {
@@ -1324,7 +1324,7 @@ export const freeTableDetailColums: BasicColumn[] = [
   },
   {
     title: '本次结算金额',
-    dataIndex: 'amount',
+    dataIndex: 'restAmount',
     width: 100,
   },
   {

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

@@ -43,7 +43,7 @@
                       <span v-if="record.feeType == 1">应收</span>
                       <span v-if="record.feeType == 2">应付</span>
                     </template>
-                    <template v-if="column.dataIndex == 'amount'">
+                    <template v-if="column.dataIndex == 'restAmount'">
                       <a-input-number @change="onSelectChangeDetail" :precision="2" size="small" :controls="false"
                         :max="record.maxRestAmount" v-model:value="record.restAmount" />
                     </template>

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

@@ -1290,7 +1290,7 @@ export const freeTableDetailColums: BasicColumn[] = [
   },
   {
     title: '金额',
-    dataIndex: 'totalAmount',
+    dataIndex: 'amount',
     width: 100,
   },
   {
@@ -1305,7 +1305,7 @@ export const freeTableDetailColums: BasicColumn[] = [
   },
   {
     title: '本次结算金额',
-    dataIndex: 'amount',
+    dataIndex: 'restAmount',
     width: 100,
   },
   {

src/views/finance/paymentSettlement/paymentSettlementFree/invoiceTable.vue

@@ -42,7 +42,7 @@
                       <span v-if="record.feeType == 1">应收</span>
                       <span v-if="record.feeType == 2">应付</span>
                     </template>
-                    <template v-if="column.dataIndex == 'amount'">
+                    <template v-if="column.dataIndex == 'restAmount'">
                       <a-input-number @change="onSelectChangeDetail" :precision="2" size="small" :controls="false"
                         :max="record.maxRestAmount" v-model:value="record.restAmount" />
                     </template>

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

@@ -631,6 +631,7 @@ function addDetailed() {
                         const data = {
                             currencyFrom: 'RMB',
                             currencyTo: item.currency,
+                            rateType:1,
                             feeType: 1
                         }
                         GetExchangeRate(data).then(res => {

src/views/operation/invoiceIssue/detail/applyInvoice.vue

@@ -3,7 +3,8 @@
         <a-modal width="1600px" @cancel="open = false" :visible="open" title="添加发票申请明细" :footer="null">
             <div style="padding-bottom:5px ;">
                 <div>
-                    <BasicTable @selection-change="onSelectChangeApply" class="ds-table" @row-click="handleClick" @register="registerTable">
+                    <BasicTable @selection-change="onSelectChangeApply" class="ds-table" @row-click="handleClick"
+                        @register="registerTable">
                         <template #right>
                             <div style="width: 40%;margin-left: 10px;">
                                 <div>
@@ -401,7 +402,8 @@ function changeApply() {
                     const data = {
                         currencyFrom: 'RMB',
                         currencyTo: item.currency,
-                        feeType: item.feeType
+                        feeType: item.feeType,
+                        rateType:1,
                     }
                     GetExchangeRate(data).then(res => {
                         exchangarr.value.push(res.data)
@@ -416,6 +418,12 @@ function changeApply() {
         }
         if (filteredItems.length == 0) {
             open.value = false
+            arr.forEach(item => {
+                item.originalCurrency = item.currency
+                item.currency = 'RMB'
+                item.originalAmount = item.applyAmount
+                item.originalProcessedAmount = item.processedAmount ? item.processedAmount : 0
+            })
             emits('updateListFree', arr)
         }
     }
@@ -480,7 +488,8 @@ function addDetailFree() {
                     const data = {
                         currencyFrom: 'RMB',
                         currencyTo: item.currency,
-                        feeType: 1
+                        feeType: 1,
+                        rateType:1,
                     }
                     GetExchangeRate(data).then(res => {
                         exchangarr.value.push(res.data)

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

@@ -94,7 +94,7 @@
                             </editCompent>
                             <editCompent :showEdit="false" ref="editCompentRef" label="开票类型:">
                                 <template #text>
-                                    <span>正票</span>
+                                    <span>{{ form.invoiceType }}</span>
                                 </template>
                             </editCompent>
                             <editCompent ref="editCompentRef" label="开票日期:">
@@ -390,7 +390,7 @@
                 <a-form :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
                     <a-form-item label="冲红原因">
                         <a-select ref="select" v-model:value="redForm.chyyDm" style="width: 100%">
-                            <a-select-option value="00">直接冲红</a-select-option>
+                            <!-- <a-select-option value="00">直接冲红</a-select-option> -->
                             <a-select-option value="01">开票有误</a-select-option>
                             <a-select-option value="02">销货退回</a-select-option>
                             <a-select-option value="03">服务中止</a-select-option>
@@ -446,7 +446,9 @@ defineComponent({
     HotTable,
 })
 registerAllModules()
-const redForm = ref({}) as any
+const redForm = ref({
+    lrfsf: '0'
+}) as any
 const detailForm = [
     {
         field: 'divider-selects',
@@ -786,7 +788,6 @@ function getDetail() {
     loading.value = true
     GeneralInvoiceGet({ id: route.query.id }).then(res => {
         if (res.succeeded) {
-            form.value = res.data
             res.data.invoiceDetails.forEach(item => {
                 item.unit = '票'
             })
@@ -802,6 +803,13 @@ function getDetail() {
             } else {
                 res.data.isLockedName = '否'
             }
+            if (res.data.isSetRed) {
+                res.data.isSetRed = '是'
+                res.data.invoiceType = '红票'
+            } else {
+                res.data.isSetRed = '否'
+                res.data.invoiceType = '正票'
+            }
             if (res.data.invoiceNO) {
                 res.data.status = '已开票'
             } else {
@@ -823,6 +831,7 @@ function getDetail() {
             res.data.applications.forEach(item => {
                 item.applyAmount = numberThousandFormat(item.applyAmount, 2, false)
             })
+            form.value = res.data
             getCustomerInfo(res.data.customerId)
             setTableData(res.data.applications)
             setFieldsValue(res.data)
@@ -894,7 +903,7 @@ function updateListFreeLeft(val, arrQuery) {
 function sureRed() {
     const data = {
         invoiceId: route.query.id,
-        orderNo: form.value.billNO,
+        // orderNo: form.value.billNO,
         ...redForm.value
     }
     redloading.value = true
@@ -941,12 +950,12 @@ function handleUpdate(val) {
 }
 // 自由开票右边
 function updateListFree(val) {
-    val.forEach(item => {
-        item.originalCurrency = item.currency
-        item.currency = 'RMB'
-        item.originalAmount = item.applyAmount
-        item.originalProcessedAmount = item.processedAmount ? item.processedAmount : 0
-    })
+    // val.forEach(item => {
+    //     item.originalCurrency = item.currency
+    //     item.currency = 'RMB'
+    //     item.originalAmount = item.applyAmount
+    //     item.originalProcessedAmount = item.processedAmount ? item.processedAmount : 0
+    // })
     const data = {
         invoice: {
             ...form.value,