north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -14,6 +14,7 @@ import footSum from "@/hook/footSum"; import {changeFilterEvent,filterChanged} from "@/hook" import companyInfo from "@/stores/sd/companyInfo"; import {multiply} from "@/utils/decimal"; //语言获取 const { t } = useI18n() @@ -211,7 +212,6 @@ pageTotal.value=res.data.total titleUploadData.value=deepClone(res.data.delivery) titleUploadData.value.deliveryId=str console.log(titleUploadData.value) //根据审核状态显示审核按钮或者是反审按钮 @@ -298,6 +298,7 @@ customConfig: { storage: true }, checkboxConfig:{checkAll:true}, mouseConfig:{selected: true},//鼠标选中 keyboardConfig:{isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true}, editConfig: { @@ -585,6 +586,16 @@ }) const editClosedEvent = ({ row, column }) => { if (['deliveryDetail.quantity'].includes(column.property)) { if(parseInt(row.deliveryDetail.quantity)===0){ xGrid.value.setCheckboxRow(row, false); } } } </script> @@ -678,6 +689,7 @@ v-bind="gridOptions" v-on="gridEvents" :edit-rules="validRules" @edit-closed="editClosedEvent" > <template #num1_filter="{ column, $panel }"> north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java
@@ -25,7 +25,7 @@ @ExcelProperty("面积") private Double area; @ExcelProperty("单价") private Integer price; private Double price; @ExcelProperty("金额") private Double money;
@@ -29,7 +29,7 @@ @ExcelProperty("数量") private Integer quantity; @ExcelProperty("单价") private Integer price; private Double price; @ExcelProperty("面积") private Double area; @ExcelProperty("其他金额") north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailProductDTO.java
@@ -28,7 +28,7 @@ @ExcelProperty("数量") private Integer quantity; @ExcelProperty("单价") private Integer price; private Double price; @ExcelProperty("面积") private Double area; @ExcelProperty("其他金额") north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -239,6 +239,7 @@ //获取对象集合循环进行新增修改 if (!orderDetaillist.isEmpty()) { for (OrderDetail orderDetail : orderDetaillist) { if(orderDetail.getDeliveryDetail().getQuantity()>0){ OrderDetail orderDetails =deliveryDetailMapper.selectOrderDetailDeliveryCount(orderDetail); Boolean aBoolean1 =orderDetails.getQuantity()>= orderDetail.getDeliveryDetail().getQuantity()+orderDetails.getDeliveryNum(); Boolean aBoolean2 = !Integer.valueOf(orderDetails.getQuantity().toString()).equals(orderDetails.getDeliveryNum()); @@ -355,7 +356,7 @@ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); return "false2"; } } } //往订单其他金额副表传入数据
