product
杨世强 2 years ago
parent a51a05f590
commit 789bda41c4

@ -81,6 +81,7 @@ public class MaterialController {
* @param materialPagination
* @return
*/
@ApiOperation("列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody MaterialPagination materialPagination)throws IOException{
List<MaterialEntity> list= materialService.getList(materialPagination);

@ -81,17 +81,18 @@ public class PoundlistController {
* @param poundlistPagination
* @return
*/
@ApiOperation("列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody PoundlistPagination poundlistPagination)throws IOException{
List<PoundlistEntity> list= poundlistService.getList(poundlistPagination);
//处理id字段转名称若无需转或者为空可删除
for(PoundlistEntity entity:list){
Map<String,Object> materialCodeMap = new HashMap<>();
entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_code",entity.getMaterialCode(),materialCodeMap));
Map<String,Object> materialCodeMap = new HashMap<>();
entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","item_code","item_code",entity.getMaterialCode(),materialCodeMap));
Map<String,Object> salesNameMap = new HashMap<>();
entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","id","contract_name",entity.getSalesName(),salesNameMap));
entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","contract_name","contract_name",entity.getSalesName(),salesNameMap));
Map<String,Object> licenseNoMap = new HashMap<>();
entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getLicenseNo(),licenseNoMap));
entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","ticketno","ticketno",entity.getLicenseNo(),licenseNoMap));
entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures()));
entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
Map<String,Object> purchaseNameMap = new HashMap<>();

@ -81,6 +81,7 @@ public class WarehouseController {
* @param warehousePagination
* @return
*/
@ApiOperation("列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody WarehousePagination warehousePagination)throws IOException{
List<WarehouseEntity> list= warehouseService.getList(warehousePagination);

@ -8,7 +8,7 @@
<el-col :span="12">
<el-form-item label="物料编码" prop="materialCode">
<popup-select v-model="dataForm.materialCode" placeholder="请选择" clearable
field="materialCode" interfaceId="381037852907038533" :columnOptions="materialCodecolumnOptions" propsValue="id" relationField="item_code" popupType="dialog"
field="materialCode" interfaceId="381037852907038533" :columnOptions="materialCodecolumnOptions" propsValue="item_code" relationField="item_code" popupType="dialog"
popupTitle="选择数据" popupWidth="800px">
</popup-select>
@ -25,7 +25,7 @@
<el-col :span="12">
<el-form-item label="销售合同" prop="salesName">
<popup-select v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px">
</popup-select>
@ -75,7 +75,7 @@
<el-col :span="12">
<el-form-item label="车号" prop="licenseNo">
<popupSelect v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="ticketno" relationField="ticketno" popupType="dialog"
popupTitle="选择数据" popupWidth="800px">
</popupSelect>

@ -118,7 +118,7 @@
</template>
<script>
import request from '@/utils/request'
import request from '@/utils/request'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'

@ -454,7 +454,7 @@
if(a == this.dataForm.purchaseorder_item0List[i].licenseNum){
this.dataForm.purchaseorder_item0List[i].materialName = b.material_name;
this.dataForm.purchaseorder_item0List[i].pountType = b.pount_type;
this.dataForm.purchaseorder_item0List[i].netWeight = b.netWeight;
this.dataForm.purchaseorder_item0List[i].netWeight = b.net_weight;
this.dataForm.purchaseorder_item0List[i].unit = b.unit;
this.dataForm.purchaseorder_item0List[i].advance = b.advance;
this.dataForm.purchaseorder_item0List[i].price = b.price;

@ -163,14 +163,16 @@
</div>
<el-table :data="dataForm.salesorder_item0List" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licenseNum" label="车牌号">
<template slot-scope="scope">
<popupSelect v-model="scope.row.licenseNum"
placeholder="请选择" clearable :field="'licenseNum'+scope.$index" interfaceId="383568082196537541" :columnOptions="salesorder_item0licenseNumcolumnOptions" propsValue="license_num" relationField="license_num" popupType="dialog"
popupWidth="800px"
>
</popupSelect>
</template>
<el-table-column prop="licenseNum" label="车牌号">
<template slot-scope="scope">
<popupSelect v-model="scope.row.licenseNum" placeholder="请选择"
clearable :field="'licenseNum'+scope.$index"
interfaceId="383568082196537541" :bissId="dataForm.id"
:columnOptions="saleback_item0licenseNumcolumnOptions"
propsValue="license_num" relationField="license_num"
popupType="dialog" popupWidth="800px" @change="popupSelectChange2">
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope">
@ -483,7 +485,7 @@
sourceSystemOptions:[{"fullName":"人工创建","id":"0"},{"fullName":"商城平台","id":"1"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
salesorder_item0licenseNumcolumnOptions:[ {"label":"车牌号","value":"license_num"}, {"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"},],
saleback_item0licenseNumcolumnOptions:[ {"label":"车牌号","value":"license_num"}, {"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"},],
poundTypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其他","id":"1"}],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
@ -497,6 +499,23 @@
},
mounted() {},
methods: {
popupSelectChange2(a, b){
for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
if(a == this.dataForm.salesorder_item0List[i].licenseNum){
this.dataForm.salesorder_item0List[i].materialName = b.material_name;
this.dataForm.salesorder_item0List[i].pountType = b.pount_type;
this.dataForm.salesorder_item0List[i].netWeight = b.net_weight;
this.dataForm.salesorder_item0List[i].unit = b.unit;
// this.dataForm.salesorder_item0List[i].advance = b.advance;
this.dataForm.salesorder_item0List[i].price = b.price;
this.dataForm.salesorder_item0List[i].settlement = b.settlement;
this.dataForm.salesorder_item0List[i].rate = b.rate;
this.dataForm.salesorder_item0List[i].amount = b.amount;
this.dataForm.salesorder_item0List[i].notAmount = b.not_amount;
this.dataForm.salesorder_item0List[i].pountUser = b.pount_user;
}
}
},
salesorder_item0Exist() {
let isOk = true;
for(let i=0;i<this.dataForm.salesorder_item0List.length;i++){

@ -36,7 +36,7 @@
<el-col :span="12">
<el-form-item label="销售合同" prop="salesName">
<popupSelect v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
interfaceId="383242092673015365" :columnOptions="salesNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px">
</popupSelect>
</el-form-item>

Loading…
Cancel
Save