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

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 8193099f06 01a9e6f6d2
commit 273161bff7
33 changed files with 551 additions and 306 deletions
Show Stats Download Patch File Download Diff File

16
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java
Unescape View File

@ -101,14 +101,14 @@ public class ArinvoicesController {
public ActionResult list(@RequestBody ArinvoicesPagination arinvoicesPagination)throws IOException{
List<ArinvoicesEntity> list= arinvoicesService.getList(arinvoicesPagination);
//处理id字段转名称，若无需转或者为空可删除
for(ArinvoicesEntity entity:list){
Map<String,Object> salesOrderIdMap = new HashMap<>();
entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesOrderId(),salesOrderIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("398361758806411909","id","contract_name",entity.getContractId(),contractIdMap));
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398362084892576389","id","supplier_nm",entity.getCustomerId(),customerIdMap));
}
// for(ArinvoicesEntity entity:list){
// Map<String,Object> salesOrderIdMap = new HashMap<>();
// entity.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesOrderId(),salesOrderIdMap));
// Map<String,Object> contractIdMap = new HashMap<>();
// entity.setContractId(generaterSwapUtil.getPopupSelectValue("398361758806411909","id","contract_name",entity.getContractId(),contractIdMap));
// Map<String,Object> customerIdMap = new HashMap<>();
// entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398362084892576389","id","supplier_nm",entity.getCustomerId(),customerIdMap));
// }
List<ArinvoicesListVO> listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class);
for(ArinvoicesListVO arinvoicesVO:listVO){
}

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

@ -127,4 +127,11 @@ public class ArinvoicesEntity {
@TableField(exist = false)
List<Arinvoices_item1Entity> list1;
@TableField(exist = false)
private String sourceOrderNo;
@TableField(exist = false)
private String contractNm;
@TableField(exist = false)
private String customerNm;
}

7
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java
Unescape View File

@ -1,8 +1,14 @@
package jnpf.arinvoices.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.arinvoices.entity.ArinvoicesEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.arinvoices.model.arinvoices.ArinvoicesPagination;
import jnpf.collection.entity.CollectionEntity;
import jnpf.collection.model.collection.CollectionPagination;
import org.apache.ibatis.annotations.Param;
/**
*
@ -14,4 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ArinvoicesMapper extends BaseMapper<ArinvoicesEntity> {
IPage<ArinvoicesEntity> queryArinvoices(@Param("page") Page<ArinvoicesEntity> page, @Param("arinvoicesPagination") ArinvoicesPagination arinvoicesPagination);
}

14
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesListVO.java
Unescape View File

@ -3,6 +3,7 @@
package jnpf.arinvoices.model.arinvoices;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.sql.Time;
import java.util.Date;
@ -80,5 +81,18 @@ public class ArinvoicesListVO{
@JsonProperty("customerId")
private String customerId;
@TableField(exist = false)
private String contractName;
@TableField(exist = false)
private String customerName;
@TableField(exist = false)
private String sourceOrderNo;
@TableField(exist = false)
private String contractNm;
@TableField(exist = false)
private String customerNm;
}

9
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPagination.java
Unescape View File

@ -1,6 +1,7 @@
package jnpf.arinvoices.model.arinvoices;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
@ -19,6 +20,14 @@ public class ArinvoicesPagination extends Pagination {
/** 单据编号 */
private String documentNo;
private String sourceOrderNo;
private String contractNm;
private String customerNm;
private String startDate;
private String endDate;
/** 业务日期 */
private List<String> businessDate;
/**

12
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
Unescape View File

@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import javax.annotation.Resource;
import java.util.*;
/**
@ -57,6 +59,9 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
@Autowired
private Arinvoices_item0Service arinvoices_item0Service;
@Resource
private ArinvoicesMapper arinvoicesMapper;
@ -164,14 +169,9 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
e.printStackTrace();
}
}
if((total>0 && AllIdList.size()>0) || total==0){
Page<ArinvoicesEntity> page=new Page<>(arinvoicesPagination.getCurrentPage(), arinvoicesPagination.getPageSize());
IPage<ArinvoicesEntity> userIPage=this.page(page, arinvoicesQueryWrapper);
IPage<ArinvoicesEntity> userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination);
return arinvoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<ArinvoicesEntity> list = new ArrayList();
return arinvoicesPagination.setData(list, list.size());
}
}
@Override
public List<ArinvoicesEntity> getTypeList(ArinvoicesPagination arinvoicesPagination,String dataType){

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

@ -219,10 +219,10 @@ public class CollectionController {
List<CollectionEntity> list= collectionService.getList(collectionPagination);
//处理id字段转名称，若无需转或者为空可删除
for(CollectionEntity entity:list){
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("393371066040385285","id","supplier_nm",entity.getCustomerId(),customerIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("399835312982972805","id","contract_name",entity.getContractId(),contractIdMap));
// Map<String,Object> customerIdMap = new HashMap<>();
// entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("393371066040385285","id","supplier_nm",entity.getCustomerId(),customerIdMap));
// Map<String,Object> contractIdMap = new HashMap<>();
// entity.setContractId(generaterSwapUtil.getPopupSelectValue("399835312982972805","id","contract_name",entity.getContractId(),contractIdMap));
entity.setVoucher(generaterSwapUtil.getFileNameInJson(entity.getVoucher()));
}
List<CollectionListVO> listVO=JsonUtil.getJsonToList(list,CollectionListVO.class);
@ -264,6 +264,7 @@ public class CollectionController {
// collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class);
entity.setId(mainId);
entity.setStatus("0");
collectionService.save(entity);
List<Collection_item0Entity> Collection_item0List = JsonUtil.getJsonToList(collectionCrForm.getCollection_item0List(),Collection_item0Entity.class);
for(Collection_item0Entity entitys : Collection_item0List){

5
SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java
Unescape View File

@ -117,5 +117,10 @@ public class CollectionEntity {
@TableField("CONTRACT_ID")
private String contractId;
@TableField(exist = false)
private String contractNm;
@TableField(exist = false)
private String customerNm;
}

6
SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java
Unescape View File

@ -1,9 +1,14 @@
package jnpf.collection.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.collection.entity.CollectionEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.collection.model.collection.CollectionPagination;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination;
import org.apache.ibatis.annotations.Param;
/**
@ -17,4 +22,5 @@ import org.apache.ibatis.annotations.Param;
public interface CollectionMapper extends BaseMapper<CollectionEntity> {
PoundlistEntity queryPound(@Param("poundlistId") String poundlistId);
IPage<CollectionEntity> queryCollection(@Param("page") Page<CollectionEntity> page, @Param("collectionPagination") CollectionPagination collectionPagination);
}

7
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java
Unescape View File

@ -3,6 +3,7 @@
package jnpf.collection.model.collection;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.sql.Time;
import java.util.Date;
@ -87,5 +88,11 @@ public class CollectionListVO{
@JsonProperty("creatorUserName")
private String creatorUserName;
@TableField(exist = false)
private String contractNm;
@TableField(exist = false)
private String customerNm;
}

3
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionPagination.java
Unescape View File

@ -18,6 +18,9 @@ public class CollectionPagination extends Pagination {
/** 单据编号 */
private String documentNo;
private String contractNm;
private String customerNm;
/**
* 菜单id
*/

