Merge remote-tracking branch 'origin/main'

SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java

@@ -91,12 +91,12 @@ public class CollectionController {
         return ActionResult.success(result);
     }
 
-    /**
+/*    *//**
      * 提交
      *
      * @param ids
      * @return
-     */
+     *//*
     @PostMapping("/commit/{ids}")
     @Transactional
     public ActionResult commit(@PathVariable("ids") String ids) {
@@ -175,7 +175,7 @@ public class CollectionController {
             }
         }
         return ActionResult.fail("请选择一条数据");
-    }
+    }*/
 
     /**
      * 认款
@@ -189,24 +189,99 @@ public class CollectionController {
         String[] idList = ids.split(",");
         for (String id : idList) {
             CollectionEntity collectionEntity = collectionService.getInfo(id);
-            if (ObjectUtils.isNotEmpty(collectionEntity)) {
-                if (collectionEntity.getStatus().equals("0")) {
-                    return ActionResult.fail("请先提交");
-                }
-                if (collectionEntity.getStatus().equals("2")) {
-                    return ActionResult.fail("已认款，无需再次提交");
-                }
-                if (collectionEntity.getAmountCollected() == null || collectionEntity.getAmountCollected().compareTo(BigDecimal.ZERO) < 1) {
-                    return ActionResult.fail("请先输入收款金额");
+            if (collectionEntity.getStatus().equals("1")){
+                return ActionResult.fail("已提交");
+            }
+            if (collectionEntity.getStatus().equals("2")){
+                return ActionResult.fail("已认款");
+            }
+            if (collectionEntity.getStatus().equals("0")) {
+                QueryWrapper<Collection_item0Entity> queryWrapper = new QueryWrapper<>();
+                queryWrapper.lambda().eq(Collection_item0Entity::getCollectionId, id);
+                List<Collection_item0Entity> collection_item0EntityList = collection_item0Service.list(queryWrapper);//查询收款单子表信息
+                for (Collection_item0Entity collection_item0Entity : collection_item0EntityList) {
+                    BigDecimal sum = new BigDecimal(0);
+                    SaleorderitemEntity saleordercetEntity = saleorderitemService.getById(collection_item0Entity.getSalesorderId());//查询销售订单信息
+                    if (saleordercetEntity.getAmountCollected() == null) {
+                        saleordercetEntity.setAmountCollected(new BigDecimal(0));
+                    }
+//                if (saleordercetEntity.getAmountCollected().equals(saleordercetEntity.getPrice())) {
+//                    return ActionResult.fail("已回款金额等于金额");
+//                }
+                    if (collectionEntity.getAmountCollected() == null || collectionEntity.getAmountCollected().compareTo(BigDecimal.ZERO) < 1) {
+                        return ActionResult.fail("请先输入回款金额");
+                    } else {
+                        sum = saleordercetEntity.getAmountCollected().add(collection_item0Entity.getAmount());
+                        if (sum.compareTo(saleordercetEntity.getPrice()) > 0) {
+                            return ActionResult.fail("总回款金额大于金额");
+                        }
+                    }
+                    QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
+                    queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId,saleordercetEntity.getId());
+                    List<Salesorder_item0Entity> list = salesorder_item0Service.list(queryWrapper1);
+                    List<PoundlistEntity> poundlist = new ArrayList<>();
+                    for (Salesorder_item0Entity saleItem : list){
+                        PoundlistEntity poundlistEntity = collectionService.queryPoundInfo(saleItem.getPoundlistId());
+                        if (ObjectUtils.isNotEmpty(poundlistEntity)) {
+                            poundlist.add(poundlistEntity);
+                        }
+                    }
+                    if (poundlist.size() > 0) {
+                        poundlist = poundlist.stream().sorted(Comparator.comparing(PoundlistEntity::getAdvance).reversed()
+                                .thenComparing(Comparator.comparing(PoundlistEntity::getPoundDate))).collect(Collectors.toList());
+                    }else{
+                        return ActionResult.fail("磅单为空");
+                    }
+                    BigDecimal amount = new BigDecimal(0);
+                    List<PoundlistEntity> poundlist1 = new ArrayList<>();
+                    for (PoundlistEntity pound : poundlist){
+                        if (pound.getSalesPrice()!=null && pound.getSettlement()!=null) {
+                            amount = amount.add(pound.getSalesPrice().multiply(pound.getSettlement()));
+                            if (amount.compareTo(sum) < 1) {
+                                poundlist1.add(pound);
+                            }else{
+                                break;
+                            }
+                        }
+                    }
+                    for (PoundlistEntity poundlistEntity : poundlist1){
+                        poundlistEntity.setIsCollection("1");
+                        if (poundlistEntity.getPaymentDate() == null){
+                            poundlistEntity.setPaymentDate(new Date());
+                        }
+                        poundlistService.updateById(poundlistEntity);
+                    }
+                    saleordercetEntity.setAmountCollected(sum);
+//                    saleordercetEntity.setStatus("3");
+                    saleorderitemService.updateById(saleordercetEntity);
+                    collectionEntity.setStatus("2");
+                    collectionService.updateById(collectionEntity);
+                    return ActionResult.success("认款成功");
                 }
-                collectionEntity.setStatus("2");
-                collectionService.updateById(collectionEntity);
-                return ActionResult.success("认款成功");
-            } else {
-                return ActionResult.fail("数据为空");
             }
         }
         return ActionResult.fail("请选择一条数据");
+//        String[] idList = ids.split(",");
+//        for (String id : idList) {
+//            CollectionEntity collectionEntity = collectionService.getInfo(id);
+//            if (ObjectUtils.isNotEmpty(collectionEntity)) {
+//                if (collectionEntity.getStatus().equals("0")) {
+//                    return ActionResult.fail("请先提交");
+//                }
+//                if (collectionEntity.getStatus().equals("2")) {
+//                    return ActionResult.fail("已认款，无需再次提交");
+//                }
+//                if (collectionEntity.getAmountCollected() == null || collectionEntity.getAmountCollected().compareTo(BigDecimal.ZERO) < 1) {
+//                    return ActionResult.fail("请先输入收款金额");
+//                }
+//                collectionEntity.setStatus("2");
+//                collectionService.updateById(collectionEntity);
+//                return ActionResult.success("认款成功");
+//            } else {
+//                return ActionResult.fail("数据为空");
+//            }
+//        }
+//        return ActionResult.fail("请选择一条数据");
     }
     /**
      * 列表

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQuery.java

@@ -19,6 +19,12 @@ public class ContractFileListQuery extends Pagination {
 
     /** 合同名称 */
     private String contractName;
