6.27

jnpf-app/pages/workFlow/flowBefore/index.vue

@@ -106,8 +106,7 @@
 				</u-button>
 			</template>
 			<u-button class="buttom-btn" type="primary" v-if="config.opType == 1&&properties.hasAuditBtn"
-				@click.stop="eventLauncher('audit')">
-				{{properties.auditBtnText||'通过'}}
+				@click.stop="eventLauncher('audit')">审批
 			</u-button>
 			<u-button class="buttom-btn" type="error" @click.stop="eventReceiver({},'recall')"
 				v-if="config.opType == 2 && properties.hasRevokeBtn">

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml

@@ -139,7 +139,7 @@
         LEFT JOIN jg_contract i on h.contract_id = i.id
         LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
         LEFT JOIN jg_product k on f.product_id = k.id
-        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln)
+        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln)
         where a.warehousing_storage_id in
         <foreach item="item" index="index" collection="storageIdList"
                  open="(" separator="," close=")">
@@ -190,7 +190,7 @@
         LEFT JOIN jg_contract i on h.contract_id = i.id
         LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
         LEFT JOIN jg_product k on f.product_id = k.id
-        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln)
+        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln)
         where a.warehousing_storage_id in
         <foreach item="item" index="index" collection="storageIdList"
                  open="(" separator="," close=")">
@@ -241,7 +241,7 @@
         LEFT JOIN jg_contract i on h.contract_id = i.id
         LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
         LEFT JOIN jg_product k on f.product_id = k.id
-        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln)
+        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln)
         where a.warehousing_storage_id in
         <foreach item="item" index="index" collection="storageIdList"
                  open="(" separator="," close=")">
@@ -291,7 +291,7 @@
         LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
         LEFT JOIN jg_product k on f.product_id = k.id
         LEFT JOIN jg_warehousing_storage_product l on l.warehousing_storage_id = b.id
-        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln)
+        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln)
         where a.warehousing_storage_id in
         <foreach item="item" index="index" collection="storageIdList"
                  open="(" separator="," close=")">
@@ -342,7 +342,7 @@
         LEFT JOIN jg_contract i on h.contract_id = i.id
         LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
         LEFT JOIN jg_product k on f.product_id = k.id
-        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln)
+        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln)
         where a.warehousing_outbound_id in
         <foreach item="item" index="index" collection="storageIdList"
                  open="(" separator="," close=")">
@@ -392,7 +392,7 @@
         LEFT JOIN jg_contract i on h.contract_id = i.id
         LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
         LEFT JOIN jg_product k on f.product_id = k.id
-        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln)
+        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln)
         where a.warehousing_outbound_id in
         <foreach item="item" index="index" collection="storageIdList"
                  open="(" separator="," close=")">
@@ -443,7 +443,7 @@
         LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
         LEFT JOIN jg_product k on f.product_id = k.id
         LEFT JOIN jg_warehousing_outbound_product l on l.warehousing_outbound_id = b.id
-        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln)
+        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln)
         where a.warehousing_outbound_id in
         <foreach item="item" index="index" collection="storageIdList"
                  open="(" separator="," close=")">
@@ -494,7 +494,7 @@
         LEFT JOIN jg_contract i on h.contract_id = i.id
         LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id)
         LEFT JOIN jg_product k on f.product_id = k.id
-        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln)
+        LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln)
         where a.warehousing_outbound_id in
         <foreach item="item" index="index" collection="storageIdList"
                  open="(" separator="," close=")">

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml

@@ -710,4 +710,10 @@
         from jg_voucher a
         where a.f_delete_mark is null and a.is_transfer = '2' and a.business_order_id = #{id}
     </select>
+
+    <update id="updateByVoucherCode">
+        update jg_voucher set order_no = #{voucherEntity.orderNo}
+        where voucher_code = #{voucherEntity.voucherCode}
+    </update>
+
 </mapper>

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java

