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

修改

Browse Source
product
杨世强 2 years ago
parent a51a05f590
commit 789bda41c4
8 changed files with 57 additions and 35 deletions
Show Stats Download Patch File Download Diff File

1
SC-boot/linkage-scm/src/main/java/jnpf/material/controller/MaterialController.java
Unescape View File

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

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

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

1
SC-boot/linkage-scm/src/main/java/jnpf/warehouse/controller/WarehouseController.java
Unescape View File

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

6
SC-web/src/views/scm/basicInformation/poundlist/Form.vue
Unescape View File

@ -8,7 +8,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" prop="materialCode"> <el-form-item label="物料编码" prop="materialCode">
<popup-select v-model="dataForm.materialCode" placeholder="请选择" clearable <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"> popupTitle="选择数据" popupWidth="800px">
</popup-select> </popup-select>
@ -25,7 +25,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="销售合同" prop="salesName"> <el-form-item label="销售合同" prop="salesName">
<popup-select v-model="dataForm.salesName" placeholder="请选择" clearable field="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"> popupTitle="选择数据" popupWidth="800px">
</popup-select> </popup-select>
@ -75,7 +75,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车号" prop="licenseNo"> <el-form-item label="车号" prop="licenseNo">
<popupSelect v-model="dataForm.licenseNo" placeholder="请选择" clearable field="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"> popupTitle="选择数据" popupWidth="800px">
</popupSelect> </popupSelect>

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

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

2
SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue
Unescape View File

@ -454,7 +454,7 @@
if(a == this.dataForm.purchaseorder_item0List[i].licenseNum){ if(a == this.dataForm.purchaseorder_item0List[i].licenseNum){
this.dataForm.purchaseorder_item0List[i].materialName = b.material_name; this.dataForm.purchaseorder_item0List[i].materialName = b.material_name;
this.dataForm.purchaseorder_item0List[i].pountType = b.pount_type; 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].unit = b.unit;
this.dataForm.purchaseorder_item0List[i].advance = b.advance; this.dataForm.purchaseorder_item0List[i].advance = b.advance;
this.dataForm.purchaseorder_item0List[i].price = b.price; this.dataForm.purchaseorder_item0List[i].price = b.price;

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

@ -7,7 +7,7 @@
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" > <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="单据编号" <el-form-item label="单据编号"
prop="documentNo" > prop="documentNo" >
<el-input v-model="dataForm.documentNo" <el-input v-model="dataForm.documentNo"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -16,7 +16,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="合同名称" <el-form-item label="合同名称"
prop="contractName" > prop="contractName" >
<el-input v-model="dataForm.contractName" <el-input v-model="dataForm.contractName"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -25,7 +25,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="制单人" <el-form-item label="制单人"
prop="creatorUserName" > prop="creatorUserName" >
<el-input v-model="dataForm.creatorUserName" <el-input v-model="dataForm.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -34,7 +34,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="采购部门" <el-form-item label="采购部门"
prop="departmentId" > prop="departmentId" >
<dep-select v-model="dataForm.departmentId" <dep-select v-model="dataForm.departmentId"
placeholder="请选择" clearable > placeholder="请选择" clearable >
@ -43,7 +43,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="对方合同" <el-form-item label="对方合同"
prop="contractNo" > prop="contractNo" >
<el-input v-model="dataForm.contractNo" <el-input v-model="dataForm.contractNo"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -52,7 +52,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="数量" <el-form-item label="数量"
prop="num" > prop="num" >
<el-input v-model="dataForm.num" <el-input v-model="dataForm.num"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -61,7 +61,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="金额" <el-form-item label="金额"
prop="price" > prop="price" >
<el-input v-model="dataForm.price" <el-input v-model="dataForm.price"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -70,7 +70,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="不含税金额" <el-form-item label="不含税金额"
prop="notPrice" > prop="notPrice" >
<el-input v-model="dataForm.notPrice" <el-input v-model="dataForm.notPrice"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -79,7 +79,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="币别" <el-form-item label="币别"
prop="currency" > prop="currency" >
<el-select v-model="dataForm.currency" <el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'> placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -89,7 +89,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<el-form-item label="备注信息" <el-form-item label="备注信息"
prop="remark" > prop="remark" >
<el-input v-model="dataForm.remark" <el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -98,7 +98,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="客户名称" <el-form-item label="客户名称"
prop="costomerName" > prop="costomerName" >
<el-input v-model="dataForm.costomerName" <el-input v-model="dataForm.costomerName"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -107,7 +107,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="已回款金额" <el-form-item label="已回款金额"
prop="amountCollected" > prop="amountCollected" >
<el-input v-model="dataForm.amountCollected" <el-input v-model="dataForm.amountCollected"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -116,7 +116,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="发票数量" <el-form-item label="发票数量"
prop="invoiceNum" > prop="invoiceNum" >
<el-input v-model="dataForm.invoiceNum" <el-input v-model="dataForm.invoiceNum"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -125,7 +125,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="发票金额" <el-form-item label="发票金额"
prop="invoiceAmount" > prop="invoiceAmount" >
<el-input v-model="dataForm.invoiceAmount" <el-input v-model="dataForm.invoiceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -134,7 +134,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="来源系统" <el-form-item label="来源系统"
prop="sourceSystem" > prop="sourceSystem" >
<el-select v-model="dataForm.sourceSystem" <el-select v-model="dataForm.sourceSystem"
placeholder="请选择" clearable :style='{"width":"100%"}'> placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -144,7 +144,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<el-form-item label="单据状态 " <el-form-item label="单据状态 "
prop="status" > prop="status" >
<el-select v-model="dataForm.status" <el-select v-model="dataForm.status"
placeholder="请选择" clearable :style='{"width":"100%"}'> placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -163,14 +163,16 @@
</div> </div>
<el-table :data="dataForm.salesorder_item0List" size='mini' > <el-table :data="dataForm.salesorder_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" <popupSelect v-model="scope.row.licenseNum" placeholder="请选择"
placeholder="请选择" clearable :field="'licenseNum'+scope.$index" interfaceId="383568082196537541" :columnOptions="salesorder_item0licenseNumcolumnOptions" propsValue="license_num" relationField="license_num" popupType="dialog" clearable :field="'licenseNum'+scope.$index"
popupWidth="800px" interfaceId="383568082196537541" :bissId="dataForm.id"
> :columnOptions="saleback_item0licenseNumcolumnOptions"
</popupSelect> propsValue="license_num" relationField="license_num"
</template> popupType="dialog" popupWidth="800px" @change="popupSelectChange2">
</popupSelect>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="materialName" label="物料名称"> <el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope"> <template slot-scope="scope">
@ -483,7 +485,7 @@
sourceSystemOptions:[{"fullName":"人工创建","id":"0"},{"fullName":"商城平台","id":"1"}], 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"}], 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"}], poundTypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其他","id":"1"}],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}], advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
@ -497,6 +499,23 @@
}, },
mounted() {}, mounted() {},
methods: { 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() { salesorder_item0Exist() {
let isOk = true; let isOk = true;
for(let i=0;i<this.dataForm.salesorder_item0List.length;i++){ for(let i=0;i<this.dataForm.salesorder_item0List.length;i++){

2
SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
Unescape View File

@ -36,7 +36,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="销售合同" prop="salesName"> <el-form-item label="销售合同" prop="salesName">
<popupSelect v-model="dataForm.salesName" placeholder="请选择" clearable field="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"> popupTitle="选择数据" popupWidth="800px">
</popupSelect> </popupSelect>
</el-form-item> </el-form-item>

Write Preview
Loading…
Cancel
Save