7
SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
Unescape View File

@ -140,14 +140,9 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
e.printStackTrace();
}
}
if((total>0 && AllIdList.size()>0) || total==0){
Page<CollectionEntity> page=new Page<>(collectionPagination.getCurrentPage(), collectionPagination.getPageSize());
IPage<CollectionEntity> userIPage=this.page(page, collectionQueryWrapper);
IPage<CollectionEntity> userIPage=collectionMapper.queryCollection(page, collectionPagination);
return collectionPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<CollectionEntity> list = new ArrayList();
return collectionPagination.setData(list, list.size());
}
}
@Override
public List<CollectionEntity> getTypeList(CollectionPagination collectionPagination,String dataType){

8
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java
Unescape View File

@ -147,10 +147,10 @@ public class ReceiptoutController {
List<ReceiptoutEntity> list= receiptoutService.getList(receiptoutPagination);
//处理id字段转名称，若无需转或者为空可删除
for(ReceiptoutEntity entity:list){
Map<String,Object> sourceNoMap = new HashMap<>();
entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap));
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
// Map<String,Object> sourceNoMap = new HashMap<>();
// entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap));
// Map<String,Object> customerIdMap = new HashMap<>();
// entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
}

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java
Unescape View File

@ -103,4 +103,9 @@ public class ReceiptoutEntity {
@TableField("CUSTOMER_ID")
private String customerId;
@TableField(exist = false)
private String customerNm;
@TableField(exist = false)
private String sourceOrderNo;
}

8
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java
Unescape View File

@ -1,8 +1,14 @@
package jnpf.receiptout.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.receiptout.entity.ReceiptoutEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.receiptout.model.receiptout.ReceiptoutPagination;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination;
import org.apache.ibatis.annotations.Param;
/**
*
@ -13,5 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 日期： 2023-02-24
*/
public interface ReceiptoutMapper extends BaseMapper<ReceiptoutEntity> {
IPage<ReceiptoutEntity> queryReceiptout(@Param("page") Page<ReceiptoutEntity> page, @Param("receiptoutPagination") ReceiptoutPagination receiptoutPagination);
}

7
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java
Unescape View File