@@ -51,4 +51,6 @@ public interface VoucherMapper extends BaseMapper<VoucherEntity> {
     BigDecimal queryVoucherByBusinessOrder(@Param("id") String id);
 
     Map<String ,BigDecimal> queryAmountByBusinessOrder(@Param("id") String id);
+
+    void updateByVoucherCode(@Param("voucherEntity") VoucherEntity voucherEntity);
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java

@@ -78,4 +78,6 @@ public interface VoucherService extends IService<VoucherEntity> {
     BigDecimal queryVoucherProductNetWeightInfo(String id);
     BigDecimal queryVoucherByBusinessOrderInfo(String id);
     Map<String, BigDecimal> queryAmountByBusinessOrder(String id);
+
+    void updateByVoucherCode(VoucherEntity voucherEntity);
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java

@@ -673,82 +673,6 @@ public class CwaccountServiceImpl extends ServiceImpl<CwaccountMapper, Cwaccount
         if (form.getCwaccountstorageList()==null || form.getCwaccountstorageList().size() == 0){
             return "出入库单信息不能为空";
         }
-        if (form.getCwaccountvoucherList()!=null && form.getCwaccountvoucherList().size() > 0){
-            for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){
-                if(StringUtil.isNotEmpty(t.getBucklesWeight())){
-                    t.setBucklesWeight(t.getBucklesWeight().trim());
-                }
-                else{
-                    return "凭证信息-扣杂重量不能为空";
-                }
-                /*if(StringUtil.isNotEmpty(t.getBucklesWeight())){
-                    if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getBucklesWeight())).matches()){
-                        return "请输入正确的金额";
-                    }
-                }*/
-            }
-            for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){
-                if(StringUtil.isNotEmpty(t.getSettlementSum())){
-                    t.setSettlementSum(t.getSettlementSum().trim());
-                }
-                else{
-                    return "凭证信息-结算数量不能为空";
-                }
-                /*if(StringUtil.isNotEmpty(t.getSettlementSum())){
-                    if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementSum())).matches()){
-                        return "请输入正确的金额";
-                    }
-                }*/
-            }
-            for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){
-                if(StringUtil.isNotEmpty(t.getSettlementPrice())){
-                    t.setSettlementPrice(t.getSettlementPrice().trim());
-                }
-                else{
-                    return "凭证信息-结算单价（含税）不能为空";
-                }
-                /*if(StringUtil.isNotEmpty(t.getSettlementPrice())){
-                    if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementPrice())).matches()){
-                        return "请输入正确的金额";
-                    }
-                }*/
-            }
-            for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){
-                if(StringUtil.isNotEmpty(t.getSettlementSubtotal())){
-                    t.setSettlementSubtotal(t.getSettlementSubtotal().trim());
-                }
-                else{
-                    return "凭证信息-结算小计（含税）不能为空";
-                }
-                /*if(StringUtil.isNotEmpty(t.getSettlementSubtotal())){
-                    if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementSubtotal())).matches()){
-                        return "请输入正确的金额";
-                    }
-                }*/
-            }
-            for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){
-                if(StringUtil.isNotEmpty(t.getSettlementPriceNo())){
-                    t.setSettlementPriceNo(t.getSettlementPriceNo().trim());
-                }
-                /*if(StringUtil.isNotEmpty(t.getSettlementPriceNo())){
-                    if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementPriceNo())).matches()){
-                        return "请输入正确的金额";
-                    }
-                }*/
-            }
-            for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){
-                if(StringUtil.isNotEmpty(t.getOtherExpenses())){
-                    t.setOtherExpenses(t.getOtherExpenses().trim());
-                }
-                /*if(StringUtil.isNotEmpty(t.getOtherExpenses())){
-                    if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getOtherExpenses())).matches()){
-                        return "请输入正确的金额";
-                    }
-                }*/
-            }
-        }else{
-            return "凭证信息不能为空";
-        }
         if (form.getCwaccountsummaryList()==null || form.getCwaccountsummaryList().size() == 0){
             return "汇总信息不能为空";
         }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java

@@ -1068,13 +1068,36 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
             voucherEntity.setSaleAmount(new BigDecimal(model.getSaleAmount()));//销售额
             //根据合同编号取查合同
             QueryWrapper<ContractLEntity> contractLQueryWrapper=new QueryWrapper<>();