+
+    /** 供应商/客户名 **/
+    private String name;
+
+    /** 合同类型  **/
+    private String contractType;
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQueryModel.java

@@ -14,6 +14,8 @@ public class ContractFileListQueryModel {
 //    @JsonProperty("name")
     private String name;
 
+    /** 合同类型  **/
+    private String contractType;
     /**
      * 菜单id
      */

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePagination.java

@@ -20,6 +20,12 @@ public class ContractFilePagination extends Pagination {
 
 	/** 合同名称 */
 	private String contractName;
+
+	/** 供应商/客户名 **/
+	private String name;
+
+	/** 合同类型  **/
+	private String contractType;
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java

@@ -144,6 +144,15 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
             contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractName,contractFilePagination.getContractName());
         }
 
+        if(StringUtil.isNotEmpty(contractFilePagination.getName())){
+            contract_item0Num++;
+            contractFileQueryWrapper.lambda().like(ContractFileEntity::getName,contractFilePagination.getName());
+        }
+        if(StringUtil.isNotEmpty(contractFilePagination.getContractType())){
+            contract_item0Num++;
+            contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractType,contractFilePagination.getContractType());
+        }
+
         if (AllIdList.size() > 0) {
             contractFileQueryWrapper.lambda().in(ContractFileEntity::getId, AllIdList);
         }

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java

@@ -2,7 +2,10 @@
 
 package jnpf.poundlist.model.poundlist;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+