@ -97,6 +97,13 @@ public class ReceiptoutListVO{
@JsonProperty("lastModifyUserName")
private String lastModifyUserName;
@TableField(exist = false)
private String customerNm;
@TableField(exist = false)
private String sourceOrderNo;

9
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java
Unescape View File

@ -22,8 +22,13 @@ public class ReceiptoutPagination extends Pagination {
/** 业务类型 */
private String type;
/** 出库日期 */
private List<String> issueDate;
/** 创建日期 */
private List<String> creatorTime;
private String customerNm;
private String sourceOrderNo;
private String startDate;
private String endDate;
/**
* 菜单id
*/

12
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
Unescape View File

@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import javax.annotation.Resource;
import java.util.*;
/**
@ -54,6 +56,9 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
@Autowired
private Receiptout_item0Service receiptout_item0Service;
@Resource
private ReceiptoutMapper receiptoutMapper;
@ -137,14 +142,9 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
e.printStackTrace();
}
}
if((total>0 && AllIdList.size()>0) || total==0){
Page<ReceiptoutEntity> page=new Page<>(receiptoutPagination.getCurrentPage(), receiptoutPagination.getPageSize());
IPage<ReceiptoutEntity> userIPage=this.page(page, receiptoutQueryWrapper);
IPage<ReceiptoutEntity> userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination);
return receiptoutPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<ReceiptoutEntity> list = new ArrayList();
return receiptoutPagination.setData(list, list.size());
}
}
@Override
public List<ReceiptoutEntity> getTypeList(ReceiptoutPagination receiptoutPagination,String dataType){

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

@ -421,11 +421,16 @@ public class SaleorderitemController {
List<Salesorder_item0Entity> Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemCrForm.getSalesorder_item0List(),Salesorder_item0Entity.class);
for (Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
if (ObjectUtils.isNotEmpty(poundlistEntity)){
if (poundlistEntity.getIsInvoicing().equals("0")){
return ActionResult.fail("存在磅单号为【磅单号-"+poundlistEntity.getPoundlistNo()+"】未开进项票");
if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getPurchaseStatus() != null){
if (!poundlistEntity.getPurchaseStatus().equals("2") || !poundlistEntity.getPurchaseStatus().equals("3")){
return ActionResult.fail("存在磅单号为【磅单号-"+poundlistEntity.getPoundlistNo()+"】未开票或未入库");
}
}
// if (ObjectUtils.isNotEmpty(poundlistEntity)){
// if (poundlistEntity.getIsInvoicing().equals("0")){
// return ActionResult.fail("存在磅单号为【磅单号-"+poundlistEntity.getPoundlistNo()+"】未开进项票");
// }
// }
}
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java
Unescape View File

@ -126,6 +126,6 @@ public class SaleorderitemInfoVO{
@TableField("customerId")
private String customerId;
@TableField(exist = false)
@TableField("poundlistentityList")
private List<PoundlistEntity> poundlistentityList;
}

34
SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml
Unescape View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.arinvoices.mapper.ArinvoicesMapper">
<select id="queryArinvoices" resultType="jnpf.arinvoices.entity.ArinvoicesEntity">
SELECT
a.*,
b.supplier_nm customerNm,
c.contract_name contractNm,
d.document_no sourceOrderNo
FROM
jg_arinvoices a
LEFT JOIN jg_customer b ON a.customer_id = b.id
LEFT JOIN jg_contract c ON a.contract_id = c.id
LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id
WHERE 1=1
<if test="arinvoicesPagination.documentNo != null and arinvoicesPagination.documentNo != ''">
and a.document_no LIKE CONCAT('%',#{arinvoicesPagination.documentNo},'%')
</if>
<if test="arinvoicesPagination.sourceOrderNo != null and arinvoicesPagination.sourceOrderNo != ''">
and d.document_no LIKE CONCAT('%',#{arinvoicesPagination.sourceOrderNo},'%')
</if>
<if test="arinvoicesPagination.contractNm != null and arinvoicesPagination.contractNm != ''">
and c.contract_name LIKE CONCAT('%',#{arinvoicesPagination.contractNm},'%')
</if>
<if test="arinvoicesPagination.customerNm != null and arinvoicesPagination.customerNm != ''">
and b.supplier_nm LIKE CONCAT('%',#{arinvoicesPagination.customerNm},'%')
</if>
<if test="arinvoicesPagination.startDate != null and arinvoicesPagination.endDate != null">
and a.business_date &gt; #{arinvoicesPagination.startDate} AND a.business_date &lt;= #{arinvoicesPagination.endDate}
</if>
</select>
</mapper>

21
SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml
Unescape View File

@ -7,4 +7,25 @@
where id = #{poundlistId}
</select>
<select id="queryCollection" resultType="jnpf.collection.entity.CollectionEntity">
SELECT
a.*,
b.supplier_nm customerNm,
c.contract_name contractNm
FROM
jg_collection a
LEFT JOIN jg_customer b ON a.customer_id = b.id
LEFT JOIN jg_contract c ON a.contract_id = c.id
where 1=1
<if test="collectionPagination.documentNo != null and collectionPagination.documentNo != ''">
and a.document_no LIKE CONCAT('%',#{collectionPagination.documentNo},'%')
</if>
<if test="collectionPagination.contractNm != null and collectionPagination.contractNm != ''">
and c.contract_name LIKE CONCAT('%',#{collectionPagination.contractNm},'%')
</if>
<if test="collectionPagination.customerNm != null and collectionPagination.customerNm != ''">
and b.supplier_nm LIKE CONCAT('%',#{collectionPagination.customerNm},'%')
</if>
</select>
</mapper>

32
SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml
Unescape View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.receiptout.mapper.ReceiptoutMapper">
<select id="queryReceiptout" resultType="jnpf.receiptout.entity.ReceiptoutEntity">
select
a.*,
b.supplier_nm customerNm,
c.document_no sourceOrderNo
from
jg_receiptout a
LEFT JOIN jg_customer b on a.customer_id = b.id
LEFT JOIN jg_salesorder c on a.source_no = c.id
where 1=1
<if test="receiptoutPagination.documentNo != null and receiptoutPagination.documentNo != ''">
and a.document_no LIKE CONCAT('%',#{receiptoutPagination.documentNo},'%')
</if>
<if test="receiptoutPagination.type != null and receiptoutPagination.type != ''">
and a.type LIKE CONCAT('%',#{receiptoutPagination.type},'%')
</if>
<if test="receiptoutPagination.sourceOrderNo != null and receiptoutPagination.sourceOrderNo != ''">
and c.document_no LIKE CONCAT('%',#{receiptoutPagination.sourceOrderNo},'%')
</if>
<if test="receiptoutPagination.customerNm != null and receiptoutPagination.customerNm != ''">
and b.supplier_nm LIKE CONCAT('%',#{receiptoutPagination.customerNm},'%')
</if>
<if test="receiptoutPagination.startDate != null and receiptoutPagination.endDate != null">
and a.creator_time &gt; #{receiptoutPagination.startDate} AND a.creator_time &lt;= #{receiptoutPagination.endDate}
</if>
</select>
</mapper>

2
SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
Unescape View File

@ -26,7 +26,7 @@
and c.supplier_nm LIKE CONCAT('%',#{saleorderitemPagination.customerName},'%')
</if>
<if test="saleorderitemPagination.startDate != null and saleorderitemPagination.endDate != null">
and a.creator_time &gt; #{saleorderitemPagination.startDate} AND a.POUND_DATE &lt;= #{saleorderitemPagination.endDate}
and a.creator_time &gt; #{saleorderitemPagination.startDate} AND a.creator_time &lt;= #{saleorderitemPagination.endDate}
</if>
</select>

183
SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
Unescape View File

@ -24,104 +24,95 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="金额"
prop="amount" >
<el-input-number v-model="dataForm.amount"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
<el-col :span="8" >
<el-form-item label="币别 "
prop="currency" >
<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" :disabled="item.disabled" ></el-option>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="数量"
prop="quantity" >
<el-input-number v-model="dataForm.quantity"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="金额"
prop="amount" >
<el-input-number v-model="dataForm.amount"
placeholder="数字文本" :step="1" :style='{"width":"100%"}' disabled>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="币别 "
prop="currency" >
<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" :disabled="item.disabled" ></el-option>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="数量"
prop="quantity" >
<el-input-number v-model="dataForm.quantity"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="备注"
prop="remark" >
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="合同名称"
prop="contractId" >
<popupSelect v-model="dataForm.contractId"
placeholder="请选择" clearable field="contractId" interfaceId="398361758806411909" :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="单据状态 "
prop="status" >
<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" :disabled="item.disabled" ></el-option>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="发票金额"
prop="invoiceAmount" >
<el-input-number v-model="dataForm.invoiceAmount"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="发票金额"
prop="invoiceAmount" >
<el-input-number v-model="dataForm.invoiceAmount"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="发票数量"
prop="invoiceQuantity" >
<el-input-number v-model="dataForm.invoiceQuantity"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="发票数量"
prop="invoiceQuantity" >
<el-input-number v-model="dataForm.invoiceQuantity"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="来源单号"
prop="salesOrderId" >
<popupSelect v-model="dataForm.salesOrderId"
placeholder="请选择" clearable field="salesOrderId" interfaceId="400235058386036741" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="来源单号"
prop="salesOrderId" >
<popupSelect v-model="dataForm.salesOrderId"
placeholder="请选择" clearable field="salesOrderId" interfaceId="398359995269352069" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
>
</popupSelect>
</el-form-item>
</el-col>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="合同名称"
prop="contractId" >
<popupSelect v-model="dataForm.contractId"
placeholder="请选择" clearable field="contractId" interfaceId="398361758806411909" :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
>
<el-col :span="8" >
<el-form-item label="客户"
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="398362084892576389" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="客户"
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="398362084892576389" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="备注"
prop="remark" >
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</popupSelect>
</el-form-item>
</el-col>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activezbtwpv" tab-position="top" class="mb-20">
<el-tab-pane label="应收明细">
@ -199,15 +190,15 @@
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delarinvoices_item1List(scope.$index)">删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="50" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delarinvoices_item1List(scope.$index)">删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<div class="table-actions" @click="addarinvoices_item1List()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
<!-- <div class="table-actions" @click="addarinvoices_item1List()">-->
<!-- <el-button type="text" icon="el-icon-plus">添加</el-button>-->
<!-- </div>-->
</el-form-item>
</el-col>
</el-tab-pane >

31
SC-web/src/views/scm/basicInformation/arinvoices/index.vue
Unescape View File

@ -9,6 +9,21 @@
<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="来源单号">
<el-input v-model="query.sourceOrderNo" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同名称">
<el-input v-model="query.contractNm" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户">
<el-input v-model="query.customerNm" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务日期">
<el-date-picker v-model="query.businessDate" type="daterange"
@ -28,8 +43,8 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-download" @click="exportData()" >导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
@ -48,7 +63,7 @@
/>
<el-table-column prop="documentNo" label="单据编号" width="0" align="left"
/>
<el-table-column prop="customerId" label="客户" width="0" align="left"
<el-table-column prop="customerNm" label="客户" width="0" align="left"
/>
<el-table-column prop="amount" label="金额" width="0" align="left"
/>
@ -64,9 +79,9 @@
/>
<el-table-column prop="invoiceQuantity" label="发票数量" width="0" align="left"
/>
<el-table-column prop="salesOrderId" label="来源单号" width="0" align="left"
<el-table-column prop="sourceOrderNo" label="来源单号" width="0" align="left"
/>
<el-table-column prop="contractId" label="合同名称" width="0" align="left"
<el-table-column prop="contractNm" label="合同名称" width="0" align="left"
/>
<el-table-column label="单据状态 " width="0" prop="status" algin="left"
>
@ -135,14 +150,14 @@ width="150" >
columnList: [
{prop: 'businessDate', label: '业务日期'},
{prop: 'documentNo', label: '单据编号'},
{prop: 'customerId', label: '客户'},
{prop: 'customerNm', label: '客户'},
{prop: 'amount', label: '金额'},
{prop: 'quantity', label: '数量'},
{prop: 'currency', label: '币别 '},
{prop: 'invoiceAmount', label: '发票金额'},
{prop: 'invoiceQuantity', label: '发票数量'},
{prop: 'salesOrderId', label: '销售订单号'},
{prop: 'contractId', label: '合同名称'},
{prop: 'sourceOrderNo', label: '销售订单号'},
{prop: 'contractNm', label: '合同名称'},
{prop: 'status', label: '单据状态 '},
{prop: 'remark', label: '备注'},
],

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

@ -25,7 +25,7 @@
<el-form-item label="合同名称" prop="contractId">
<popupSelect v-model="dataForm.contractId" placeholder="请选择" clearable field="contractId"
interfaceId="399835312982972805" :bissId="dataForm.code" :columnOptions="contractNamecolumnOptions" propsValue="id"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" @change="contractSelect"
>
</popupSelect>
</el-form-item>
@ -53,7 +53,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="收款类型 " prop="paymentType">
<el-select v-model="dataForm.paymentType" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-select v-model="paymentType" placeholder="请选择" clearable :style='{"width":"100%"}' @change="paymentTypeChange">
<el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
@ -62,7 +62,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="币别 " prop="currency">
<el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-select v-model="currency" placeholder="请选择" clearable :style='{"width":"100%"}' @change="currencyChange">
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
@ -71,7 +71,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="结算类型" prop="settlementType">
<el-select v-model="dataForm.settlementType" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-select v-model="settlementType" placeholder="请选择" clearable :style='{"width":"100%"}' @change="settlementTypeChange">
<el-option v-for="(item, index) in settlementTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
@ -120,20 +120,20 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="amount" label="收款金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}' @change="amountSum">
<el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}' @change="amountSum" disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="price" label="订单金额" align="center" width="130">
<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%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="amountCollected" label="已收款金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable
:style='{"width":"100%"}'>
:style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
@ -143,7 +143,7 @@
:field="'salesorderId'+scope.$index" interfaceId="393372436705378053"
:columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="id"
relationField="document_no" popupType="dialog" popupWidth="800px"
:bissId="dataForm.customerId" @change="popupSelect2">
:bissId="dataForm.contractId" @change="popupSelect2">
</popupSelect>
</template>
</el-table-column>
@ -152,14 +152,14 @@
<popupSelect v-model="scope.row.contractId" placeholder="请选择" clearable
:field="'contractId'+scope.$index" interfaceId="398848549678332037"
:columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="id"
relationField="contract_code" popupType="dialog" popupWidth="800px"
relationField="contract_code" popupType="dialog" popupWidth="800px" disabled
>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="num" label="数量" align="center" width="130">
<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%"}' disabled>
</el-input>
</template>
</el-table-column>
@ -174,26 +174,26 @@
<el-table-column prop="advanceAmount" label="垫资金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
:style='{"width":"100%"}'>
:style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rate" label="税额" align="center" width="130">
<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%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="notPrice" label="不含税金额" align="center" width="130">
<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%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="业务日期" align="center" width="130">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" disabled>
</el-date-picker>
</template>
</el-table-column>
@ -234,6 +234,9 @@
props: [],
data() {
return {
paymentType: "0",
currency: "0",
settlementType: "0",
visible: false,
loading: false,
isDetail: false,
@ -257,7 +260,22 @@
collection_item0List: [],
},
activeojnisi: '0',
rules: {},
rules: {
customerId: [
{
required: true,
message: '请选择',
trigger: 'change'
},
],
contractId: [
{
required: true,
message: '请选择',
trigger: 'change'
},
],
},
customerNamecolumnOptions: [{
"label": "客户编码",
"value": "supplier_cd"
@ -270,7 +288,13 @@
}, {
"label": "客户等级",
"value": "customer_level"
}, ],
}, {
"label": "银行账号",
"value": "bank_account"
}, {
"label": "开户行",
"value": "bank"
},],
contractNamecolumnOptions: [{
"label": "合同编码",
"value": "contract_code"
@ -278,15 +302,12 @@
"label": "合同名称",
"value": "contract_name"
} ],
jg_collection_item0deleteTimecolumnOptions: [{
"label": "销售订单ID",
"value": "id"
}, {
jg_collection_item0deleteTimecolumnOptions: [ {
"label": "销售订单编号",
"value": "document_no"
}, {
"label": "合同编号",
"value": "contract_code"
"value": "contract_id"
},
{
"label": "订单金额",
@ -392,6 +413,15 @@
created() {},
mounted() {},
methods: {
paymentTypeChange(e){
this.dataForm.paymentType = e;
},
currencyChange(e){
this.dataForm.currency = e;
},
settlementTypeChange(e){
this.dataForm.settlementType = e;
},
getSummaries(param) {
const { columns, data } = param;
const sums = [];
@ -426,20 +456,25 @@
popupSelect(e, d) {
debugger
this.dataForm.code = d.id;
this.dataForm.collectionCount = d.bank_account;
this.dataForm.collectionBank = d.bank;
debugger
},
popupSelect2(a, b) {
for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
if (a == this.dataForm.collection_item0List[i].documentNo) {
this.dataForm.collection_item0List[i].id = b.id;
debugger
if (a == this.dataForm.collection_item0List[i].salesorderId) {
this.dataForm.collection_item0List[i].price = b.price;
this.dataForm.collection_item0List[i].amountCollected = b.amount_collected;
this.dataForm.collection_item0List[i].contractCode = b.contract_code;
this.dataForm.collection_item0List[i].contractId = b.contract_id;
this.dataForm.collection_item0List[i].num = b.num;
this.dataForm.collection_item0List[i].advanceAmount = b.advance_amount;
this.dataForm.collection_item0List[i].rate = b.rate;
this.dataForm.collection_item0List[i].notPrice = b.not_price;
this.dataForm.collection_item0List[i].creatorTime = b.creator_time;
this.dataForm.collection_item0List[i].amount = parseFloat(b.price) - parseFloat(b.amount_collected);
this.dataForm.collection_item0List[i].creatorTime = new Date().getTime();
debugger
}
}
},

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

@ -9,6 +9,16 @@
<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户名称">
<el-input v-model="query.customerNm" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同名称">
<el-input v-model="query.contractNm" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@ -46,8 +56,8 @@
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="documentNo" label="单据编号" fixed="left" sortable width="200" align="center" />
<el-table-column prop="customerId" label="客户名称" fixed="left" sortable width="200" align="center" />
<el-table-column prop="contractId" label="合同名称" fixed="left" sortable width="200" align="center" />
<el-table-column prop="customerNm" label="客户名称" fixed="left" sortable width="200" align="center" />
<el-table-column prop="contractNm" label="合同名称" fixed="left" sortable width="200" align="center" />
<el-table-column label="币别 " width="80" sortable prop="currency" align="center" >
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
@ -145,11 +155,11 @@
label: '单据编号'
},
{
prop: 'customerId',
prop: 'customerNm',
label: '客户名称'
},
{
prop: 'contractId',
prop: 'contractNm',
label: '合同名称'
},
{

221
SC-web/src/views/scm/basicInformation/receiptout/Form.vue
Unescape View File

@ -19,7 +19,7 @@
<el-form-item label="业务类型"
prop="type" >
<el-select v-model="dataForm.type"
placeholder="请选择" clearable :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
@ -30,7 +30,7 @@
prop="sourceNo" >
<popupSelect v-model="dataForm.sourceNo"
placeholder="请选择" clearable field="sourceNo" interfaceId="392956668264114117" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
popupTitle="选择数据" popupWidth="800px" disabled
hasPage :pageSize="20" >
</popupSelect>
@ -40,7 +40,7 @@
<el-form-item label="出库金额"
prop="amount" >
<el-input v-model="dataForm.amount"
placeholder="请输入出库金额" readonly clearable :style='{"width":"100%"}'>
placeholder="请输入出库金额" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
@ -49,7 +49,7 @@
<el-form-item label="币别"
prop="currency" >
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
@ -59,7 +59,7 @@
<el-form-item label="出库数量"
prop="num" >
<el-input v-model="dataForm.num"
placeholder="请输入出库数量" readonly clearable :style='{"width":"100%"}'>
placeholder="请输入出库数量" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
@ -83,25 +83,25 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="出库日期"
prop="issueDate" >
<el-date-picker v-model="dataForm.issueDate"
placeholder="请选择出库日期" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
<!-- <el-col :span="12" >-->
<!-- <el-form-item label="出库日期"-->
<!-- prop="issueDate" >-->
<!-- <el-date-picker v-model="dataForm.issueDate"-->
<!-- placeholder="请选择出库日期" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >-->
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="单据状态"
prop="status" >
<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" :disabled="item.disabled" ></el-option>
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" >-->
<!-- <el-form-item label="单据状态"-->
<!-- prop="status" >-->
<!-- <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" :disabled="item.disabled" ></el-option>-->
</el-select>
</el-form-item>
</el-col>
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="24">
<el-tabs v-model="activezlqlfb" tab-position="top" class="mb-20">
<el-tab-pane label="磅单明细">
@ -116,7 +116,7 @@
<template slot-scope="scope">
<popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index" interfaceId="398732963950472005" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
popupWidth="800px"
popupWidth="800px" disabled
hasPage :pageSize="20" >
</popupSelect>
</template>
@ -125,96 +125,96 @@
<template slot-scope="scope">
<popupSelect v-model="scope.row.materialId"
placeholder="请选择" clearable :field="'materialId'+scope.$index" interfaceId="398719564478785669" :columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
popupWidth="800px"
>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.reservoirareaId"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index" interfaceId="392939299932268421" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
popupWidth="800px"
popupWidth="800px" disabled
>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="warehouseId" label="仓库名称" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.warehouseId"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index" interfaceId="399117969575232581" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
popupWidth="800px">
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="deliveryNum" label="出库数量" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.deliveryNum"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="计量单位" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.unit"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="price" label="单价" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.price"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rate" label="税率" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.rate"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="amount" label="金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.amount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rateAmount" label="税额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.rateAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="batchNo" label="批次号" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.batchNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="poundType" label="磅单类型" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.poundType"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.reservoirareaId"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index" interfaceId="381404161809350213" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
popupWidth="800px" @change="areaSelect"
>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="warehouseId" label="仓库名称" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.warehouseId"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index" interfaceId="399117969575232581" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
popupWidth="800px" disabled>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="batchNo" label="批次号" align="center" width="180">
<template slot-scope="scope">
<el-input v-model="scope.row.batchNo"
placeholder="系统自动生成" readonly>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deliveryNum" label="出库数量" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.deliveryNum"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="计量单位" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.unit"
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="price" label="单价" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.price"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rate" label="税率" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.rate"
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="amount" label="金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.amount"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rateAmount" label="税额" align="center" width="130">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delreceiptout_item0List(scope.$index)">删除</el-button>
<el-input v-model="scope.row.rateAmount"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
</el-table-column>
<el-table-column prop="poundType" label="磅单类型" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.poundType"
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="50" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delreceiptout_item0List(scope.$index)">删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<div class="table-actions" @click="addreceiptout_item0List()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
<!-- <div class="table-actions" @click="addreceiptout_item0List()">-->
<!-- <el-button type="text" icon="el-icon-plus">添加</el-button>-->
<!-- </div>-->
</el-form-item>
</el-col>
</el-tab-pane >
@ -296,6 +296,13 @@
},
mounted() {},
methods: {
areaSelect(a,b){
for (let i = 0;i<this.dataForm.receiptout_item0List.length;i++) {
if (a == this.dataForm.receiptout_item0List[i].reservoirareaId) {
this.dataForm.receiptout_item0List[i].warehouseId = b.warehouse_id
}
}
},
getSummaries(param) {
const { columns, data } = param;
const sums = [];
@ -305,7 +312,7 @@
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 5 || index === 7 || index === 9 || index === 10 )) {
if (!values.every(value => isNaN(value)) && (index === 6 || index === 8 || index === 10 || index === 11 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {

30
SC-web/src/views/scm/basicInformation/receiptout/index.vue
Unescape View File

@ -9,6 +9,16 @@
<el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="来源单号">
<el-input v-model="query.sourceOrderNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户名称">
<el-input v-model="query.customerNm" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务类型">
<el-select v-model="query.type" placeholder="请选择"
@ -19,6 +29,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期">
<el-date-picker v-model="query.creatorTime" type="daterange"
value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
end-placeholder="结束日期" >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@ -30,8 +48,8 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
@ -49,7 +67,7 @@
@selection-change="handleSelectionChange" border>
<el-table-column prop="documentNo" label="单据编号" width="0" align="left"
/>
<el-table-column prop="customerId" label="客户名称" width="0" align="left"
<el-table-column prop="customerNm" label="客户名称" width="0" align="left"
/>
<el-table-column prop="amount" label="出库金额" width="0" align="left"
/>
@ -63,7 +81,7 @@
</el-table-column>
<el-table-column prop="issueDate" label="出库日期" width="0" align="left"
sortable="custom"/>
<el-table-column prop="sourceNo" label="来源单号" width="0" align="left"
<el-table-column prop="sourceOrderNo" label="来源单号" width="0" align="left"
/>
<el-table-column label="业务类型" width="0" prop="type" algin="left"
>
@ -141,12 +159,12 @@
exportBoxVisible: false,
columnList: [
{prop: 'documentNo', label: '单据编号'},
{prop: 'customerId', label: '客户名称'},
{prop: 'customerNm', label: '客户名称'},
{prop: 'amount', label: '出库金额'},
{prop: 'num', label: '出库数量'},
{prop: 'currency', label: '币别'},
{prop: 'issueDate', label: '出库日期'},
{prop: 'sourceNo', label: '来源单号'},
{prop: 'sourceOrderNo', label: '来源单号'},
{prop: 'type', label: '业务类型'},
{prop: 'remark', label: '备注'},
{prop: 'status', label: '单据状态'},

4
SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
Unescape View File

@ -344,10 +344,10 @@
this.dataForm.collection_item0List[i].salesorderId = list[i].id;
this.dataForm.collection_item0List[i].rate = list[i].price - list[i].notPrice;
// this.dataForm.collection_item0List[i].amount = list[i].price - list[i].amountCollected;
// amountCollected = amountCollected + this.dataForm.collection_item0List[i].amount;
amountCollected = amountCollected + this.dataForm.collection_item0List[i].amount;
debugger
}
// this.dataForm.amountCollected = amountCollected;
this.dataForm.amountCollected = amountCollected;
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
// 表单提交

30
SC-web/src/views/scm/basicInformation/saleorder/index.vue
Unescape View File

@ -48,8 +48,8 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-download" @click="exportData()" >导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
@ -58,8 +58,8 @@
</el-button>
<el-button type="text" icon="el-icon-delete" @click="invoicesEntry()" >发票录入
</el-button>
<el-button type="text" icon="el-icon-delete" @click="collection()" >回款
</el-button>
<!-- <el-button type="text" icon="el-icon-delete" @click="collection()" >回款-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-check" @click="archive()" >归档
</el-button>
<el-button type="text" icon="el-icon-check" @click="materialBack()" >退货
@ -74,15 +74,15 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange" border>
<el-table-column prop="documentNo" label="单据编号" width="0" align="center"
/>
<el-table-column prop="erpNo" label="ERP订单号" width="0" align="center"
<el-table-column prop="documentNo" label="单据编号" width="150" align="center"
/>
<el-table-column prop="contractName" label="合同名称" width="0" align="center"
<!-- <el-table-column prop="erpNo" label="ERP订单号" width="0" align="center"-->
<!--/>-->
<el-table-column prop="contractName" label="合同名称" width="200" align="center"
/>
<el-table-column prop="customerName" label="客户名称" width="0" align="center"
<el-table-column prop="customerName" label="客户名称" width="170" align="center"
/>
<el-table-column prop="price" label="金额" width="0" align="center"
<el-table-column prop="price" label="金额" width="130" align="center"
/>
<el-table-column prop="num" label="重量" width="0" align="center"
/>
@ -92,15 +92,15 @@
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="amountCollected" label="已回款金额" width="0" align="center"
<el-table-column prop="amountCollected" label="已回款金额" width="130" align="center"
/>
<el-table-column prop="invoiceNum" label="发票数量" width="0" align="center"
/>
<el-table-column prop="invoiceAmount" label="发票金额" width="0" align="center"
<el-table-column prop="invoiceAmount" label="发票金额" width="130" align="center"
/>
<el-table-column prop="advanceAmount" label="垫资金额" width="0" align="center"
<el-table-column prop="advanceAmount" label="垫资金额" width="130" align="center"
/>
<el-table-column prop="creatorTime" label="制单时间" width="0" align="center"
<el-table-column prop="creatorTime" label="制单时间" width="140" align="center"
/>
<el-table-column label="单据状态 " width="0" prop="status" algin="center"
>
@ -108,7 +108,7 @@
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" width="0" align="center"
<el-table-column prop="creatorUserName" label="制单人" width="130" align="center"
/>
<el-table-column label="操作" fixed="right" algin="center"
width="150" >

4
SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
Unescape View File

@ -268,7 +268,7 @@
trigger: 'change'
},
],
salesId: [
sourceNo: [
{
required: true,
message: '请至少选择一个',
@ -304,7 +304,7 @@
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 5 || index === 7 || index === 9 || index === 10 )) {
if (!values.every(value => isNaN(value)) && (index === 6 || index === 8 || index === 10 || index === 11 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {

Write Preview
Loading…
Cancel
Save