-            contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo());
+            if(voucherEntity.getBusinessType().equals("1")){
+                contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo());
+            }else{
+                contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getSaleContractNo());
+            }
             List<ContractLEntity> contractLEntityList = contractLService.list(contractLQueryWrapper);
             if(contractLEntityList != null && contractLEntityList.size() > 0){
+                if(voucherEntity.getBusinessType().equals("1")){
+                    if(voucherEntity.getDocumentType().equals("1")){
+                        //采购收货
+                        voucherEntity.setCustomerId(contractLEntityList.get(0).getDeptId());
+                        voucherEntity.setSupplierId(contractLEntityList.get(0).getSubject());
+                    }else{
+                        //采购发货
+                        voucherEntity.setCustomerId(contractLEntityList.get(0).getSubject());
+                        voucherEntity.setSupplierId(contractLEntityList.get(0).getDeptId());
+                    }
+                }else{
+                    if(voucherEntity.getDocumentType().equals("1")){
+                        //销售收货
+                        voucherEntity.setCustomerId(contractLEntityList.get(0).getDeptId());
+                        voucherEntity.setSupplierId(contractLEntityList.get(0).getSubject());
+                    }else{
+                        //销售发货
+                        voucherEntity.setCustomerId(contractLEntityList.get(0).getSubject());
+                        voucherEntity.setSupplierId(contractLEntityList.get(0).getDeptId());
+                    }
+                }
                 voucherEntity.setModeTransport(contractLEntityList.get(0).getModeTransport());//运输方式
-                voucherEntity.setCustomerId(contractLEntityList.get(0).getDeptId());
                 voucherEntity.setCustomerName("");
-                voucherEntity.setSupplierId(contractLEntityList.get(0).getSubject());
                 voucherEntity.setSupplierName("");
             }else{
                 num ++;
@@ -1353,4 +1376,9 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
     public Map<String, BigDecimal> queryAmountByBusinessOrder(String id) {
         return voucherMapper.queryAmountByBusinessOrder(id);
     }
+
+    @Override
+    public void updateByVoucherCode(VoucherEntity voucherEntity) {
+        voucherMapper.updateByVoucherCode(voucherEntity);
+    }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VehicleController.java

@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jnpf.base.ActionResult;
 import jnpf.base.UserInfo;
 import jnpf.exception.DataException;
+import jnpf.model.voucher.*;
 import jnpf.permission.entity.UserEntity;
 import jnpf.service.*;
 import jnpf.entity.*;
@@ -73,7 +74,8 @@ public class VehicleController {
 
     @Autowired
     private VehicleDriverService vehicleDriverService;
-
+    @Autowired
+    private VoucherService voucherService;
 
     @Autowired
     private ConfigValueUtil configValueUtil;
@@ -370,4 +372,194 @@ public class VehicleController {
         return ActionResult.success(vehicleMap);
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    @Operation(summary = "上传文件")
+    @PostMapping("/Uploader")
+    public ActionResult<Object> Uploader() {
+        List<MultipartFile> list = UpUtil.getFileAll();
+        MultipartFile file = list.get(0);
+        if (file.getOriginalFilename().endsWith(".xlsx") || file.getOriginalFilename().endsWith(".xls")) {
+            String filePath = XSSEscape.escape(configValueUtil.getTemporaryFilePath());
+            String fileName = XSSEscape.escape(RandomUtil.uuId() + "." + UpUtil.getFileType(file));
+            //上传文件
+            FileInfo fileInfo = FileUploadUtils.uploadFile(file, filePath, fileName);
+            DownloadVO vo = DownloadVO.builder().build();
+            vo.setName(fileInfo.getFilename());
+            return ActionResult.success(vo);
+        } else {
+            return ActionResult.fail("选择文件不符合导入");
+        }
+    }
+
+    /**
+     * 模板下载
+     *
+     * @return
+     */
+    @Operation(summary = "模板下载")
+    @GetMapping("/TemplateDownload")
+    public ActionResult<DownloadVO>  TemplateDownload(){
+        DownloadVO vo = DownloadVO.builder().build();
+        UserInfo userInfo = userProvider.get();
+        Map<String, Object> dataMap = new HashMap<>();
+        //主表对象
+        List<ExcelExportEntity> entitys = new ArrayList<>();
+        //以下添加字段
+        entitys.add(new ExcelExportEntity("凭证编号" ,"voucherCode"));
+        entitys.add(new ExcelExportEntity("订单序号" ,"orderNo"));
+        entitys.add(new ExcelExportEntity("单据类型" ,"documentType"));
+        entitys.add(new ExcelExportEntity("凭证类型" ,"voucherType"));
+        entitys.add(new ExcelExportEntity("凭证状态" ,"voucherStatus"));
+        entitys.add(new ExcelExportEntity("磅单编号" ,"poundCode"));
+        entitys.add(new ExcelExportEntity("关联单据号" ,"associatedDocumentNo"));
+        entitys.add(new ExcelExportEntity("车牌号" ,"vehicleName"));
+        entitys.add(new ExcelExportEntity("运输方式" ,"modeTransport"));
+        entitys.add(new ExcelExportEntity("承运方式" ,"transportationMethod"));
+        entitys.add(new ExcelExportEntity("承运商" ,"carrier"));
+        entitys.add(new ExcelExportEntity("运费" ,"freight"));
+        entitys.add(new ExcelExportEntity("起运地" ,"placeDispatch"));
+        entitys.add(new ExcelExportEntity("到达地" ,"destination"));
+        entitys.add(new ExcelExportEntity("三级供应商" ,"thirdSupplyName"));
+        entitys.add(new ExcelExportEntity("制单时间" ,"preparationTime"));
+        List<Map<String, Object>> list = new ArrayList<>();
+        list.add(dataMap);
+
+        ExportParams exportParams = new ExportParams(null, "凭证单模板");
+        exportParams.setType(ExcelType.XSSF);
+        try{
+            @Cleanup Workbook workbook = new HSSFWorkbook();
+            if (entitys.size()>0){
+                if (list.size()==0){
+                    list.add(new HashMap<>());
+                }
+                //复杂表头-表头和数据处理
+                ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(VoucherConstant.getColumnData(), ColumnDataModel.class);
+                List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
+                if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
+                    entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
+                    list =  VisualUtils.complexHeaderDataHandel(list, complexHeaderList);
+                }
+                workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
+            }
+            String fileName = "凭证单模板" + DateUtil.dateNow("yyyyMMddHHmmss") + ".xlsx";
+            MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
+            String temporaryFilePath = configValueUtil.getTemporaryFilePath();
+            FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
+            vo.setName(fileInfo.getFilename());
+            vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
+        } catch (Exception e) {
+            log.error("模板信息导出Excel错误:{}", e.getMessage());
+            e.printStackTrace();
+        }
+        return ActionResult.success(vo);
+    }
+
+    /**
+     * 导入预览
+     *
+     * @return
+     */
+    @Operation(summary = "导入预览" )
+    @GetMapping("/ImportPreview")
+    public ActionResult<Map<String, Object>> ImportPreview(String fileName) throws Exception {
+        Map<String, Object> headAndDataMap = new HashMap<>(2);
+        String filePath = FileUploadUtils.getLocalBasePath() + configValueUtil.getTemporaryFilePath();
+        FileUploadUtils.downLocal(configValueUtil.getTemporaryFilePath(), filePath, fileName);
+        File temporary = new File(XSSEscape.escapePath(filePath + fileName));
+        int headerRowIndex = 1;
+        ImportParams params = new ImportParams();
+        params.setTitleRows(0);
+        params.setHeadRows(headerRowIndex);
+        params.setNeedVerify(true);
+        try {
+            List<VoucherExcelVO333> excelDataList = ExcelImportUtil.importExcel(temporary, VoucherExcelVO333.class, params);
+            // 导入字段
+            List<ExcelImFieldModel> columns = new ArrayList<>();
+            columns.add(new ExcelImFieldModel("voucherCode","凭证编号"));
+            columns.add(new ExcelImFieldModel("orderNo","订单序号"));
+            columns.add(new ExcelImFieldModel("documentType","单据类型"));
+            columns.add(new ExcelImFieldModel("voucherType","凭证类型"));
+            columns.add(new ExcelImFieldModel("preparationTime","制单时间"));
+            columns.add(new ExcelImFieldModel("poundCode","磅单编号"));
+            columns.add(new ExcelImFieldModel("vehicleName","车牌号"));
+            columns.add(new ExcelImFieldModel("supplierName","发货单位"));
+            columns.add(new ExcelImFieldModel("customerName","收货单位"));
+            columns.add(new ExcelImFieldModel("modeTransport","运输方式"));
+            columns.add(new ExcelImFieldModel("transportationMethod","承运方式"));
+            columns.add(new ExcelImFieldModel("carrier","承运商"));
+            columns.add(new ExcelImFieldModel("placeDispatch","起运地"));
+            columns.add(new ExcelImFieldModel("destination","到达地"));
+            columns.add(new ExcelImFieldModel("freight","运费"));
+            columns.add(new ExcelImFieldModel("voucherStatus","凭证状态"));
+            headAndDataMap.put("dataRow" , JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(excelDataList)));
+            headAndDataMap.put("headerRow" , JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(columns)));
+        } catch (Exception e){
+            e.printStackTrace();
+            return ActionResult.fail("表头名称不可更改,表头行不能删除");
+        }
+        return ActionResult.success(headAndDataMap);
+    }
+
+    /**
+     * 导入数据
+     *
+     * @return
+     */
+    @Operation(summary = "导入数据" )
+    @PostMapping("/ImportData")
+    public ActionResult<ExcelImportModel> ImportData(@RequestBody VisualImportModel visualImportModel) throws Exception {
+        List<Map<String, Object>> listData=new ArrayList<>();
+        for(Map<String, Object> map : visualImportModel.getList()){
+            voucherService.updateByVoucherCode(JsonUtil.getJsonToBean(map, VoucherEntity.class));
+        }
+        ExcelImportModel excelImportModel = new ExcelImportModel();
+        excelImportModel.setSnum(visualImportModel.getList().size());
+        excelImportModel.setFnum(0);
+        excelImportModel.setResultType(0);
+        return ActionResult.success(excelImportModel);
+    }
+
+    /**
+     * 导出异常报告
+     *
+     * @return
+     */
+    @Operation(summary = "导出异常报告")
+    @PostMapping("/ImportExceptionData")
+    public ActionResult<DownloadVO> ImportExceptionData(@RequestBody VisualImportModel visualImportModel) {
+        DownloadVO vo=DownloadVO.builder().build();
+        List<VoucherExcelErrorVO> voucherVOList = JsonUtil.getJsonToList(visualImportModel.getList(), VoucherExcelErrorVO.class);
+        UserInfo userInfo = userProvider.get();
+
+        try{
+            @Cleanup Workbook workbook = new HSSFWorkbook();
+            ExportParams exportParams = new ExportParams(null, "错误报告");
+            exportParams.setType(ExcelType.XSSF);
+            workbook = ExcelExportUtil.exportExcel(exportParams,
+                    VoucherExcelErrorVO.class, voucherVOList);
+
+            String fileName = "错误报告" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
+            MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
+            String temporaryFilePath = configValueUtil.getTemporaryFilePath();
+            FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
+            vo.setName(fileInfo.getFilename());
+            vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ActionResult.success(vo);
+    }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO.java

@@ -26,6 +26,10 @@ public class VoucherExcelVO{
     @JSONField(name = "voucherCode")
     @Excel(name = "凭证编号" )
     private String voucherCode;
+    /** 订单序号 **/
+    @JSONField(name = "orderNo")
+    @Excel(name = "订单序号")
+    private String orderNo;
 
     /** 凭证类型 **/
     @JSONField(name = "voucherType")
@@ -102,7 +106,6 @@ public class VoucherExcelVO{
     @JSONField(name = "voucherStatus")
     @Excel(name = "凭证状态" )
     private String voucherStatus;
-
     @JsonProperty("tableField111")
     @ExcelCollection(name="",orderNum = "8")
     private List<VoucherproductExcelVO> tableField111;

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO333.java

@@ -0,0 +1,109 @@
+package jnpf.model.voucher;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * Voucher
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-05-10
+ */
+@Data
+public class VoucherExcelVO333 {
+
+    /** 凭证编号 **/
+    @JSONField(name = "voucherCode")
+    @Excel(name = "凭证编号" )
+    private String voucherCode;
+
+    /** 订单序号 **/
+    @JSONField(name = "orderNo")
+    @Excel(name = "订单序号")
+    private String orderNo;
+
+    /** 单据类型 **/
+    @JSONField(name = "documentType")
+    @Excel(name = "单据类型")
+    private String documentType;
+
+    /** 凭证类型 **/
+    @JSONField(name = "voucherType")
+    @Excel(name = "凭证类型")
+    private String voucherType;
+
+    /** 凭证状态 **/
+    @JSONField(name = "voucherStatus")
+    @Excel(name = "凭证状态" )
+    private String voucherStatus;
+
+    /** 制单时间 **/
+    @JSONField(name = "preparationTime")
+    @Excel(name = "制单时间" )
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private String preparationTime;
+
+    /** 磅单编号 **/
+    @JSONField(name = "poundCode")
+    @Excel(name = "磅单编号" )
+    private String poundCode;
+
+    /** 车牌号 **/
+    @JSONField(name = "vehicleName")
+    @Excel(name = "车牌号" )
+    private String vehicleName;
+
+    /** 发货单位 **/
+    @JSONField(name = "supplierName")
+    @Excel(name = "发货单位" )
+    private String supplierName;
+
+    /** 收货单位 **/
+    @JSONField(name = "customerName")
+    @Excel(name = "收货单位" )
+    private String customerName;
+
+    /** 运输方式 **/
+    @JSONField(name = "modeTransport")
+    @Excel(name = "运输方式" )
+    private String modeTransport;
+
+    /** 承运方式 **/
+    @JSONField(name = "transportationMethod")
+    @Excel(name = "承运方式" )
+    private String transportationMethod;
+
+    /** 承运商 **/
+    @JSONField(name = "carrier")
+    @Excel(name = "承运商" )
+    private String carrier;
+
+    /** 起运地 **/
+    @JSONField(name = "placeDispatch")
+    @Excel(name = "起运地" )
+    private String placeDispatch;
+
+    /** 到达地 **/
+    @JSONField(name = "destination")
+    @Excel(name = "到达地" )
+    private String destination;
+
+    /** 运费 **/
+    @JSONField(name = "freight")
+    @Excel(name = "运费" )
+    private String freight;
+
+    /** 关联单据号 **/
+    @JSONField(name = "associatedDocumentNo")
+    @Excel(name = "关联单据号" )
+    private String associatedDocumentNo;
+
+}

jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue

@@ -752,7 +752,7 @@
                 </el-table-column>
               </el-table>
               <div class="table-actions" @click="addcwaccountcontractList()"
-                v-if="!judgeWrite('cwaccountcontractList') && dataForm.cwaccountcontractList.length == 0">
+                v-if="!judgeWrite('cwaccountcontractList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div>
             </jnpf-form-tip-item>
@@ -899,467 +899,6 @@
               <el-button type="text" icon="el-icon-plus">添加</el-button>
             </div>
           </el-col>
-          <el-col :span="24">
-            <div style="padding:15px 0px">
-              <span style="color: #409EFF;">▋</span>
-              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">凭证信息</span>
-            </div>
-          </el-col>
-          <el-col :span="24" v-if="judgeShow('cwaccountstorage-${html.relationField}')">
-            <jnpf-form-tip-item label-width="0">
-              <el-table :data="dataForm.cwaccountvoucherList" size='mini' show-summary
-                :summary-method="getSummaries1" border>
-                <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
-                <el-table-column label="凭证编号" v-if="judgeShow('cwaccountvoucher-voucherCode')"
-                  prop="voucherCode" align="center" width="200" fixed="left">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-voucherCode')">*</span>凭证编号
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.voucherCode"
-                      @change="changeData('cwaccountvoucher-voucherCode',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="订单序号" v-if="judgeShow('cwaccountvoucher-orderNo')"
-                  prop="orderNo" align="center" width="200">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-orderNo')">*</span>订单序号
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.orderNo"
-                      @change="changeData('cwaccountvoucher-orderNo',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="关联业务单号" v-if="judgeShow('cwaccountvoucher-orderId')"
-                  prop="orderId" align="center" width="200">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-orderId')">*</span>关联业务单号
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.orderId"
-                      @change="changeData('cwaccountvoucher-orderId',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="单据类型" v-if="judgeShow('cwaccountvoucher-documentType')"
-                  prop="documentType" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-documentType')">*</span>单据类型
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.documentType"
-                      @change="changeData('cwaccountvoucher-documentType',scope.$index)"
-                      placeholder="请选择" :disabled="true" clearable :style='{"width":"100%"}'
-                      :options="cwaccountvoucherdocumentTypeOptions"
-                      :props="cwaccountvoucherdocumentTypeProps">
-                    </JnpfSelect>
-                  </template>
-                </el-table-column>
-                <el-table-column label="凭证类型" v-if="judgeShow('cwaccountvoucher-voucherType')"
-                  prop="voucherType" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-voucherType')">*</span>凭证类型
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.voucherType"
-                      @change="changeData('cwaccountvoucher-voucherType',scope.$index)"
-                      placeholder="请选择" :disabled="true" clearable :style='{"width":"100%"}'
-                      :options="cwaccountvouchervoucherTypeOptions"
-                      :props="cwaccountvouchervoucherTypeProps">
-                    </JnpfSelect>
-                  </template>
-                </el-table-column>
-                <el-table-column label="司机名称" prop="driverName" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign">*</span>司机名称
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.driverName" placeholder="请输入" :disabled="true"
-                      clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="车牌号" v-if="judgeShow('cwaccountvoucher-vehicleName')"
-                  prop="vehicleName" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-vehicleName')">*</span>车牌号
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.vehicleName"
-                      @change="changeData('cwaccountvoucher-vehicleName',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="磅单编号" v-if="judgeShow('cwaccountvoucher-poundCode')"
-                  prop="poundCode" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-poundCode')">*</span>磅单编号
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.poundCode"
-                      @change="changeData('cwaccountvoucher-poundCode',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-
-                <el-table-column label="磅单时间" v-if="judgeShow('cwaccountvoucher-poundlistTime')"
-                  prop="poundlistTime" align="center" width="200">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-poundlistTime')">*</span>磅单时间
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfDatePicker v-model="scope.row.poundlistTime"
-                      @change="changeData('cwaccountvoucher-poundlistTime',scope.$index)"
-                      :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
-                      placeholder="请选择" :disabled="true" clearable :style='{"width":"100%"}'
-                      type="date" format="yyyy-MM-dd">
-                    </JnpfDatePicker>
-                  </template>
-                </el-table-column>
-                <el-table-column label="商品名称" prop="productName" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign">*</span>商品名称
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.productName" placeholder="请输入" :disabled="true"
-                      clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="规格" v-if="judgeShow('cwaccountvoucher-spec')" prop="spec"
-                  align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-spec')">*</span>规格
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.spec"
-                      @change="changeData('cwaccountvoucher-spec',scope.$index)" placeholder="请输入"
-                      :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="单位" v-if="judgeShow('cwaccountvoucher-unit')" prop="unit"
-                  align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-unit')">*</span>单位
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.unit"
-                      @change="changeData('cwaccountvoucher-unit',scope.$index)" placeholder="请输入"
-                      :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="毛重" v-if="judgeShow('cwaccountvoucher-grossWeight')"
-                  prop="grossWeight" align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-grossWeight')">*</span>毛重
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.grossWeight"
-                      @change="changeData('cwaccountvoucher-grossWeight',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="皮重" v-if="judgeShow('cwaccountvoucher-tareWeight')"
-                  prop="tareWeight" align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-tareWeight')">*</span>皮重
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.tareWeight"
-                      @change="changeData('cwaccountvoucher-tareWeight',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="扣重" v-if="judgeShow('cwaccountvoucher-buckleWeight')"
-                  prop="buckleWeight" align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-buckleWeight')">*</span>扣重
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.buckleWeight"
-                      @change="changeData('cwaccountvoucher-buckleWeight',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="结算重量" v-if="judgeShow('cwaccountvoucher-netWeight')"
-                  prop="netWeight" align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-netWeight')">*</span>结算重量
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.netWeight"
-                      @change="changeData('cwaccountvoucher-netWeight',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="扣杂重量" v-if="judgeShow('cwaccountvoucher-bucklesWeight')"
-                  prop="bucklesWeight" align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-bucklesWeight')">*</span>扣杂重量
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.bucklesWeight"
-                      @change="bucklesWeightChangeData(scope.row,scope.$index)" placeholder="请输入"
-                      :disabled="judgeWrite('cwaccountvoucherList')||judgeWrite('cwaccountvoucherList-bucklesWeight')"
-                      :addonAfter="scope.row.unit" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="小计重量" v-if="judgeShow('cwaccountvoucher-subtotalWeight')"
-                  prop="subtotalWeight" align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-subtotalWeight')">*</span>小计重量
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.subtotalWeight"
-                      @change="changeData('cwaccountvoucher-subtotalWeight',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="合同单价（含税）" v-if="judgeShow('cwaccountvoucher-contractPrice')"
-                  prop="contractPrice" align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-contractPrice')">*</span>合同单价（含税）
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.contractPrice"
-                      @change="changeData('cwaccountvoucher-contractPrice',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="税率(%)" v-if="judgeShow('cwaccountvoucher-rate')" prop="rate"
-                  align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-rate')">*</span>税率(%)
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.rate"
-                      @change="changeData('cwaccountvoucher-rate',scope.$index)" placeholder="请输入"
-                      :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="合同小计（含税）"
-                  v-if="judgeShow('cwaccountvoucher-contractSubtotal')" prop="contractSubtotal"
-                  align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-contractSubtotal')">*</span>合同小计（含税）
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.contractSubtotal"
-                      @change="changeData('cwaccountvoucher-contractSubtotal',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="结算单位" v-if="judgeShow('cwaccountvoucher-settlementUnit')"
-                  prop="settlementUnit" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-settlementUnit')">*</span>结算单位
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.settlementUnit"
-                      @change="changeData('cwaccountvoucher-settlementUnit',scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="结算数量" v-if="judgeShow('cwaccountvoucher-settlementSum')"
-                  prop="settlementSum" align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-settlementSum')">*</span>结算数量
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.settlementSum"
-                      @change="settlementSumChangeData(scope.row,scope.$index)" placeholder="请输入"
-                      :addonAfter="scope.row.unit" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="结算单价（含税）"
-                  v-if="judgeShow('cwaccountvoucher-settlementPrice')" prop="settlementPrice"
-                  align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-settlementPrice')">*</span>结算单价（含税）
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.settlementPrice"
-                      @change="settlementSumChangeData(scope.row,scope.$index)" placeholder="请输入"
-                      :disabled="judgeWrite('cwaccountvoucherList')||judgeWrite('cwaccountvoucherList-settlementPrice')"
-                      :addonAfter="'/' + scope.row.unit" addonBefore="¥" clearable
-                      :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="结算小计（含税）"
-                  v-if="judgeShow('cwaccountvoucher-settlementSubtotal')" prop="settlementSubtotal"
-                  align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-settlementSubtotal')">*</span>结算小计（含税）
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.settlementSubtotal"
-                      @change="settlementSubtotalChange(scope.row,scope.$index)" placeholder="请输入"
-                      :disabled="judgeWrite('cwaccountvoucherList')||judgeWrite('cwaccountvoucherList-settlementSubtotal')"
-                      addonBefore="¥" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="结算单价（不含税）"
-                  v-if="judgeShow('cwaccountvoucher-settlementPriceNo')" prop="settlementPriceNo"
-                  align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-settlementPriceNo')">*</span>结算单价（不含税）
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.settlementPriceNo"
-                      @change="changeData('cwaccountvoucher-settlementPriceNo',scope.$index)"
-                      placeholder="请输入" :disabled="true" :addonAfter="'/' + scope.row.unit"
-                      addonBefore="¥" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="结算小计（不含税）"
-                  v-if="judgeShow('cwaccountvoucher-settlementSubtotalNo')"
-                  prop="settlementSubtotalNo" align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-settlementSubtotalNo')">*</span>结算小计（不含税）
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.settlementSubtotalNo"
-                      @change="changeData('cwaccountvoucher-settlementSubtotalNo',scope.$index)"
-                      placeholder="请输入" :disabled="true" addonBefore="¥" clearable
-                      :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <!-- <el-table-column label="其他费用类型" v-if="judgeShow('cwaccountvoucher-otherType')" prop="otherType" align="center" width="300">
-                  <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('cwaccountvoucherList-otherType')">*</span>其他费用类型
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.otherType"
-                      @change="otherTypeChange(scope.row,scope.$index)" placeholder="请选择"
-                      :disabled="judgeWrite('cwaccountvoucherList')||judgeWrite('cwaccountvoucherList-otherType')"
-                      clearable :style='{"width":"40%"}' :options="cwaccountvoucherotherTypeOptions"
-                      :props="cwaccountvoucherotherTypeProps">
-                    </JnpfSelect>
-                    <JnpfInput v-model="scope.row.otherExpenses"
-                      @change="otherTypeChange(scope.row,scope.$index)" placeholder="请输入"
-                      :disabled="judgeWrite('cwaccountvoucherList')||judgeWrite('cwaccountvoucherList-otherExpenses')"
-                      addonBefore="¥" clearable :style='{"width":"60%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column> -->
-                <!-- <el-table-column label="其他费用" v-if="judgeShow('cwaccountvoucher-otherExpenses')" prop="otherExpenses" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('cwaccountvoucherList-otherExpenses')">*</span>其他费用
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.otherExpenses"
-                      @change="changeData('cwaccountvoucher-otherExpenses',scope.$index)" placeholder="请输入"
-                      :disabled="judgeWrite('cwaccountvoucherList')||judgeWrite('cwaccountvoucherList-otherExpenses')"
-                      addonBefore="¥" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column> -->
-                <el-table-column label="结算合计（含税）"
-                  v-if="judgeShow('cwaccountvoucher-settlementTotal')" prop="settlementTotal"
-                  align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-settlementTotal')">*</span>结算合计（含税）
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.settlementTotal"
-                      @change="changeData('cwaccountvoucher-settlementTotal',scope.$index)"
-                      placeholder="请输入" addonBefore="¥" :disabled="true" clearable
-                      :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="结算合计（不含税）"
-                  v-if="judgeShow('cwaccountvoucher-settlementTotalNo')" prop="settlementTotalNo"
-                  align="center" width="250">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-settlementTotalNo')">*</span>结算合计（不含税）
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.settlementTotalNo"
-                      @change="changeData('cwaccountvoucher-settlementTotalNo',scope.$index)"
-                      placeholder="请输入" addonBefore="¥" :disabled="true" clearable
-                      :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <el-table-column label="备注" v-if="judgeShow('cwaccountvoucher-remark')"
-                  prop="remark" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('cwaccountvoucherList-remark')">*</span>备注
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.remark"
-                      @change="changeData('cwaccountvoucher-remark',scope.$index)" placeholder="请输入"
-                      :disabled="judgeWrite('cwaccountvoucherList')||judgeWrite('cwaccountvoucherList-remark')"
-                      clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-                <!-- <el-table-column label="操作" width="50" v-if="!judgeWrite('cwaccountvoucherList')">
-                  <template slot-scope="scope">
-                    <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                      @click="delcwaccountvoucherList(scope.$index)">删除</el-button>
-                  </template>
-                </el-table-column> -->
-              </el-table>
-              <div class="table-actions" @click="addcwaccountvoucherList()"
-                v-if="!judgeWrite('cwaccountvoucherList')">
-                <el-button type="text" icon="el-icon-plus">加载凭证</el-button>
-              </div>
-            </jnpf-form-tip-item>
-          </el-col>
           <el-col :span="24">
             <div style="padding:15px 0px">
               <span style="color: #409EFF;">▋</span>
@@ -1369,7 +908,7 @@
           <el-col :span="6">
             <jnpf-form-tip-item label="汇总类型">
               <JnpfSelect v-model="dataForm.summaryType" @change="changeData('summaryType', -1)"
-                placeholder="请选择" :disabled="judgeWrite('accountSubjectId')"
+                placeholder="请选择" :disabled="true"
                 :style='{ "width": "100%" }' :options="summaryTypeOptions"
                 :props="summaryTypeProps">
               </JnpfSelect>
@@ -1866,7 +1405,7 @@ export default {
       Vmodel: "",
       currVmodel: "",
       dataForm: {
-        summaryType: '1',
+        summaryType: '2',
         subjectId: '',
         contractType: '',
         type: '1',
@@ -2344,6 +1883,7 @@ export default {
         const e = list[i];
         this.dataForm.cwaccountstorageList.push(e)
       }
+      this.addcwaccountvoucherList();
     },
     typeChangeData() {
       this.dataForm.cwaccountsubjectList = [];
@@ -2359,22 +1899,22 @@ export default {
         this.dataForm.businessType = '3'
       }
     },
-    contractChangeData(model, row) {
-      this.dataForm.cwaccountcontractList[0].contractName = row.contract_name
-      this.dataForm.cwaccountcontractList[0].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : '';
-      this.dataForm.cwaccountcontractList[0].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : '';
+    contractChangeData(model, row, rowIndex) {
+      this.dataForm.cwaccountcontractList[rowIndex].contractName = row.contract_name
+      this.dataForm.cwaccountcontractList[rowIndex].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : '';
+      this.dataForm.cwaccountcontractList[rowIndex].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : '';
       //this.dataForm.cwaccountcontractList[0].currency = row.currency;
-      this.dataForm.cwaccountcontractList[0].procurementModel = row.procurement_model;
-      this.dataForm.cwaccountcontractList[0].pricingModel = row.pricing_model;
-      this.dataForm.cwaccountcontractList[0].relatedContractId = row.related_contract_id;
-      this.dataForm.cwaccountcontractList[0].subject = row.subject;
-      this.dataForm.cwaccountcontractList[0].subject2 = row.subject2;
-      this.dataForm.cwaccountcontractList[0].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : '';
-      this.dataForm.cwaccountcontractList[0].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : '';
-      this.dataForm.cwaccountcontractList[0].deliveryModel = row.delivery_model;
-      this.dataForm.cwaccountcontractList[0].deliveryMethod = row.delivery_method;
-      this.dataForm.cwaccountcontractList[0].modeTransport = row.mode_transport;
-      this.dataForm.cwaccountcontractList[0].costBearingMian = row.cost_bearing_mian;
+      this.dataForm.cwaccountcontractList[rowIndex].procurementModel = row.procurement_model;
+      this.dataForm.cwaccountcontractList[rowIndex].pricingModel = row.pricing_model;
+      this.dataForm.cwaccountcontractList[rowIndex].relatedContractId = row.related_contract_id;
+      this.dataForm.cwaccountcontractList[rowIndex].subject = row.subject;
+      this.dataForm.cwaccountcontractList[rowIndex].subject2 = row.subject2;
+      this.dataForm.cwaccountcontractList[rowIndex].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : '';
+      this.dataForm.cwaccountcontractList[rowIndex].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : '';
+      this.dataForm.cwaccountcontractList[rowIndex].deliveryModel = row.delivery_model;
+      this.dataForm.cwaccountcontractList[rowIndex].deliveryMethod = row.delivery_method;
+      this.dataForm.cwaccountcontractList[rowIndex].modeTransport = row.mode_transport;
+      this.dataForm.cwaccountcontractList[rowIndex].costBearingMian = row.cost_bearing_mian;
     },
     subjectChangeData(model, row) {
       this.dataForm.subjectId = row.id;
@@ -2516,7 +2056,7 @@ export default {
       if (!this.cwaccountsubjectExist()) return
       if (!this.cwaccountcontractExist()) return
       if (!this.cwaccountstorageExist()) return
-      if (!this.cwaccountvoucherExist()) return
+      // if (!this.cwaccountvoucherExist()) return
       if (!this.cwaccountsummaryExist()) return
       return isOk
     },

jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue

@@ -758,7 +758,7 @@
                 </el-table-column>
               </el-table>
               <div class="table-actions" @click="addcwsettlementcontractList()"
-                v-if="!judgeWrite('cwsettlementcontractList') && dataForm.cwsettlementcontractList.length == 0">
+                v-if="!judgeWrite('cwsettlementcontractList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div>
             </jnpf-form-tip-item>
@@ -2506,22 +2506,22 @@ export default {
         this.$refs.goodsBox2.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectId)
       })
     },
-    contractChangeData(model, row) {
-      this.dataForm.cwsettlementcontractList[0].contractName = row.contract_name
-      this.dataForm.cwsettlementcontractList[0].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : '';
-      this.dataForm.cwsettlementcontractList[0].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : '';
+    contractChangeData(model, row, rowIndex) {
+      this.dataForm.cwsettlementcontractList[rowIndex].contractName = row.contract_name
+      this.dataForm.cwsettlementcontractList[rowIndex].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : '';
+      this.dataForm.cwsettlementcontractList[rowIndex].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : '';
       //this.dataForm.cwsettlementcontractList[0].currency = row.currency;
-      this.dataForm.cwsettlementcontractList[0].procurementModel = row.procurement_model;
-      this.dataForm.cwsettlementcontractList[0].pricingModel = row.pricing_model;
-      this.dataForm.cwsettlementcontractList[0].relatedContractId = row.related_contract_id;
-      this.dataForm.cwsettlementcontractList[0].subject = row.subject;
-      this.dataForm.cwsettlementcontractList[0].subject2 = row.subject2;
-      this.dataForm.cwsettlementcontractList[0].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : '';
-      this.dataForm.cwsettlementcontractList[0].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : '';
-      this.dataForm.cwsettlementcontractList[0].deliveryModel = row.delivery_model;
-      this.dataForm.cwsettlementcontractList[0].deliveryMethod = row.delivery_method;
-      this.dataForm.cwsettlementcontractList[0].modeTransport = row.mode_transport;
-      this.dataForm.cwsettlementcontractList[0].costBearingMian = row.cost_bearing_mian;
+      this.dataForm.cwsettlementcontractList[rowIndex].procurementModel = row.procurement_model;
+      this.dataForm.cwsettlementcontractList[rowIndex].pricingModel = row.pricing_model;
+      this.dataForm.cwsettlementcontractList[rowIndex].relatedContractId = row.related_contract_id;
+      this.dataForm.cwsettlementcontractList[rowIndex].subject = row.subject;
+      this.dataForm.cwsettlementcontractList[rowIndex].subject2 = row.subject2;
+      this.dataForm.cwsettlementcontractList[rowIndex].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : '';
+      this.dataForm.cwsettlementcontractList[rowIndex].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : '';
+      this.dataForm.cwsettlementcontractList[rowIndex].deliveryModel = row.delivery_model;
+      this.dataForm.cwsettlementcontractList[rowIndex].deliveryMethod = row.delivery_method;
+      this.dataForm.cwsettlementcontractList[rowIndex].modeTransport = row.mode_transport;
+      this.dataForm.cwsettlementcontractList[rowIndex].costBearingMian = row.cost_bearing_mian;
     },
     subjectChangeData(model, row) {
       let aaa = {};

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue

@@ -669,7 +669,7 @@ export default {
     handelUpload() {
       this.uploadBoxVisible = true
       this.$nextTick(() => {
-        this.$refs.UploadBox.init("", "scm/Voucher", undefined, undefined, "采购", "退供凭证")
+        this.$refs.UploadBox.init("", "scm/Voucher", undefined, undefined, "采购", "收货凭证")
       })
     },
     handleSelectionChange(val) {

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue

@@ -83,7 +83,9 @@
             <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
               v-has="'btn_download'">导出
             </el-button>
-
+            <el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()"
+              v-has="'btn_upload'">导入
+            </el-button>
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="createSaleOrder()">生成销售单
             </el-button>
@@ -881,7 +883,7 @@ export default {
     handelUpload() {
       this.uploadBoxVisible = true
       this.$nextTick(() => {
-        this.$refs.UploadBox.init("", "scm/Voucher")
+        this.$refs.UploadBox.init("", "scm/Vehicle")
       })
     },
     handleSelectionChange(val) {

jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue

@@ -48,7 +48,7 @@
           :loading="candidateLoading" :disabled="allBtnDisabled">
           {{ properties.submitBtnText || '提 交' }}</el-button>
         <el-button type="primary" @click="eventLauncher('audit')" :loading="candidateLoading"
-          v-if="setting.opType == 1 && properties.hasAuditBtn">{{ properties.auditBtnText || '通 过' }}
+          v-if="setting.opType == 1 && properties.hasAuditBtn">审 批
         </el-button>
         <el-button type="primary" @click="press()"
           v-if="setting.opType == 0 && setting.status == 1 && (properties.hasPressBtn || properties.hasPressBtn === undefined)">
@@ -176,7 +176,7 @@
       <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false">{{ $t('common.cancelButton') }}</el-button>
         <el-button type="primary" @click="handleApproval()" :loading="approvalBtnLoading">
-          {{ $t('common.confirmButton') }}
+          通 过
         </el-button>
       </span>
 
@@ -210,7 +210,7 @@
       <span slot="footer" class="dialog-footer">
         <el-button @click="resurgenceVisible = false">{{ $t('common.cancelButton') }}</el-button>
         <el-button type="primary" @click="handleResurgence()" :loading="resurgenceBtnLoading">
-          {{ $t('common.confirmButton') }}
+          通 过
         </el-button>
       </span>
     </el-dialog>