yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面优化

Browse Source
jg-waiwang-pro
vayne 6 months ago
parent 19660ebd7e
commit 9d0aab21c9
5 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessLineMapper.java
Unescape View File

@ -23,8 +23,8 @@ public interface BusinessLineMapper extends BaseMapper<BusinessLineEntity> {
IPage<BusinessLineEntity> queryBusinessLineList(@Param("page") Page<BusinessLineEntity> page, @Param("businessLinePagination") BusinessLinePagination businessLinePagination, @Param("ew")QueryWrapper<BusinessLineEntity> businessLineQueryWrapper);
List<BusinessLineEntity> queryBusinessOrganizeList(@Param("businessLinePagination") BusinessLinePagination businessLinePagination, @Param("ew")QueryWrapper<BusinessLineEntity> businessLineQueryWrapper);
Integer queryOrganizeCount(String id,String organize);
Integer queryUserCount(String id,String organize);
Integer queryOrganizeCount(@Param("id") String id,@Param("organize") String organize);
Integer queryUserCount(@Param("id") String id,@Param("organize") String organize);
//业务组织配置左树
List<BusinessLineEntity> queryBusinessOrganizeConfigTree(String organize);

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java
Unescape View File

@ -25,7 +25,7 @@ import java.util.List;
*/
public interface BusinessOrderMapper extends BaseMapper<BusinessOrderEntity> {
List<ContractLEntity> querySaleContract(String businessLineId,String organize);
List<ContractLEntity> querySaleContract(@Param("businessLineId") String businessLineId,@Param("organize") String organize);
List<ContractLEntity> queryPurchaseContract(@Param("businessLineId") String businessLineId,@Param("organize") String organize);

6
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java
Unescape View File

@ -28,9 +28,9 @@ public interface VoucherMapper extends BaseMapper<VoucherEntity> {
IPage<VoucherEntity> queryVoucherPopup(@Param("page") Page<VoucherEntity> page,@Param("ew") QueryWrapper<VoucherEntity> voucherEntityQueryWrapper,@Param("businessType")Object businessType, @Param("documentType")Object documentType);
IPage<VoucherEntity> queryVoucherPopupByReturn(@Param("page") Page<VoucherEntity> page,@Param("ew") QueryWrapper<VoucherEntity> voucherEntityQueryWrapper,@Param("businessType")Object businessType, @Param("documentType")Object documentType);
IPage<VoucherEntity> queryVoucherPopupByDelivery(@Param("page") Page<VoucherEntity> page,@Param("ew") QueryWrapper<VoucherEntity> voucherEntityQueryWrapper,@Param("businessType")Object businessType, @Param("documentType")Object documentType);
List<VoucherEntity> querySaleReceiptVoucher(String organize);
List<VoucherEntity> queryPurchaseReceiptVoucher(String organize);
List<VoucherEntity> queryPurchaseDeliveryVoucher(String organize);
List<VoucherEntity> querySaleReceiptVoucher(@Param("organize") String organize);
List<VoucherEntity> queryPurchaseReceiptVoucher(@Param("organize") String organize);
List<VoucherEntity> queryPurchaseDeliveryVoucher(@Param("organize") String organize);
IPage<VoucherEntity> queryVoucherList(@Param("page") Page<VoucherEntity> page, @Param("voucherPagination")VoucherPagination voucherPagination, @Param("ew")QueryWrapper<VoucherEntity> voucherEntityQueryWrapper);
IPage<VoucherEntity> queryVoucherPopup1(@Param("page") Page<VoucherEntity> page,@Param("ew") QueryWrapper<VoucherEntity> voucherEntityQueryWrapper);

29
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
Unescape View File

@ -35,13 +35,13 @@
<el-col :span="8" v-if="judgeShow('businessLineId')">
<jnpf-form-tip-item label="关联业务线" v-if="judgeShow('businessLineId')"
prop="businessLineId">
<JnpfPopupSelect v-model="dataForm.businessLineId"
@change="changeData('businessLineId', -1)" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.businessLineId" placeholder="请选择"
:disabled="judgeWrite('businessLineId')" propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField='name' field='businessLineId'
interfaceId="517979330417001669" :pageSize="20" :hasPage="true"
:columnOptions="businessLineIdcolumnOptions" clearable :style='{ "width": "100%" }'>
<JnpfPopupSelect v-model="dataForm.businessLineId" @change="removeForm"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessLineId"
placeholder="请选择" :disabled="judgeWrite('businessLineId')" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='businessLineId' interfaceId="517979330417001669" :pageSize="20"
:hasPage="true" :columnOptions="businessLineIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
@ -112,13 +112,6 @@
<template v-if="this.productCreate">
<el-col :span="8" v-if="judgeShow('contractId')">
<jnpf-form-tip-item label="关联合同" v-if="judgeShow('contractId')" prop="contractId">
<!-- <JnpfPopupSelect v-model="dataForm.contractId" @change="contractInfo2" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.contractName" placeholder="请选择" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='contract_name'
field='contractId' interfaceId="529270998021701701" :pageSize="20"
:columnOptions="contractIdcolumnOptions2" clearable :style='{ "width": "100%" }'
>
</JnpfPopupSelect> -->
<el-input v-model="dataForm.contractName" placeholder="请输入" :disabled="true"
clearable :style='{ "width": "100%" }'>
<el-button slot="append" icon="el-icon-search"
@ -1556,6 +1549,14 @@ export default {
this.initPurchaseData();
},
methods: {
// 选择业务线清除表单
removeForm() {
debugger
if (this.dataForm.orderType == '3') {
debugger
this.dataForm.contractId = undefined
}
},
//根据输入采购单价计算总价和不含税单价、不含税总价
priceCount(row) {
if (row.businessNum) {

27
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
Unescape View File

@ -35,13 +35,13 @@
<el-col :span="8" v-if="judgeShow('businessLineId')">
<jnpf-form-tip-item label="关联业务线" v-if="judgeShow('businessLineId')"
prop="businessLineId">
<JnpfPopupSelect v-model="dataForm.businessLineId"
@change="changeData('businessLineId', -1)" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.businessLineId" placeholder="请选择"
:disabled="judgeWrite('businessLineId')" propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField='name' field='businessLineId'
interfaceId="517979330417001669" :pageSize="20" :hasPage="true"
:columnOptions="businessLineIdcolumnOptions" clearable :style='{ "width": "100%" }'>
<JnpfPopupSelect v-model="dataForm.businessLineId" @change="removeForm"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessLineId"
placeholder="请选择" :disabled="judgeWrite('businessLineId')" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='businessLineId' interfaceId="517979330417001669" :pageSize="20"
:hasPage="true" :columnOptions="businessLineIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
@ -121,13 +121,6 @@
<template v-if="this.productCreate">
<el-col :span="8" v-if="judgeShow('contractId')">
<jnpf-form-tip-item label="关联合同" v-if="judgeShow('contractId')" prop="contractId">
<!-- <JnpfPopupSelect v-model="dataForm.contractId" @change="contractInfo2" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.contractName" placeholder="请选择" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='contract_name'
field='contractId' interfaceId="529270998021701701" :pageSize="20"
:columnOptions="contractIdcolumnOptions2" clearable :style='{ "width": "100%" }'
>
</JnpfPopupSelect> -->
<el-input v-model="dataForm.contractName" placeholder="请输入" :disabled="true"
clearable :style='{ "width": "100%" }'>
<el-button slot="append" icon="el-icon-search"
@ -1465,6 +1458,12 @@ export default {
this.initPurchaseData();
},
methods: {
// 选择业务线清除表单
removeForm() {
if (this.dataForm.orderType == '3') {
this.dataForm.contractId = undefined
}
},
//根据输入销售单价计算总价和不含税单价、不含税总价
priceCount(row) {
row.taxCount = this.jnpf.floatMul(row.businessNum, row.businessPrice).toFixed(2) //销售含税总价

Write Preview
Loading…
Cancel
Save