From 3a474f748ac4a1ab453f7ecd83b4e55a3ac16f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= <h17602169347@163.com>
Date: Tue, 21 May 2024 15:43:26 +0800
Subject: [PATCH] =?UTF-8?q?5.21=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/jnpf/service/impl/VoucherServiceImpl.java   | 4 +++-
 .../jnpf-web/src/components/JNPFVoucherImport/index.vue   | 5 ++---
 .../extend/customer/subjectbasic/ProductRadioGoodsBox.vue | 1 -
 .../jnpf-web/src/views/extend/cwsettlement/index.vue      | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
index cac3643f..f5da6182 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
@@ -901,12 +901,14 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
         int sum = 0;
         //记录第几条失败
         int num = 0;
+        String voucherCode = generaterSwapUtil.getBillNumber("fhpz", false);
         for(int i=0; i<dataList.size(); i++){
+            int aa = i+1;
             VoucherExcelVO222 model = dataList.get(i);
             VoucherEntity voucherEntity = new VoucherEntity();
             voucherEntity.setBusinessType(StringUtil.equals(model.getBusinessType(), "采购") ? "1" : "2");//业务类型
             voucherEntity.setDocumentType(StringUtil.equals(model.getDocumentType(), "收货凭证") ? "1" : "2");//单据类型
-            voucherEntity.setVoucherCode(generaterSwapUtil.getBillNumber("fhpz", false));//'凭证编号
+            voucherEntity.setVoucherCode(voucherCode + "(" + aa + ")");//'凭证编号
             //凭证类型
             if(StringUtil.equals(model.getVoucherType(), "磅单")){
                 voucherEntity.setVoucherType("1");
diff --git a/jnpf-java-boot/jnpf-web/src/components/JNPFVoucherImport/index.vue b/jnpf-java-boot/jnpf-web/src/components/JNPFVoucherImport/index.vue
index 845316e9..aece7c58 100644
--- a/jnpf-java-boot/jnpf-web/src/components/JNPFVoucherImport/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/components/JNPFVoucherImport/index.vue
@@ -284,7 +284,6 @@ export default {
       })
     },
     initList(list,index) {
-      debugger
       this.list[index].productId = list.id;
       this.list[index].productName = list.name;
     },
@@ -351,8 +350,8 @@ export default {
         }
         let flag = false
         let index = 0
-        console.log('555555555', this.list)
-        debugger
+        /* console.log('555555555', this.list)
+        debugger */
         for(let i=0;i<this.list.length; i++){
           if(!this.list[i].productId){
             flag = true
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/ProductRadioGoodsBox.vue b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/ProductRadioGoodsBox.vue
index b1966cef..95b6e1be 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/ProductRadioGoodsBox.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/ProductRadioGoodsBox.vue
@@ -102,7 +102,6 @@ export default {
       if (productName && typeof(productName) == 'string') {
         this.keyword = productName;
       }
-      debugger
       if ((index && typeof(index) == 'number') || index == 0 ) {
         this.index = index;
       }
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
index 42cbae26..f02da233 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
@@ -80,12 +80,12 @@
           <el-table-column prop="paymentState" label="付款状态" width="100" align="center">
             <template slot-scope="scope">
               <el-tag type="warning" v-if="scope.row.paymentState==1 && (scope.row.businessType==1 || scope.row.businessType==4)">未付款</el-tag>
-              <el-tag type="success" v-if="scope.row.paymentState==2 && scope.row.businessType==1 || scope.row.businessType==4">部分付款</el-tag>
-              <el-tag type="danger" v-if="scope.row.paymentState==3 && scope.row.businessType==1 || scope.row.businessType==4">已付款</el-tag>
+              <el-tag type="success" v-if="scope.row.paymentState==2 && (scope.row.businessType==1 || scope.row.businessType==4)">部分付款</el-tag>
+              <el-tag type="danger" v-if="scope.row.paymentState==3 && (scope.row.businessType==1 || scope.row.businessType==4)">已付款</el-tag>
 
               <el-tag type="warning" v-if="scope.row.paymentState==1 && (scope.row.businessType==2 || scope.row.businessType==3)">未收款</el-tag>
-              <el-tag type="success" v-if="scope.row.paymentState==2 && scope.row.businessType==2 || scope.row.businessType==3">部分收款</el-tag>
-              <el-tag type="danger" v-if="scope.row.paymentState==3 && scope.row.businessType==2 || scope.row.businessType==3">已收款</el-tag>
+              <el-tag type="success" v-if="scope.row.paymentState==2 && (scope.row.businessType==2 || scope.row.businessType==3)">部分收款</el-tag>
+              <el-tag type="danger" v-if="scope.row.paymentState==3 && (scope.row.businessType==2 || scope.row.businessType==3)">已收款</el-tag>
             </template>
           </el-table-column>
           <el-table-column prop="settlementSubjectName" label="结算主体名称" align="center" width="250">