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

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent b164833630 578ffee46d
commit c2697e7dd5
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -259,4 +259,5 @@ public class PoundlistEntity {
@Excel(name = "销售金额")
@TableField(exist = false)
private String salesAmount;
}

2
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
Unescape View File

@ -477,7 +477,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
}
poundlistEntity.setRate("0");
if (StringUtils.isNotEmpty(model.getSalesPrice())){
poundlistEntity.setUnitPrice(new BigDecimal(model.getSalesPrice()));
poundlistEntity.setSalesPrice(new BigDecimal(model.getSalesPrice()));
}
if (StringUtils.isNotEmpty(model.getSalesAmount())){
poundlistEntity.setPrice(new BigDecimal(model.getSalesAmount()));

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

@ -858,8 +858,9 @@
}
})
this.dataForm.salesorder_item0List.forEach((item, index) => {
debugger
if (row.vehicleId == item.vehicleId) {
item.unitPrice = this.jnpf.floatDiv(item.price,item.settlement).toFixed(2) //子表单价
item.unitPrice = this.jnpf.floatDiv(item.price,item.settlement).toFixed(6) //子表单价
// item.price = this.jnpf.floatMul(item.settlement, item.unitPrice).toFixed(2)//子表金额
item.noPrice = this.jnpf.floatDiv(item.price, this.jnpf.floatAdd(1, this.jnpf.floatDiv(rate, 100))).toFixed(2)//子表不含税金额
}
@ -1056,6 +1057,7 @@
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
init2(list) {
debugger
this.visible = true
this.dataForm.salesorder_item0List = list
this.dataForm.documentNo = list[0].documentNo
@ -1072,16 +1074,12 @@
var advance = 0
var notPrice = 0
for (let i = 0; i < list.length; i++) {
if(list[i].salesPrice != null){
this.dataForm.salesorder_item0List[i].unitPrice = list[i].unitPrice;
}else{
this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice;
}
this.dataForm.salesorder_item0List[i].poundlistId = list[i].id
if(list[i].price != null){
this.dataForm.salesorder_item0List[i].price = list[i].price.toFixed(2)
}else{
this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].unitPrice, list[i].settlement).toFixed(2)
this.dataForm.salesorder_item0List[i].price = this.jnpf.floatMul(list[i].salesPrice, list[i].settlement).toFixed(2)
}
this.rateOptions.find((item) => {
if (this.dataForm.salesorder_item0List[i].rate == item.id) {
@ -1090,7 +1088,7 @@
}
})
if (list[i].advance == 1) {
advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].unitPrice, list[i].settlement)).toFixed(2)
advance = this.jnpf.floatAdd(advance, this.jnpf.floatMul(list[i].salesPrice, list[i].settlement)).toFixed(2)
}
num = this.jnpf.floatAdd(num, list[i].settlement)
amount = this.jnpf.floatAdd(amount, list[i].price)

10
SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
Unescape View File

@ -59,15 +59,15 @@
<el-button type="text" @click="downLoadPDF" icon="el-icon-download" v-has="'btn_downLoadPDF'">开票文件下载</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'">批量删除
</el-button>
<el-button type="text" v-has="'btn_fapiaoluruHandle'" icon="el-icon-delete" @click="fapiaoluruHandle()">发票录入
<el-button type="text" v-has="'btn_fapiaoluruHandle'" icon="el-icon-tickets" @click="fapiaoluruHandle()">发票录入
</el-button>
<el-button type="text" v-has="'btn_rukuHandle'" icon="el-icon-delete" @click="rukuHandle()">入库
<el-button type="text" v-has="'btn_rukuHandle'" icon="el-icon-shopping-cart-full" @click="rukuHandle()">入库
</el-button>
<el-button type="text" icon="el-icon-delete" @click="fukuanHandle()" v-has="'btn_fukuanHandle'">付款申请
<el-button type="text" icon="el-icon-user" @click="fukuanHandle()" v-has="'btn_fukuanHandle'">付款申请
</el-button>
<el-button type="text" icon="el-icon-delete" @click="guidangHandle()" v-has="'btn_guidangHandle'">归档
<el-button type="text" icon="el-icon-check" @click="guidangHandle()" v-has="'btn_guidangHandle'">归档
</el-button>
<el-button type="text" icon="el-icon-delete" @click="toSaleHandle()" v-has="'btn_toSaleHandle'">转销售
<el-button type="text" icon="el-icon-document-copy" @click="toSaleHandle()" v-has="'btn_toSaleHandle'">转销售
</el-button>
</div>
<div class="JNPF-common-head-right">

2
SC-web/src/views/scm/basicInformation/saleback/index.vue
Unescape View File

@ -43,7 +43,7 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()" v-has="'btn_add'">新增
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()" v-has="'btn_add'">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()"v-has="'btn_download'">导出
</el-button>

6
SC-web/src/views/scm/basicInformation/saleorder/index.vue
Unescape View File

@ -60,15 +60,15 @@
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'">批量删除
</el-button>
<el-button type="text" icon="el-icon-delete" @click="delivery()" v-has="'btn_delivery'">发货
<el-button type="text" icon="el-icon-shopping-cart-2" @click="delivery()" v-has="'btn_delivery'">发货
</el-button>
<el-button type="text" icon="el-icon-delete" @click="invoicesEntry()" v-has="'btn_invoicesEntry'">发票录入
<el-button type="text" icon="el-icon-tickets" @click="invoicesEntry()" v-has="'btn_invoicesEntry'">发票录入
</el-button>
<!-- <el-button type="text" icon="el-icon-delete" @click="collection()">回款
</el-button>-->
<el-button type="text" icon="el-icon-check" @click="archive()" v-has="'btn_archive'">归档
</el-button>
<el-button type="text" icon="el-icon-check" @click="materialBack()" v-has="'btn_materialBack'">退货
<el-button type="text" icon="el-icon-truck" @click="materialBack()" v-has="'btn_materialBack'">退货
</el-button>
</div>
<div class="JNPF-common-head-right">

Write Preview
Loading…
Cancel
Save