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

修改前端

Browse Source
product
tengxi 2 years ago
parent 2107379337
commit 920b32a232
9 changed files with 412 additions and 311 deletions
Show Stats Download Patch File Download Diff File

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

@ -104,4 +104,7 @@ public class Saleback_item0Entity {
@TableField("NOT_AMOUNT") @TableField("NOT_AMOUNT")
private BigDecimal notAmount; private BigDecimal notAmount;
@TableField("VEHICLE_ID")
private String vehicleId;
} }

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

@ -435,8 +435,9 @@ public class SaleorderController {
List<Salesorder_item0Entity> jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id); List<Salesorder_item0Entity> jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id);
List<Salesorder_item0Model> jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class); List<Salesorder_item0Model> jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class);
for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){ for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){
// Map<String,Object> licenseNumMap = new HashMap<>(); Map<String,Object> vehicleIdMap = new HashMap<>();
// jg_salesorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("391151974030035653","license_no","license_no",jg_salesorder_item0Model.getLicenseNum(),licenseNumMap)); // jg_salesorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("391151974030035653","license_no","license_no",jg_salesorder_item0Model.getLicenseNum(),licenseNumMap));
jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("391151974030035653","vehicle_id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap));
} }
vo.setSalesorder_item0List(jg_salesorder_item0ModelList); vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id); List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id);

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

@ -72,8 +72,8 @@ public class Salesorder_item0Entity {
@TableField("POUNDLIST_ID") @TableField("POUNDLIST_ID")
private String poundlistId; private String poundlistId;
@TableField("LICENSE_NUM") // @TableField("LICENSE_NUM")
private String licenseNum; // private String licenseNum;
@TableField("MATERIAL_CODE") @TableField("MATERIAL_CODE")
private String materialCode; private String materialCode;
@ -123,4 +123,7 @@ public class Salesorder_item0Entity {
@TableField("VEHICLE_PICTURES") @TableField("VEHICLE_PICTURES")
private String vehiclePictures; private String vehiclePictures;
@TableField("VEHICLE_ID")
private String vehicleId;
} }

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java
Unescape View File

@ -70,5 +70,7 @@ public class Salesorder_item0Model {
@JsonProperty("vehiclePictures") @JsonProperty("vehiclePictures")
private String vehiclePictures; private String vehiclePictures;
/** id **/
@JsonProperty("vehicleId")
private String vehicleId;
} }

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

@ -42,7 +42,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="收款类型 " prop="paymentType"> <el-form-item label="收款类型" prop="paymentType">
<el-select v-model="dataForm.paymentType" placeholder="请选择" clearable :style='{"width":"100%"}'> <el-select v-model="dataForm.paymentType" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName" <el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option> :value="item.id" :disabled="item.disabled"></el-option>
@ -51,7 +51,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="币别 " prop="currency"> <el-form-item label="币别" prop="currency">
<el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'> <el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option> :disabled="item.disabled"></el-option>
@ -83,7 +83,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据状态 " prop="status"> <el-form-item label="单据状态" prop="status">
<el-select v-model="dataForm.status" placeholder="请选择" clearable :style='{"width":"100%"}'> <el-select v-model="dataForm.status" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option> :disabled="item.disabled"></el-option>
@ -106,7 +106,7 @@
<div class="JNPF-common-title"> <div class="JNPF-common-title">
<h2></h2> <h2></h2>
</div> </div>
<el-table :data="dataForm.collection_item0List" size='mini' show-summary> <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 type="index" width="50" label="序号" align="center" />
<el-table-column prop="amount" label="收款金额" align="center" > <el-table-column prop="amount" label="收款金额" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
@ -114,20 +114,20 @@
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creatorUserId" label="订单金额" align="center" > <el-table-column prop="price" label="订单金额" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="请输入" clearable :style='{"width":"100%"}'> <el-input v-model="scope.row.price" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creatorUserName" label="已收款金额" align="center" > <el-table-column prop="amountCollected" label="已收款金额" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable <el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable
:style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deleteTime" label="销售订单编号" align="center" > <el-table-column prop="coustomerCode" label="销售订单编号" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<popupSelect v-model="scope.row.documentNo" placeholder="请选择" clearable <popupSelect v-model="scope.row.documentNo" placeholder="请选择" clearable
:field="'deleteTime'+scope.$index" interfaceId="393372436705378053" :field="'deleteTime'+scope.$index" interfaceId="393372436705378053"
@ -137,14 +137,14 @@
</popupSelect> </popupSelect>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="lastModifyUserId" label="合同编号" align="center" > <el-table-column prop="contractCode" label="合同编号" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.contractCode" placeholder="请输入" clearable <el-input v-model="scope.row.contractCode" placeholder="请输入" clearable
:style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="lastModifyUserName" label="数量" align="center" > <el-table-column prop="num" label="数量" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'> <el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
@ -158,20 +158,20 @@
<!-- </el-select>--> <!-- </el-select>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column prop="lastModifyTime" label="垫资金额" align="center" > <el-table-column prop="advanceAmount" label="垫资金额" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable <el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
:style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deleteUserId" label="税额" align="center" > <el-table-column prop="rate" label="税额" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'> <el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deleteUserName" label="不含税金额" align="center" > <el-table-column prop="notPrice" label="不含税金额" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'> <el-input v-model="scope.row.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
@ -219,6 +219,7 @@
export default { export default {
components: {}, components: {},
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
@ -365,10 +366,26 @@
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {
dataForm: {
deep: true,
handler: function() {
this.popupnum()
}
}
},
created() {}, created() {},
mounted() {}, mounted() {},
methods: { methods: {
popupnum() {
let amount = 0
for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
amount = amount + parseFloat(this.dataForm.collection_item0List[i].amount);
}
parseFloat(this.dataForm.amountCollected = amount)
},
popupSelect(e, d) { popupSelect(e, d) {
this.dataForm.customerCode = d.id; this.dataForm.customerCode = d.id;
}, },
@ -387,6 +404,32 @@
} }
} }
}, },
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;
},
collection_item0Exist() { collection_item0Exist() {
let isOk = true; let isOk = true;
for (let i = 0; i < this.dataForm.collection_item0List.length; i++) { for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {

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

@ -387,6 +387,7 @@
} }
}); });
}) })
}
if (this.multipleSelection.length > 1) { if (this.multipleSelection.length > 1) {
this.$message({ this.$message({
type: 'error', type: 'error',
@ -394,7 +395,6 @@
duration: 1500 duration: 1500
}) })
} }
}
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true

