yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自动编号显示

Browse Source
product
杨世强 2 years ago
parent 5480574097
commit 9d63813d04
18 changed files with 400 additions and 76 deletions
Show Stats Download Patch File Download Diff File

2
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java
Unescape View File

@ -133,7 +133,7 @@ public class ArinvoicesController {
public ActionResult create(@RequestBody @Valid ArinvoicesCrForm arinvoicesCrForm) throws DataException {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
arinvoicesCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
// arinvoicesCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
ArinvoicesEntity entity = JsonUtil.getJsonToBean(arinvoicesCrForm, ArinvoicesEntity.class);
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getInfo(entity.getSalesOrderId());
saleorderitemEntity.setStatus("2");//修改销售订单状态

13
SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java
Unescape View File

@ -23,6 +23,8 @@ import jnpf.saleorder.entity.Salesorder_item0Entity;
import jnpf.saleorder.service.SaleorderitemService;
import jnpf.saleorder.service.Salesorder_item0Service;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.ibatis.annotations.Param;
import org.bytedeco.opencv.presets.opencv_core;
import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity;
import jnpf.collection.model.collection.*;
@ -97,6 +99,13 @@ public class CollectionController {
@Autowired
private PoundlistService poundlistService;
@GetMapping("/autoSerialNum")
@Transactional
public ActionResult autoSerialNum(@Param("param") String param,@Param("batchNum") String batchNum) throws DataException {
String result = generaterSwapUtil.getBillNumber(param, false);
return ActionResult.success(result);
}
/**
* 提交
*
@ -267,7 +276,7 @@ public class CollectionController {
}
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
// collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class);
entity.setId(mainId);
collectionService.save(entity);
@ -448,6 +457,7 @@ public class CollectionController {
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SaleorderitemEntity::getId, collection_item0Entity.getSalesorderId());
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
collection_item0Entity.setPrice(saleorderitemEntity.getPrice());
collection_item0Entity.setAmountCollected(saleorderitemEntity.getAmountCollected());
collection_item0Entity.setContractId(saleorderitemEntity.getContractId());
@ -457,6 +467,7 @@ public class CollectionController {
collection_item0Entity.setAdvanceAmount(saleorderitemEntity.getAdvanceAmount());
collection_item0Entity.setRate(saleorderitemEntity.getRate());
collection_item0Entity.setNotPrice(saleorderitemEntity.getNotPrice());
}
}
vo.setCollection_item0List(JsonUtil.getJsonToList(Collection_item0List,Collection_item0Model.class ));
//副表

3
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
Unescape View File

@ -85,7 +85,7 @@ public class PoundlistController {
* @return
*/
@PostMapping("/createsale/{ids}")
public ActionResult createSale(@PathVariable("ids") String ids){
public ActionResult createSale(@PathVariable("ids") String ids) throws DataException {
String[] idList = ids.split(",");
List<PoundlistEntity> list = new ArrayList<>();
for (String allId : idList){
@ -97,6 +97,7 @@ public class PoundlistController {
if (ObjectUtils.isNotEmpty(poundlistEntity)) {
ContractFileEntity entity = contractFileService.getInfo(poundlistEntity.getSalesId());
poundlistEntity.setContractNo(entity.getContractNo());
poundlistEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false));
list.add(poundlistEntity);
}
}

2
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java
Unescape View File

@ -211,4 +211,6 @@ public class PoundlistEntity {
private String contractNo;
@TableField(exist = false)
private String purchaseContractNo;
@TableField(exist = false)
private String documentNo;
}

3
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java
Unescape View File

@ -178,7 +178,7 @@ public class ReceiptoutController {
public ActionResult create(@RequestBody @Valid ReceiptoutCrForm receiptoutCrForm) throws DataException {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));
// receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));
receiptoutCrForm.setCreatorTime(DateUtil.getNow());
receiptoutCrForm.setCreatorUserName(userInfo.getUserId());
ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class);
@ -188,6 +188,7 @@ public class ReceiptoutController {
for(Receiptout_item0Entity entitys : Receiptout_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setReceiptinId(entity.getId());
// entitys.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false));
receiptout_item0Service.save(entitys);
}
return ActionResult.success("创建成功");

2
SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java
Unescape View File

@ -137,7 +137,7 @@ public class SalebackController {
public ActionResult create(@RequestBody @Valid SalebackCrForm salebackCrForm) throws DataException {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
salebackCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false));
// salebackCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false));
salebackCrForm.setCreatorTime(DateUtil.getNow());
salebackCrForm.setCreatorUserName(userInfo.getUserId());
SalebackEntity entity = JsonUtil.getJsonToBean(salebackCrForm, SalebackEntity.class);

32
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
Unescape View File

@ -35,6 +35,7 @@ import jnpf.reservoirarea.entity.ReservoirareaEntity;
import jnpf.reservoirarea.service.ReservoirareaService;
import jnpf.saleorder.mapper.ReceiptoutsoitemMapper;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.ibatis.annotations.Param;
import org.bytedeco.opencv.presets.opencv_core;
import org.springframework.security.core.parameters.P;
import org.springframework.transaction.annotation.Transactional;
@ -151,11 +152,11 @@ public class SaleorderitemController {
* @param poundlistEntity
* @return
*/
@PutMapping("/updatePrice/{id}")
public ActionResult updatePrice(@PathVariable("id") String id ,@RequestBody PoundlistEntity poundlistEntity){
String ids = id;
PoundlistEntity entity = poundlistEntity;
return ActionResult.success("1");
@PostMapping("/updatePrice")
@Transactional
public ActionResult updatePrice(@RequestBody PoundlistEntity poundlistEntity){
poundlistService.updateById(poundlistEntity);
return ActionResult.success("修改单价成功");
}
/**
@ -166,7 +167,7 @@ public class SaleorderitemController {
*/
@PostMapping("/delivery/{ids}")
@Transactional
public ActionResult delivery(@PathVariable("ids") String ids){
public ActionResult delivery(@PathVariable("ids") String ids) throws DataException {
String[] idList = ids.split(",");
List<SaleorderitemEntity> list = new ArrayList<>();
for (String id : idList){
@ -195,7 +196,9 @@ public class SaleorderitemController {
queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
entity.setPoundEntity(poundlistEntity);
entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false));
}
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));
saleorderitemEntity.setList(dList);
list.add(saleorderitemEntity);
}else{
@ -213,7 +216,7 @@ public class SaleorderitemController {
@PostMapping("/invoiceentry/{ids}")
@Transactional
public ActionResult invoiceEntry(@PathVariable("ids") String ids){
public ActionResult invoiceEntry(@PathVariable("ids") String ids) throws DataException {
String[] idList = ids.split(",");
for (String id : idList) {
QueryWrapper<ArinvoicesEntity> queryWrapper2 = new QueryWrapper<>();
@ -246,6 +249,7 @@ public class SaleorderitemController {
entity.setPoundEntity(poundlistEntity);
}
saleorderitemEntity.setList(dList);
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
list.add(saleorderitemEntity);
return ActionResult.success(list);
} else {
@ -310,7 +314,7 @@ public class SaleorderitemController {
*/
@PostMapping("/materialback/{ids}")
@Transactional
public ActionResult materialBack(@PathVariable("ids") String ids) {
public ActionResult materialBack(@PathVariable("ids") String ids) throws DataException {
String[] idList = ids.split(",");
List<SaleorderitemEntity> list = new ArrayList<>();
for (String id : idList){
@ -334,6 +338,7 @@ public class SaleorderitemController {
entity.setPoundEntity(poundlistEntity);
}
saleorderitemEntity.setList(dList);
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false));
list.add(saleorderitemEntity);
}else{
return ActionResult.fail("未找到该数据");
@ -350,7 +355,7 @@ public class SaleorderitemController {
*/
@PostMapping("/collection/{ids}")
@Transactional
public ActionResult collection(@PathVariable("ids") String ids) {
public ActionResult collection(@PathVariable("ids") String ids) throws DataException {
String[] idList = ids.split(",");
List<SaleorderitemEntity> list = new ArrayList<>();
for (String id : idList){
@ -369,6 +374,7 @@ public class SaleorderitemController {
entity.setPoundEntity(poundlistEntity);
}
sale.setList(dList);
sale.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
list.add(sale);
}else{
return ActionResult.fail("数据状态无法回款");
@ -419,7 +425,7 @@ public class SaleorderitemController {
public ActionResult create(@RequestBody @Valid SaleorderitemCrForm saleorderitemCrForm) throws DataException {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false));
// saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false));
saleorderitemCrForm.setCreatorUserName(userInfo.getUserId());
saleorderitemCrForm.setCreatorTime(DateUtil.getNow());
SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderitemCrForm, SaleorderitemEntity.class);
@ -800,6 +806,12 @@ public class SaleorderitemController {
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderId(entity.getId());
salesorder_item0Service.save(entitys);
if (entitys.getUnitPrice() != null && entitys.getPoundlistId() !=null) {
PoundlistEntity poundlistEntity = new PoundlistEntity();
poundlistEntity.setSalesPrice(entitys.getUnitPrice());
poundlistEntity.setId(entitys.getPoundlistId());
poundlistService.updateById(poundlistEntity);
}
}
return ActionResult.success("更新成功");
}else{

3
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
Unescape View File

@ -149,6 +149,9 @@ public class Salesorder_item0Entity {
@TableField(exist = false)
private PoundlistEntity poundEntity;
@TableField(exist = false)
private String batchNo;
}

81
SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
Unescape View File

@ -130,7 +130,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.arinvoices_item1List" size='mini' >
<el-table :data="dataForm.arinvoices_item1List" size='mini' show-summary :summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialId" label="物料" align="center" width="180">
<template slot-scope="scope">
@ -217,7 +217,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.arinvoices_item0List" size='mini' >
<el-table :data="dataForm.arinvoices_item0List" size='mini' show-summary :summary-method="getSummaries2" >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="invoiceCode" label="发票代码">
<template slot-scope="scope">
@ -226,28 +226,28 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceNo" label="发票号码">
<el-table-column prop="invoiceNo" label="发票号码" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceQuantity" label="发票数量">
<el-table-column prop="invoiceQuantity" label="发票数量" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceQuantity"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="involceAmount" label="发票金额">
<el-table-column prop="involceAmount" label="发票金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.involceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="taxRate" label="税率 ">
<el-table-column prop="taxRate" label="税率 " align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.taxRate"
placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -255,21 +255,21 @@
</el-select>
</template>
</el-table-column>
<el-table-column prop="taxAmount" label="税额">
<el-table-column prop="taxAmount" label="税额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.taxAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="amountNotTax" label="不含税金额">
<el-table-column prop="amountNotTax" label="不含税金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.amountNotTax"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceStatus" label="发票状态">
<el-table-column prop="invoiceStatus" label="发票状态" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.invoiceStatus"
placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -277,14 +277,14 @@
</el-select>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人">
<el-table-column prop="creatorUserName" label="开票人" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceDate" label="开票日期">
<el-table-column prop="invoiceDate" label="开票日期" align="center" width="130">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.invoiceDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
@ -364,6 +364,54 @@
},
mounted() {},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 2 || index === 3 || index === 5 || index === 7 || index === 8)) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
getSummaries2(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 3 || index === 4 || index === 6 || index === 7 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
arinvoices_item1Exist() {
let isOk = true;
for(let i=0;i<this.dataForm.arinvoices_item1List.length;i++){
@ -388,6 +436,17 @@
data[key] = "";
}
}
let param = {
"param" : 'arinvoices'
}
request({
url: '/api/collection/Collection/autoSerialNum',
method: 'get',
data: param
}).then(res => {
this.dataForm.documentNo = res.msg
this.loading = false
});
},
init(id, isDetail) {
this.dataForm.id = id || 0;

46
SC-web/src/views/scm/basicInformation/collection/Form.vue
Unescape View File

@ -116,7 +116,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collection_item0List" size='mini' >
<el-table :data="dataForm.collection_item0List" size='mini' show-summary :summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="amount" label="收款金额" align="center" width="130">
<template slot-scope="scope">
@ -392,6 +392,30 @@
created() {},
mounted() {},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 1 || index === 2 || index === 3 || index === 6 || index === 7 || index === 8 || index === 9)) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
amountSum(){
let sum = 0;
for (let i = 0; i<this.dataForm.collection_item0List.length;i++){
@ -436,15 +460,17 @@
data[key] = "";
}
}
// request({
// url: '/api/collection/Collection/autoCreate',
// method: 'get'
// }).then(res => {
// debugger
// this.dataForm.documentNo = res.msg
// debugger
// this.loading = false
// });
let params = {
"param" : 'collection'
}
request({
url: '/api/collection/Collection/autoSerialNum',
method: 'get',
data: params
}).then(res => {
this.dataForm.documentNo = res.msg
this.loading = false
});
},
init(id, isDetail) {
this.dataForm.id = id || 0;

27
SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
Unescape View File

@ -173,7 +173,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.salesorder_item0List" size='mini' >
<el-table :data="dataForm.salesorder_item0List" size='mini' show-summary :summary-method="getSummaries" >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="vehicleId" label="车号" align="center" width="130">
<template slot-scope="scope">
@ -797,6 +797,30 @@
this.dataForm.price = price;
this.dataForm.notPrice = notPrice;
},
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 3 || index === 5 || index === 7 || index === 8 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
computeNoPrice(){
let notPrice = 0;
for (let i = 0;i<this.dataForm.salesorder_item0List.length;i++) {
@ -896,6 +920,7 @@
this.visible = true;
this.dataForm.salesorder_item0List = list;
debugger
this.dataForm.documentNo = list[0].documentNo;
this.dataForm.contractId = list[0].salesId;
this.dataForm.customerId = list[0].customerId;
this.dataForm.contractNo = list[0].contractNo;

38
SC-web/src/views/scm/basicInformation/receiptout/Form.vue
Unescape View File

@ -110,7 +110,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.receiptout_item0List" size='mini' >
<el-table :data="dataForm.receiptout_item0List" size='mini' show-summary :summary-method="getSummaries" >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
<template slot-scope="scope">
@ -296,6 +296,30 @@
},
mounted() {},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 5 || index === 7 || index === 9 || index === 10 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
receiptout_item0Exist() {
let isOk = true;
for(let i=0;i<this.dataForm.receiptout_item0List.length;i++){
@ -313,6 +337,18 @@
data[key] = "";
}
}
let param = {
"param" : 'chuku',
"batchNum" : 'receiptout-num'
}
request({
url: '/api/collection/Collection/autoSerialNum',
method: 'get',
data: param
}).then(res => {
this.dataForm.documentNo = res.msg
this.loading = false
});
},
init(id, isDetail) {
this.dataForm.id = id || 0;

51
SC-web/src/views/scm/basicInformation/saleback/Form.vue
Unescape View File

@ -62,7 +62,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.saleback_item0List" size='mini'>
<el-table :data="dataForm.saleback_item0List" size='mini' show-summary :summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
<template slot-scope="scope">
@ -335,10 +335,33 @@
created() {},
mounted() {},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 3 || index === 5 || index === 7 || index === 8 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
popupSelectChange2(a, b){
var excludeFields = [];
for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
// <<<<<<< HEAD
excludeFields.push(this.dataForm.saleback_item0List[i].vehicleId);
if(a == this.dataForm.saleback_item0List[i].vehicleId){
this.dataForm.saleback_item0List[i].materialId = b.material_id;
@ -355,19 +378,6 @@
this.dataForm.saleback_item0List[i].notAmount = this.dataForm.saleback_item0List[i].amount*item.fullName/100
}
})
// =======
// excludeFields.push(this.dataForm.saleback_item0List[i].licenseNo);
// if(a == this.dataForm.saleback_item0List[i].licenseNum){
// this.dataForm.saleback_item0List[i].materialName = b.material_name;
// this.dataForm.saleback_item0List[i].settlement = b.settlement;
// this.dataForm.saleback_item0List[i].unit = b.unit;
// this.dataForm.saleback_item0List[i].price = b.unit_price;
// this.dataForm.saleback_item0List[i].rate = b.rate;
// this.dataForm.saleback_item0List[i].amount = b.amount;
// this.dataForm.saleback_item0List[i].notAmount = b.not_amount;
// this.dataForm.saleback_item0List[i].pountUser = b.pound_user;
// this.dataForm.saleback_item0List[i].pountType = b.pound_type;
// >>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
}
}
let price =
@ -395,6 +405,17 @@
data[key] = "";
}
}
let param = {
"param" : 'salesBack'
}
request({
url: '/api/collection/Collection/autoSerialNum',
method: 'get',
data: param
}).then(res => {
this.dataForm.documentNo = res.msg
this.loading = false
});
},
init(id, isDetail) {
this.dataForm.id = id || 0;

11
SC-web/src/views/scm/basicInformation/saleorder/Form.vue
Unescape View File

@ -717,10 +717,13 @@
item.noPrice = item.price * (100 - item2.fullName) / 100;//子表不含税金额
}
});
// let params = {}
// params.id = row.poundlistId
// params.salesPrice = item.unitPrice
// request({
// url: '/api/saleorder/Saleorderitem/updatePrice'+row.poundlistId,
// method: 'PUT',
// data: item.price
// url: '/api/saleorder/Saleorderitem/updatePrice',
// method: 'post',
// data: params
// }).then((res) => {
// this.$message({
// message: res.msg,
@ -760,7 +763,7 @@
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 8 || index === 10 || index === 11 )) {
if (!values.every(value => isNaN(value)) && (index === 4 || index === 7 || index === 8 || index === 10 || index === 11 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {

53
SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
Unescape View File

@ -130,7 +130,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.arinvoices_item1List" size='mini' >
<el-table :data="dataForm.arinvoices_item1List" size='mini' show-summary :summary-method="getSummaries" >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialId" label="物料" align="center" width="180">
<template slot-scope="scope">
@ -217,7 +217,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.arinvoices_item0List" size='mini' >
<el-table :data="dataForm.arinvoices_item0List" size='mini' show-summary :summary-method="getSummaries2" >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="invoiceCode" label="发票代码" align="center" width="130">
<template slot-scope="scope">
@ -368,6 +368,54 @@
},
mounted() {},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 2 || index === 3 || index === 5 || index === 7 || index === 8)) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
getSummaries2(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 3 || index === 4 || index === 6 || index === 7 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
invoiceQuantitySum(){
debugger
let sum = 0;
@ -434,6 +482,7 @@
this.visible = true;
let amount = 0;
let num = 0;
this.dataForm.documentNo = list[0].documentNo;
this.dataForm.contractId = list[0].contractId;
this.dataForm.customerId = list[0].customerId;
debugger

27
SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
Unescape View File

@ -128,7 +128,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collection_item0List" size='mini' >
<el-table :data="dataForm.collection_item0List" size='mini' show-summary :summary-method="getSummaries" >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="amount" label="收款金额" align="center" width="130">
<template slot-scope="scope">
@ -277,6 +277,30 @@
},
mounted() {},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 1 || index === 2 || index === 3 || index === 6 || index === 7 || index === 8 || index === 9)) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
amountSum(){
let sum = 0;
for (let i = 0;i<this.dataForm.collection_item0List.length;i++){
@ -305,6 +329,7 @@
init(list) {
this.dataForm.amountCollected = null;
this.visible = true;
this.dataForm.documentNo = list[0].documentNo;
this.dataForm.customerId = list[0].customerId;
this.dataForm.contractId = list[0].contractId;
this.dataForm.collection_item0List = list;

27
SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
Unescape View File

@ -110,7 +110,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.receiptout_item0List" size='mini' >
<el-table :data="dataForm.receiptout_item0List" size='mini' show-summary :summary-method="getSummaries" >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
<template slot-scope="scope">
@ -295,6 +295,30 @@
},
mounted() {},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 5 || index === 7 || index === 9 || index === 10 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
areaSelect(a,b){
for (let i = 0;i<this.dataForm.receiptout_item0List.length;i++) {
if (a == this.dataForm.receiptout_item0List[i].reservoirareaId) {
@ -322,6 +346,7 @@
},
init(list) {
this.visible = true;
this.dataForm.documentNo = list[0].documentNo;
this.dataForm.amount = list[0].price;
this.dataForm.num = list[0].num;
this.dataForm.sourceNo = list[0].id;

27
SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
Unescape View File

@ -62,7 +62,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.saleback_item0List" size='mini'>
<el-table :data="dataForm.saleback_item0List" size='mini' show-summary :summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center" />
<!-- <el-table-column prop="licenseNum" label="车牌号">-->
<!-- <template slot-scope="scope">-->
@ -306,6 +306,30 @@
created() {},
mounted() {},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 3 || index === 5 || index === 7 || index === 8 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
popupSelectChange2(a, b){
debugger
var excludeFields = [];
@ -355,6 +379,7 @@
},
init(list) {
this.visible = true;
this.dataForm.documentNo = list[0].documentNo;
this.dataForm.salesOrderId = list[0].id;
this.dataForm.refundAmount = list[0].price;
this.dataForm.refundNum = list[0].num;

Write Preview
Loading…
Cancel
Save