+import java.util.Date;
 import java.util.List;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -139,6 +142,10 @@ public class PoundlistCrForm  {
     @JsonProperty("remark")
     private String remark;
 
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
 
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java

@@ -143,4 +143,9 @@ public class PoundlistInfoVO{
         @JsonProperty("remark")
         private String remark;
 
+        /** 创建时间 **/
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @JsonProperty("creatorTime")
+        private Date  creatorTime;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java

@@ -212,6 +212,8 @@ public class PoundlistListVO{
     @JsonProperty("rate")
     private String rate;
 
+
+
     @JsonProperty("vehicleName")
     private String vehicleName;
 
@@ -238,4 +240,9 @@ public class PoundlistListVO{
     @TableField("salesId")
     private String salesId;
 
+    /** 创建时间 **/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonProperty("creatorTime")
+    private Date  creatorTime;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java

@@ -169,5 +169,7 @@ public class PoundlistUpForm{
     @JsonProperty("remark")
     private String remark;
 
-
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java

@@ -344,6 +344,7 @@ public class SalebackController {
 		List<Saleback_item0Entity> jg_salesback_item0List = salebackService.GetSaleback_item0List(id);
 		List<Saleback_item0Model> jg_salesback_item0ModelList = JsonUtil.getJsonToList(jg_salesback_item0List,Saleback_item0Model.class);
 		for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){
+
 								Map<String,Object> licenseNumMap = new HashMap<>();
                 jg_salesback_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("399190838078458949","id","ticketno",jg_salesback_item0Model.getVehicleId(),licenseNumMap));
             Map<String,Object> materialIdMap = new HashMap<>();
@@ -364,6 +365,44 @@ public class SalebackController {
         return ActionResult.success(vo);
 		}
 
+    /**
+     * 表单信息(详情页)
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/detail2/{id}")
+    public ActionResult<SalebackInfoVO> detailInfo2(@PathVariable("id") String id){
+        SalebackEntity entity= salebackService.getInfo(id);
+        SalebackInfoVO vo=JsonUtil.getJsonToBean(entity, SalebackInfoVO.class);
+        List<Saleback_item0Entity> saleback_item0Models =  salebackService.querySaleBackItemInfo(id);
+
+
+        //子表数据转换
+//        List<Saleback_item0Entity> jg_salesback_item0List = salebackService.GetSaleback_item0List(id);
+        List<Saleback_item0Model> jg_salesback_item0ModelList = JsonUtil.getJsonToList(saleback_item0Models,Saleback_item0Model.class);
+//        for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){
+//
+//            Map<String,Object> licenseNumMap = new HashMap<>();
+//            jg_salesback_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("399190838078458949","id","ticketno",jg_salesback_item0Model.getVehicleId(),licenseNumMap));
+//            Map<String,Object> materialIdMap = new HashMap<>();
+//            jg_salesback_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesback_item0Model.getMaterialId(),materialIdMap));
+//            Map<String,Object> businessIdMap = new HashMap<>();
+//            jg_salesback_item0Model.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",jg_salesback_item0Model.getBusinessId(),businessIdMap));
+//        }
+        vo.setSaleback_item0List(jg_salesback_item0ModelList);
+
+
+//		    vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SaleorderModel.class));
+
+//添加到详情表单对象中
+        Map<String,Object> salesOrderIdMap = new HashMap<>();
+        vo.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("383568951197606085","id","document_no",vo.getSalesOrderId(),salesOrderIdMap));
+        vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
+
+        return ActionResult.success(vo);
+    }
+
 
 
 

SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java

@@ -94,4 +94,6 @@ public class SalebackEntity  {
     @TableField(exist = false)
     private String saledocumentNo;
 
+
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -110,5 +111,31 @@ public class Saleback_item0Entity  {
     @TableField("MATERIAL_ID")
     private String materialId;
 
+    /** 客户  **/
+    @TableField(exist = false)
+    private String customerName;
+
+    /** 是否垫资  **/
+    @TableField(exist = false)
+    private String advance;
+
+    /** 含税单价  **/
+    @TableField(exist = false)
+    private String salesPrice;
+
+    /** 净重  **/
+    @TableField(exist = false)
+    private String netWeight;
+
+    /** 磅单图片  **/
+    @TableField(exist = false)
+    private String poundPictures;
+
+    /** 车辆图片  **/
+    @TableField(exist = false)
+    private String vehiclePictures;
+
+
+
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java

@@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jnpf.saleback.entity.SalebackEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.saleback.entity.Saleback_item0Entity;
 import jnpf.saleback.model.saleback.SalebackPagination;
+import jnpf.saleback.model.saleback.Saleback_item0Model;
 import jnpf.saleorder.entity.SaleorderitemEntity;
 import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  *
  * saleback
@@ -20,4 +24,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface SalebackMapper extends BaseMapper<SalebackEntity> {
     IPage<SalebackEntity> querySaleBack(@Param("page") Page<SalebackEntity> page, @Param("salebackPagination") SalebackPagination salebackPagination);
+
+    List<Saleback_item0Entity> querySaleBackItem(String id);
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java

@@ -1,5 +1,6 @@
 package jnpf.saleback.model.saleback;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.List;
 import java.util.Date;
@@ -61,5 +62,38 @@ public class Saleback_item0Model  {
     @JsonProperty("salesorderItem0Id")
     private String salesorderItem0Id;
 
+    /** 客户  **/
+    @JsonProperty("customerName")
+    private String customerName;
+
+    /** 是否垫资  **/
+    @JsonProperty("advance")
+    private String advance;
+
+    /** 含税单价  **/
+    @JsonProperty("salesPrice")
+    private String salesPrice;
+
+    /** 净重  **/
+    @JsonProperty("netWeight")
+    private String netWeight;
+
+    /** 磅单图片  **/
+    @JsonProperty("poundPictures")
+    private String poundPictures;
+
+    /** 车辆图片  **/
+    @JsonProperty("vehiclePictures")
+    private String vehiclePictures;
+
+    /** 制单时间 **/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonProperty("creatorTime")
+    private Date creatorTime;
+
+    /** 不含税金额  **/
+    @JsonProperty("noPrice")
+    private String noPrice;
+
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java

@@ -4,6 +4,8 @@ import jnpf.saleback.entity.Saleback_item0Entity;
 import jnpf.saleback.entity.SalebackEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 import jnpf.saleback.model.saleback.SalebackPagination;
+import jnpf.saleback.model.saleback.Saleback_item0Model;
+
 import java.util.*;
 /**
  *
@@ -32,6 +34,7 @@ public interface SalebackService extends IService<SalebackEntity> {
 //  子表方法
      List<Saleback_item0Entity> GetSaleback_item0List(String id);
 
+     List<Saleback_item0Entity> querySaleBackItemInfo(String id);
 
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java

@@ -2,6 +2,7 @@ package jnpf.saleback.service.impl;
 
 import jnpf.saleback.entity.*;
 import jnpf.saleback.mapper.SalebackMapper;
+import jnpf.saleback.model.saleback.Saleback_item0Model;
 import jnpf.saleback.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.util.RandomUtil;
@@ -265,7 +266,10 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 				return saleback_item0Service.list(queryWrapper);
 				}
 
-
+    @Override
+    public List<Saleback_item0Entity> querySaleBackItemInfo(String id) {
+        return salebackMapper.querySaleBackItem(id);
+    }
 
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java

@@ -187,6 +187,9 @@ public class TradeuploadEntity  {
     @TableField("IS_EXPENSE")
     private String isExpense;
 
+    @TableField("COLLECT_PRICE")
+    private BigDecimal collectPrice;
+
     @TableField(exist = false)
     private String materialName;
 

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadCrForm.java

@@ -156,5 +156,8 @@ public class TradeuploadCrForm  {
     @JsonProperty("isExamine")
     private String isExamine;
 
+    /** 收货单价 **/
+    @JsonProperty("collectPrice")
+    private String collectPrice;
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java

@@ -129,4 +129,7 @@ public class TradeuploadInfoVO{
         @JsonProperty("isExamine")
         private String isExamine;
 
+        /** 收货单价 **/
+        @JsonProperty("collectPrice")
+        private String collectPrice;
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java

@@ -181,4 +181,8 @@ public class TradeuploadListVO{
 
     @JsonProperty("naturalName")
     private String naturalName;
+
+    /** 收货单价 **/
+    @JsonProperty("collectPrice")
+    private String collectPrice;
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadUpForm.java

@@ -147,5 +147,9 @@ public class TradeuploadUpForm{
     @JsonProperty("isExamine")
     private String isExamine;
 
+    /** 收货单价 **/
+    @JsonProperty("collectPrice")
+    private String collectPrice;
+
 
 }

SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml

@@ -26,4 +26,28 @@
             and a.creator_time > #{salebackPagination.startDate} AND a.POUND_DATE <= #{salebackPagination.endDate}
         </if>
     </select>
+
+
+    <select id="querySaleBackItem" resultType="jnpf.saleback.entity.Saleback_item0Entity">
+SELECT
+    a.id,
+	b.rate,
+	b.price,
+	b.no_price as noPrice,
+	c.*,
+	d.ticketno as vehicleId,
+	e.item_name as materialId,
+	f.F_RealName as businessId,
+	g.supplier_nm as customerName
+FROM
+	jg_salesback_item0 a
+	LEFT JOIN jg_salesorder_item0 b ON a.salesorder_item0_id = b.id
+	LEFT JOIN jg_poundlist c ON b.poundlist_id = c.id
+	LEFT JOIN jg_vehicle d ON c.vehicle_id = d.id
+	LEFT JOIN jg_material e ON c.material_id = e.id
+	LEFT JOIN base_user f ON c.business_id = f.F_Id
+	LEFT JOIN jg_customer g ON c.customer_id = g.id
+WHERE
+     a.sales_back_id = #{id}
+    </select>
 </mapper>

SC-web/src/views/scm/basicInformation/collection/Form.vue

@@ -32,7 +32,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="收款金额" prop="amountCollected">
-              <el-input v-model="dataForm.amountCollected" placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+              <el-input v-model="dataForm.amountCollected" placeholder="请输入" clearable :style='{"width":"100%"}' >
 
               </el-input>
             </el-form-item>

SC-web/src/views/scm/basicInformation/collection/index.vue

@@ -40,8 +40,8 @@
 <!--            </el-button>-->
 <!--            <el-button type="text" icon="el-icon-close" @click="exportData()">弃审-->
 <!--            </el-button>-->
-            <el-button type="text" icon="el-icon-check" @click="commit()">提交
-            </el-button>
+<!--            <el-button type="text" icon="el-icon-check" @click="commit()">提交-->
+<!--            </el-button>-->
             <el-button type="text" icon="el-icon-check" @click="confirmprice()">认款
             </el-button>
           </div>

SC-web/src/views/scm/basicInformation/contractfile/index.vue

@@ -14,10 +14,32 @@
               <el-input v-model="query.contractName" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
+          <template v-if="showAll">
+          <el-col :span="6">
+            <el-form-item label="供应商/客户名">
+              <el-input v-model="query.name" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="合同类型">
+              <el-select v-model="query.contractType" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                <el-option v-for="(item, index) in contractTypeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          </template>
+
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+                展开
+              </el-button>
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
+                收起
+              </el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -137,10 +159,13 @@
     },
     data() {
       return {
+        showAll: false,
         detailVisible: false,
         query: {
           contractCode: undefined,
-          contractName: undefined
+          contractName: undefined,
+          name: undefined,
+          contractType: undefined
         },
         treeProps: {
           children: 'children',

SC-web/src/views/scm/basicInformation/saleback/Form.vue

@@ -337,9 +337,9 @@
             this.dataForm.saleback_item0List[i].price = b.sales_price;
             this.dataForm.saleback_item0List[i].rate = b.rate;
             this.dataForm.saleback_item0List[i].amount = b.sales_price * b.settlement;
-            this.dataForm.saleback_item0List[i].pountUser = b.business_id;
             this.dataForm.saleback_item0List[i].pountType = b.pound_type;
             this.dataForm.saleback_item0List[i].businessId = b.business_id;
+            this.dataForm.saleback_item0List[i].salesorderItem0Id = b.saleitemId;
             this.rateOptions.find((item) => {
               if (this.dataForm.saleback_item0List[i].rate == item.id) {
                 this.dataForm.saleback_item0List[i].notAmount = this.dataForm.saleback_item0List[i].amount*item.fullName/100

SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue

@@ -342,9 +342,9 @@
 						this.dataForm.saleback_item0List[i].price = b.sales_price;
 						this.dataForm.saleback_item0List[i].rate = b.rate;
 						this.dataForm.saleback_item0List[i].amount = b.sales_price * b.settlement;
-						this.dataForm.saleback_item0List[i].pountUser = b.business_id;
 						this.dataForm.saleback_item0List[i].pountType = b.pound_type;
 						this.dataForm.saleback_item0List[i].businessId = b.business_id;
+						this.dataForm.saleback_item0List[i].salesorderItem0Id = b.saleitemId;
             this.rateOptions.find((item) => {
               if (this.dataForm.saleback_item0List[i].rate == item.id) {
                 this.dataForm.saleback_item0List[i].notAmount = this.dataForm.saleback_item0List[i].amount*item.fullName/100