9
SC-web/src/views/scm/basicInformation/payment/Form.vue
Unescape View File

@ -174,26 +174,26 @@
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deleteUserId" label="重量" align="center" > <el-table-column prop="num" label="重量" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'> <el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deleteTime" label="垫资金额" align="center" > <el-table-column prop="advanceAmount" label="垫资金额" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable <el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
:style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orgnizeId" label="税额" align="center" > <el-table-column prop="rate" label="税额" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'> <el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="departmentId" label="不含税金额" align="center" > <el-table-column prop="notAmount" label="不含税金额" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable :style='{"width":"100%"}'> <el-input v-model="scope.row.notAmount" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
@ -341,7 +341,6 @@
dataForm: { dataForm: {
deep: true, deep: true,
handler: function() { handler: function() {
this.popupSelect() this.popupSelect()
} }
} }

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

@ -64,17 +64,27 @@
</div> </div>
<el-table :data="dataForm.saleback_item0List" size='mini'> <el-table :data="dataForm.saleback_item0List" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licenseNum" label="车牌号"> <!-- <el-table-column prop="licenseNum" label="车牌号">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<popupSelect v-model="scope.row.licenseNum" placeholder="请选择" <!-- <popupSelect v-model="scope.row.licenseNum" placeholder="请选择"-->
clearable :field="'licenseNum'+scope.$index" <!-- clearable :field="'licenseNum'+scope.$index"-->
interfaceId="383568082196537541" :bissId="dataForm.salesOrderId" :excludeFields="excludeFields" <!-- interfaceId="383568082196537541" :bissId="dataForm.salesOrderId" :excludeFields="excludeFields"-->
:columnOptions="saleback_item0licenseNumcolumnOptions" <!-- :columnOptions="saleback_item0licenseNumcolumnOptions"-->
propsValue="license_num" relationField="license_num" <!-- propsValue="license_num" relationField="license_num"-->
popupType="dialog" popupWidth="800px" @change="popupSelectChange2"> <!-- popupType="dialog" popupWidth="800px" @change="popupSelectChange2">-->
</popupSelect> <!-- </popupSelect>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="vehicleId" label="车辆ID">
<template slot-scope="scope">
<popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index" interfaceId="383568082196537541"
:columnOptions="salesback_item0vehicleIdcolumnOptions" propsValue="vehicle_id"
relationField="ticketno" popupType="dialog"
popupWidth="800px">
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称"> <el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.materialName" placeholder="请输入" <el-input v-model="scope.row.materialName" placeholder="请输入"
@ -249,9 +259,9 @@
"id": "2" "id": "2"
}], }],
saleback_item0licenseNumcolumnOptions: [{ salesback_item0vehicleIdcolumnOptions: [{
"label": "车牌号", "label": "车牌号",
"value": "license_num" "value": "ticketno"
}, { }, {
"label": "物料名称", "label": "物料名称",
"value": "material_name" "value": "material_name"
@ -323,8 +333,8 @@
popupSelectChange2(a, b){ popupSelectChange2(a, b){
var excludeFields = []; var excludeFields = [];
for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) { for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
excludeFields.push(this.dataForm.saleback_item0List[i].licenseNo); excludeFields.push(this.dataForm.saleback_item0List[i].vehicleId);
if(a == this.dataForm.saleback_item0List[i].licenseNum){ if(a == this.dataForm.saleback_item0List[i].vehicleId){
this.dataForm.saleback_item0List[i].materialName = b.material_name; this.dataForm.saleback_item0List[i].materialName = b.material_name;
this.dataForm.saleback_item0List[i].settlement = b.settlement; this.dataForm.saleback_item0List[i].settlement = b.settlement;
this.dataForm.saleback_item0List[i].unit = b.unit; this.dataForm.saleback_item0List[i].unit = b.unit;

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

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save