build

src/views/InvoiceSales/batchImportYunlong/ProcessModal.vue

@@ -155,13 +155,13 @@ async function setFormData(groupData: any[]){
         }
 
         formData.value.orderArr[index].num =  item.current_inv_num
-        const { current_inv_fee, ainv_fee,  inv_fee, apay_fee, sequenceNo } = item
-        
-        const invTotal = Number(current_inv_fee) + Number(ainv_fee) + Number(inv_fee)
+        const { current_inv_fee, ainv_fee, inv_fee, apay_fee, sequenceNo, pay_tag_fee } = item
+
+        const invTotal = Number(current_inv_fee) + Number(ainv_fee) + Number(inv_fee) + Number(pay_tag_fee)
 
 
         if(invTotal > apay_fee){
-          emit('updateSequenceNo', { sequenceNo, group: state.currentGroup,remark: '订单已开票金额+未开票金额+本次开票金额必须小于或等于已认款金额', status: 3 })
+          emit('updateSequenceNo', { sequenceNo, group: state.currentGroup,remark: '订单已开票金额+开票中金额+本次开票金额必须小于或等于已认款金额+回款标签金额', status: 3 })
           noPriceSequenceNos.push(sequenceNo)
         }
       })

src/views/InvoiceSales/batchImportYunlong/validator.ts

@@ -92,7 +92,7 @@ function isValidRequired(results: any[], currentInvoiceTypes: any[]){
 
         if(prefix !== 'PO-YL'){
           isPoCodeError = true
-        } else if(!((/\d{2}-\d{4}-\d{4}$/).test(suffix))) {
+        } else if(!((/\d{2}-\d{4}-\d{4,8}$/).test(suffix))) {
          isPoCodeError = true 
         }
       } else if(key === 'invtype' && !allInvTypes.includes(value)){

src/views/InvoiceSales/invoiceApply/components/currentcy-form/add-edit-form.vue

@@ -111,28 +111,21 @@ function generatorOrderArr() {
 function handleSave() {
   formRef.value.validate(async isValid => {
     if (!isValid) return;
-
-    if (ruleForm.value.remark.length > 184) {
-      return ElMessage.error("发票备注不能超过184个字符");
-    }
-
-    if (orderList.value.length > max) {
-      return ElMessage.error(`订单数量不能超过${max}个`);
-    }
+    if (ruleForm.value.remark.length > 184) { return ElMessage.error("发票备注不能超过184个字符"); }
+    if (orderList.value.length > max) { return ElMessage.error(`订单数量不能超过${max}个`); }
 
     const { orderArr } = generatorOrderArr();
-
-    // const noPriceSequenceNos = orderList.value.filter(item => {
-    //   const {ainv_fee,  inv_fee, apay_fee, sequenceNo } = item
-    //   const { inv_fee: current_inv_fee } = orderArr.find((item) => item.sequenceNo === sequenceNo) || {}
-    //   const invTotal = Number(current_inv_fee) + Number(ainv_fee) + Number(inv_fee)
-    //   console.log(invTotal, apay_fee)
-    //   return invTotal > apay_fee
-    // })
-    // if(noPriceSequenceNos.length !== 0){
-    //   ElMessage.error(`订单:${noPriceSequenceNos.map(({ sequenceNo }) => sequenceNo)},已开票金额+未开票金额+本次开票金额必须小于或等于已认款金额`);
-    //   return
-    // }
+    const noPriceSequenceNos = orderList.value.filter(item => {
+      const {ainv_fee,  inv_fee, apay_fee, sequenceNo, pay_tag_fee } = item
+      const { inv_fee: current_inv_fee } = orderArr.find((item) => item.sequenceNo === sequenceNo) || {}
+      const invTotal = Number(current_inv_fee) + Number(ainv_fee) + Number(inv_fee) + Number(pay_tag_fee)
+      return invTotal > apay_fee
+    })
+    
+    if(noPriceSequenceNos.length !== 0){
+      ElMessage.error(`订单:${noPriceSequenceNos.map(({ sequenceNo }) => sequenceNo)},已开票金额+开票中金额+本次开票金额必须小于或等于已认款金额+回款标签金额`);
+      return
+    }
     
     const total = orderArr.reduce(
       (prev, { inv_fee }) => prev + Number(inv_fee),

src/views/InvoiceSales/invoiceApply/detail.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { shallowRef, computed, onMounted ,ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
+import { shallowRef, computed, onMounted ,ref } from "vue";
 import { useAsync, useResponseHandle } from "/@/hooks";
 import Invoice from "/@/components/Invoice";
 import { approvalProcess } from "./components/approval-process";