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

修改入库单

Browse Source
product
tengxi 2 years ago
parent 135ff8e48e
commit fdc7ca5252
4 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File

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

@ -113,4 +113,7 @@ public class Receiptin_item0Entity {
@TableField("PURCHASEORDERITEM_ID")
private String purchaseorderitemId;
@TableField("VEHICLE_ID")
private String vehicleId;
}

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java
Unescape View File

@ -68,7 +68,10 @@ public class Receiptin_item0Model {
// private String lastModifyUserId;
/** 磅单类型 **/
@TableField(exist = false)
private String poundType;
private String pountType;
/** 车牌号 **/
@JsonProperty("vehicleId")
private String vehicleId;
}

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

@ -96,17 +96,31 @@
</div>
<el-table :data="dataForm.receiptin_item0List" size='mini' show-summary :summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licenseno" width="140" label="车牌号" align="center">
<!-- <el-table-column prop="licenseno" width="140" label="车牌号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <popupSelect v-model="scope.row.licenseno" placeholder="请选择" clearable-->
<!-- :field="'licenseno'+scope.$index"-->
<!-- interfaceId="392933121244325765" :columnOptions="receiptin_item0licensenocolumnOptions"-->
<!-- propsValue="license_num" relationField="license_num" popupType="dialog" popupWidth="1000px" popupTitle="选择车牌"-->
<!-- :bissId="dataForm.souceno" :excludeFields="excludeFields"-->
<!-- @change="popupSelect2">-->
<!-- </popupSelect>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="vehicleId" label="车辆ID" width="140" align="center" >
<template slot-scope="scope">
<popupSelect v-model="scope.row.licenseno" placeholder="请选择" clearable
:field="'licenseno'+scope.$index"
interfaceId="392933121244325765" :columnOptions="receiptin_item0licensenocolumnOptions"
propsValue="license_num" relationField="license_num" popupType="dialog" popupWidth="1000px" popupTitle="选择车牌"
<popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index" interfaceId="392933121244325765" :columnOptions="receiptin_item0vehicleIdcolumnOptions" propsValue="vehicle_id" relationField="ticketno" popupType="dialog"
popupWidth="800px"popupTitle="选择车牌"
:bissId="dataForm.souceno" :excludeFields="excludeFields"
@change="popupSelect2">
>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="materialname" width="140" label="物料名称" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.materialname" placeholder="请输入" :disabled="true">
@ -174,9 +188,9 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="poundType" width="140" label="磅单类型" align="center">
<el-table-column prop="pountType" width="140" label="磅单类型" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.poundType" placeholder="请选择" clearable :disabled="true">
<el-select v-model="scope.row.pountType" placeholder="请选择" clearable :disabled="true">
<el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
@ -278,9 +292,9 @@
"id": "2"
}],
receiptin_item0licensenocolumnOptions: [{
receiptin_item0vehicleIdcolumnOptions: [{
"label": "车牌号",
"value": "license_num"
"value": "ticketno"
}, {
"label": "物料名称",
"value": "material_name"
@ -420,9 +434,9 @@
var num = 0;
var amount = 0;
for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) {
excludeFields.push(this.dataForm.receiptin_item0List[i].licenseno);
if (a == this.dataForm.receiptin_item0List[i].licenseno) {
this.dataForm.receiptin_item0List[i].licenseno = b.license_num;
excludeFields.push(this.dataForm.receiptin_item0List[i].vehicleId);
if (a == this.dataForm.receiptin_item0List[i].vehicleId) {
this.dataForm.receiptin_item0List[i].ticketno = b.ticketno;
this.dataForm.receiptin_item0List[i].materialname = b.material_name;
this.dataForm.receiptin_item0List[i].reservoirareaId = b.in_area;
this.dataForm.receiptin_item0List[i].warehouseId = b.name;
@ -432,7 +446,7 @@
this.dataForm.receiptin_item0List[i].rate = b.rate;
this.dataForm.receiptin_item0List[i].amount = b.amount;
this.dataForm.receiptin_item0List[i].batchno = b.poundlist_id;
this.dataForm.receiptin_item0List[i].poundType = b.pound_type;
this.dataForm.receiptin_item0List[i].pountType = b.pount_type;
this.rateOptions.forEach((column, index) => {
if(column.id == b.rate){
this.dataForm.receiptin_item0List[i].rateamount = b.amount * column.fullName;

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

@ -80,7 +80,7 @@
<popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index" interfaceId="383568082196537541"
:columnOptions="salesback_item0vehicleIdcolumnOptions" propsValue="vehicle_id"
relationField="ticketno" popupType="dialog"
relationField="ticketno" popupType="dialog" @change="popupSelectChange2"
popupWidth="800px">
</popupSelect>
</template>
@ -258,38 +258,17 @@
"fullName": "已审批",
"id": "2"
}],
salesback_item0vehicleIdcolumnOptions:[ {"label":"车牌号","value":"ticketno"},
{"label":"物料名称","value":"material_name"},
{"label":"结算重量","value":"settlement"},
{"label":"计量单位","value":"unit"},
{"label":"采购单价","value":"unit_price"},
{"label":"税率","value":"rate"},
{"label":"应退金额","value":"price"},
{"label":"税额","value":"no_price"},
{"label":"业务员","value":"pound_user"},
{"label":"磅单类型","value":"pound_type"},],
salesback_item0vehicleIdcolumnOptions: [{
"label": "车牌号",
"value": "ticketno"
}, {
"label": "物料名称",
"value": "material_name"
}, {
"label": "结算重量",
"value": "settlement"
}, {
"label": "计量单位",
"value": "unit"
}, {
"label": "采购单价",
"value": "unit_price"
}, {
"label": "税率",
"value": "rate"
}, {
"label": "应退金额",
"value": "price"
}, {
"label": "税额",
"value": "no_price"
}, {
"label": "业务员",
"value": "pound_user"
}, {
"label": "磅单类型",
"value": "pound_type"
}, ],
unitOptions: [{
"fullName": "吨",
"id": "0"

Write Preview
Loading…
Cancel
Save