合同导出

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/controller/contract/TqContractController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.project.business.domain.bo.TqContractBo;
 import com.ruoyi.project.business.domain.vo.contract.TqContractDto;
+import com.ruoyi.project.business.domain.vo.contract.TqContractExportVo;
 import com.ruoyi.project.business.domain.vo.contract.TqContractVo;
 import com.ruoyi.project.business.mapper.flow.FlowMapper;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -78,8 +79,9 @@ public class TqContractController extends BaseController
     public void export(HttpServletResponse response, TqContractBo tqContractBo)
     {
         List<TqContractVo> list = tqContractService.selectTqContractBoList(tqContractBo);
-        ExcelUtil<TqContractVo> util = new ExcelUtil<TqContractVo>(TqContractVo.class);
-        util.exportExcel(response, list, "合同列表数据");
+        List<TqContractExportVo> exportList = tqContractService.handleExportList(list);
+        ExcelUtil<TqContractExportVo> util = new ExcelUtil<TqContractExportVo>(TqContractExportVo.class);
+        util.exportExcel(response, exportList, "合同列表数据");
     }
 
      /**

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/vo/contract/TqContractExportVo.java

@@ -0,0 +1,158 @@
+package com.ruoyi.project.business.domain.vo.contract;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.project.business.domain.TbFile;
+import com.ruoyi.project.business.domain.TqContract;
+import com.ruoyi.project.business.domain.TqContractHistory;
+import com.ruoyi.project.business.domain.TqContractLift;
+import com.ruoyi.project.business.domain.flow.Flow;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Transient;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】对象 tq_contract
+ * 
+ * @author ruoyi
+ * @date 2024-08-14
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TqContractExportVo
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 合同编号(自动采番） */
+    @Excel(name = "合同编号",i18nCode = "contract.contractNo", sort = 1)
+    private String contractNo;
+
+    /** 合同名称 */
+    @Excel(name = "合同名称",i18nCode = "contract.contractName", sort = 2)
+    private String contractName;
+
+    /** *城市 */
+    @Excel(name = "城市",i18nCode = "contract.city", sort = 3)
+    private String city;
+
+    /** *贸易条款(字典） */
+    @Excel(name = "贸易条款" , dictType="contract_trade_terms",i18nCode = "contract.tradeTerms", sort = 4)
+    private String tradeTerms;
+
+    /** 付款方式（关联字典） */
+    @Excel(name = "付款方式",dictType="contract_payment_method",i18nCode = "contract.paymentMethod", sort = 5)
+    private String paymentMethod;
+
+    /** 销售模式 */
+    @Excel(name = "销售模式", dictType="contract_sales_model",i18nCode = "contract.salesModel", sort = 6)
+    private String salesModel;
+
+    /** *币种（关联字典） */
+    @Excel(name = "币种", dictType="currency_type",i18nCode = "contract.currencyId", sort = 7)
+    private String currencyId;
+
+    /** 合同金额 */
+//    @Excel(name = "合同金额",i18nCode = "contract.amount", sort = 8 )
+    private BigDecimal amount;
+
+    /** 合同金额 */
+    @Excel(name = "合同金额",i18nCode = "contract.amount", sort = 8 )
+    private String amountExport;
+
+    /** *签单日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "签单日期", width = 30, dateFormat = "yyyy-MM-dd",i18nCode = "contract.signingDate", sort = 9)
+    private Date signingDate;
+
+    /** *付款比例(暂定关联字典) */
+    @Excel(name = "付款比例", dictType="contract_payment_ratio",i18nCode = "contract.paymentRatio", sort = 10)
+    private String paymentRatio;
+
+    /** *审批状态 */
+    @Excel(name = "审批状态", dictType="contract_approval_status",i18nCode = "contract.approveStatus", sort = 11)
+    private String approveStatus;
+
+    /** *合同状态（履行中，已取消）关联字典 */
+    @Excel(name = "合同状态",i18nCode = "contract.status", sort = 12)
+    private String status;
+
+    /** 签单月美元汇率 */
+    @Excel(name = "签单月汇率",i18nCode = "contract.mUsdRate4SigningContracts", sort = 13)
+    private BigDecimal rate4SigningContracts;
+
+
+    /** 地址 */
+    @Excel(name = "地址",i18nCode = "contract.address", sort = 15)
+    private String address;
+
+    /** 电话 */
+    @Excel(name = "电话",i18nCode = "contract.telephone", sort = 16)
+    private String telephone;
+
+    /** 邮件 */
+    @Excel(name = "邮件",i18nCode = "contract.email", sort = 17)
+    private String email;
+
+    /** 商标 */
+    @Excel(name = "商标",i18nCode = "contract.shippingMark", sort = 18)
+    private String shippingMark;
+
+    /** 装船口岸 */
+    @Excel(name = "装船口岸",i18nCode = "contract.shipmentPort", sort = 19)
+    private String shipmentPort;
+
+    /** 目的口岸 */
+    @Excel(name = "目的口岸",i18nCode = "contract.destinationPort", sort = 20)
+    private String destinationPort;
+
+    /** 装船期限 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "装船期限", width = 30, dateFormat = "yyyy-MM-dd",i18nCode = "contract.shipmentDeadline", sort = 21)
+    private Date shipmentDeadline;
+
+
+    // 区域名称
+    @Excel(name = "区域",i18nCode = "contract.areaName", sort = 6)
+    private String areaName;
+
+    /** *国家 */
+    @Excel(name = "国家",i18nCode = "contract.countryName", sort = 7)
+    private String countryName;
+
+    // 业务员名称
+    @Excel(name = "业务员",i18nCode = "contract.salesmanName", sort = 9)
+    private String salesmanName;
+
+    //代理商名称
+    @Excel(name = "代理商",i18nCode = "lift.agentName", sort = 10)
+    private String agentName;
+
+    /** *终端客户名称 */
+    @Excel(name = "终端客户",i18nCode = "lift.endCustomersName", sort = 11)
+    private String endCustomersName;
+
+
+    /** 附件地址拼接字符串 */
+    @Transient
+    private String file;
+
+    /** 附件集合 */
+    @Transient
+
+    private  Long flowStatus;
+
+    private Flow  flow;
+
+    /** 单位 */
+    private String unit;
+
+
+}

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/vo/contract/TqContractVo.java

@@ -70,5 +70,8 @@ public class TqContractVo extends TqContract
 
     private Flow  flow;
 
+    /** 单位 */
+    private String unit;
+
 
 }

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/ITqContractService.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import com.ruoyi.project.business.domain.TqContract;
 import com.ruoyi.project.business.domain.bo.TqContractBo;
 import com.ruoyi.project.business.domain.vo.contract.TqContractDto;
+import com.ruoyi.project.business.domain.vo.contract.TqContractExportVo;
 import com.ruoyi.project.business.domain.vo.contract.TqContractVo;
 import com.ruoyi.project.business.dto.ContractSigningStatistic;
 
@@ -35,6 +36,14 @@ public interface ITqContractService
     public List<TqContract> selectTqContractList(TqContract tqContract);
 
     public List<TqContractVo> selectTqContractBoList(TqContractBo tqContract);
+
+     /**
+      * @Author Chenj
+      * @Description 将数据处理成导出需要的格式
+      * @Date 11:00 2024/9/11
+      **/
+    public List<TqContractExportVo> handleExportList(List<TqContractVo> tqContractVoList);
+
     public List<TqContractVo> selectTqContractBoListApp(TqContractBo tqContract);
     /**
      * 新增合同列表

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/service/impl/TqContractServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson2.JSONObject;
+import org.springframework.beans.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.base.Functions;
 import com.google.common.collect.Lists;
@@ -23,6 +24,7 @@ import com.ruoyi.project.business.domain.bo.contract.TqContractLiftBo;
 import com.ruoyi.project.business.domain.flow.Flow;
 import com.ruoyi.project.business.domain.flow.FlowAuditParam;
 import com.ruoyi.project.business.domain.vo.contract.TqContractDto;
+import com.ruoyi.project.business.domain.vo.contract.TqContractExportVo;
 import com.ruoyi.project.business.domain.vo.contract.TqContractLiftVo;
 import com.ruoyi.project.business.domain.vo.contract.TqContractVo;
 import com.ruoyi.project.business.domain.vo.currency.ContractCurrencyTime;
@@ -159,6 +161,24 @@ public class TqContractServiceImpl implements ITqContractService
         }
         return tqContractVoList;
     }
+
+    /**
+     * @Author Chenj
+     * @Description 将数据处理成导出需要的格式
+     * @Date 11:00 2024/9/11
+     **/
+    @Override
+    public List<TqContractExportVo> handleExportList(List<TqContractVo> tqContractVoList){
+        List<TqContractExportVo> tqContractExportVoList = tqContractVoList.stream()
+                .map(tqContractVo -> {
+                    TqContractExportVo tqContractExportVo = new TqContractExportVo();
+                    BeanUtils.copyProperties(tqContractVo,tqContractExportVo);
+                    tqContractExportVo.setAmountExport(formatBigDecimal(tqContractExportVo.getAmount(),tqContractExportVo.getUnit()));
+                    return tqContractExportVo;
+                }).collect(Collectors.toList());
+
+        return tqContractExportVoList;
+    }
     @Override
     public List<TqContractVo> selectTqContractBoListApp(TqContractBo tqContract){
         return tqContractMapper.selectTqContractBoListApp(tqContract);
@@ -278,6 +298,10 @@ public class TqContractServiceImpl implements ITqContractService
         return tqContractMapper.updateTqContract(tqContractDto);
     }
 
+    public static String formatBigDecimal(BigDecimal value,String unit) {
+        DecimalFormat decimalFormat = new DecimalFormat("#,###.00");
+        return unit+decimalFormat.format(value);
+    }
 
 
     private void generateTasks(TqContractDto tqContractDto){

RuoYi-Vue-fast-master/src/main/resources/mybatis/business/contract/TqContractMapper.xml

@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
     <select id="selectTqContractBoList" resultMap="TqContractVoResult">
-        select ah.*,account.account_name as account_name,flow.status as flowStatus,u.nick_name as salesman_name,ag.agent_name,
+        select ah.*,account.account_name as account_name,flow.status as flowStatus,u.nick_name as salesman_name,ag.agent_name,RIGHT(dict.remark, 1) as unit,
             CASE #{language}
             WHEN 'chinese' THEN country.country_name
             WHEN 'english' THEN country.country_nameUS
@@ -117,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_country country on country.country_id = ah.country_id  AND ah.del_flag = country.del_flag
         LEFT JOIN tb_area area on area.area_id = ah.area_id  AND ah.del_flag = area.del_flag
         left join tb_agent ag on ah.agent_id = ag.agent_id AND ah.del_flag = ag.del_flag
+        LEFT JOIN sys_dict_data dict ON dict.dict_type = 'currency_type' and dict.dict_value = ah.currency_id
         <where>
             ah.del_flag != '1'
             and flow.del_flag = '0'

ruoyi-ui-vue2/src/views/contract/lift/index.vue

@@ -23,173 +23,162 @@
 
       </template>
       <template #default="{ list }">
-        <!--生产令号-->
-        <Column :label="$t('lift.productionOrderNo')"  :searchParams="queryParams" :showSearch="true" fixed prop="productionOrderNo" v-if="checkPermi(['user:contract:lift:productionOrderNo'])" />
-        <!--合同号-->
+
+        <!-- 签单日期1 -->
+        <Column :label="$t('contract.signingDate')"  :searchParams="queryParams" :showSearch="true" prop="signingDate" v-if="checkPermi(['user:contract:lift:signingDate'])" search-type="dateRange"  width="250"/>
+        <!--合同号2-->
         <Column :label="$t('contract.contractNo')"  :searchParams="queryParams" :showSearch="true" fixed prop="contractNo" v-if="checkPermi(['user:contract:lift:contractNo'])" />
-        <!--合同号-版本号-->
-        <Column :label="$t('lift.contractNoVersionNo')"  :searchParams="queryParams" :showSearch="true" prop="contractNoVersionNo" v-if="checkPermi(['user:contract:lift:contractNoVersionNo'])" />
-        <!-- 合同名 -->
+        <!--生产令号3-->
+        <Column :label="$t('lift.productionOrderNo')"  :searchParams="queryParams" :showSearch="true" fixed prop="productionOrderNo" v-if="checkPermi(['user:contract:lift:productionOrderNo'])" />
+        <!-- 合同名4 -->
         <Column :label="$t('lift.contractName')"  :searchParams="queryParams" :showSearch="true" prop="contractName" v-if="checkPermi(['user:contract:lift:contractName'])"/>
-        <!-- 签单日期 -->
-        <Column :label="$t('contract.signingDate')"  :searchParams="queryParams" :showSearch="true" prop="signingDate" v-if="checkPermi(['user:contract:lift:signingDate'])" search-type="dateRange"  width="250"/>
-        <!--区域 -->
+        <!--区域5 -->
         <Column :label="$t('user.area')" prop="areaId" :searchParams="queryParams" :showSearch="true" searchType="select" :searchDict="areaList" :min-width="200" :selectMore="true" v-if="checkPermi(['user:contract:lift:areaId'])"/>
-        <!--国家-->
+        <!--国家6-->
         <Column :label="$t('project.countryId')" prop="countryId" :showSearch="true" searchType="select" :searchParams="queryParams" :searchDict="countryList" :min-width="200" :selectMore="true" v-if="checkPermi(['user:contract:lift:countryId'])"/>
-        <!--城市-->
-        <Column :label="$t('project.city')"  prop="city" show-search :searchParams="queryParams" v-if="checkPermi(['user:contract:lift:city'])"/>
-        <!--业务员-->
+        <!--业务员7-->
         <Column :label="$t('contract.salesman')"  prop="salesmanName" width="250" show-search :searchParams="queryParams" v-if="checkPermi(['user:contract:lift:salesman'])">
           <template #default="{ row }">
             <span>{{ row.salesmanName }}</span>
           </template>
         </Column>
-        <!--代理商-->
-        <Column :label="$t('agent.agent')" prop="agentId" :showSearch="true" searchType="select" :searchParams="queryParams" :searchDict="agentList" :min-width="200" :selectMore="true" v-if="checkPermi(['user:contract:lift:agentId'])"/>
-        <!--终端客户  v-hasRole="['system_manager', 'sales_director']" -->
-        <Column :label="$t('contract.endCustomers')" prop="endCustomersName" show-search :searchParams="queryParams" v-if="checkPermi(['user:contract:lift:endCustomers'])"/>
-        <!--贸易条款-->
-        <Column :label="$t('contract.tradeTerms')" :searchDict="dict.type.contract_trade_terms" prop="tradeTerms" show-search v-if="checkPermi(['user:contract:lift:tradeTerms'])"
-                :searchParams="queryParams"
-                searchType="select" selectMore/>
-        <!--销售模式-->
-        <Column :label="$t('contract.salesModel')" :searchDict="dict.type.contract_sales_model" :showSearch="true" prop="salesModel" v-if="checkPermi(['user:contract:lift:salesModel'])"
-                selectProp="origins" searchType="select" selectMore :searchParams="queryParams"/>
-        <!--合同更改日期-->
-        <Column :label="$t('lift.contractAmendmentDate')" :searchParams="queryParams" :showSearch="true" prop="contractAmendmentDate" v-if="checkPermi(['user:contract:lift:contractAmendmentDate'])"
-                search-type="dateRange" width="250"/>
-        <!--产品类别-->
+        <!--产品类别8-->
         <Column :label="$t('lift.productCategory')" :searchParams="queryParams" :showSearch="true" prop="productCategory" v-if="checkPermi(['user:contract:lift:productCategory'])"
-                 :searchDict="dict.type.product_category" searchType="select" selectMore sortable="custom"/>
-        <!--梯型-->
-        <Column :label="$t('lift.elevatorModel')" :searchParams="queryParams" :showSearch="true" prop="elevatorModel"  v-if="checkPermi(['user:contract:lift:elevatorModel'])" sortable="custom"/>
-        <!--规格-->
-        <Column :label="$t('lift.specification')" :searchParams="queryParams" :showSearch="true" prop="specification"  v-if="checkPermi(['user:contract:lift:specification'])"/>
-        <!--数量-->
-        <Column :label="$t('lift.count')" :searchParams="queryParams"  prop="count"  v-if="checkPermi(['user:contract:lift:count'])"/>
-        <!--币种-->
+                :searchDict="dict.type.product_category" searchType="select" selectMore sortable="custom"/>
+
+        <!--贸易条款9-->
+        <Column :label="$t('contract.tradeTerms')" :searchDict="dict.type.contract_trade_terms" prop="tradeTerms" show-search v-if="checkPermi(['user:contract:lift:tradeTerms'])"
+                :searchParams="queryParams" searchType="select" selectMore/>
+        <!--币种10-->
         <Column :label="$t('contract.currencyId')" :searchParams="queryParams" :showSearch="true" prop="currencyId" searchType="select" v-if="checkPermi(['user:contract:lift:currencyId'])"  selectMore
                 :searchDict="dict.type.currency_type"/>
-        <!--单价-->
+        <!--规格11-->
+        <Column :label="$t('lift.specification')" :searchParams="queryParams" :showSearch="true" prop="specification"  v-if="checkPermi(['user:contract:lift:specification'])"/>
+        <!--数量12-->
+        <Column :label="$t('lift.count')" :searchParams="queryParams"  prop="count"  v-if="checkPermi(['user:contract:lift:count'])"/>
+
+        <!--单价13-->
         <Column :label="$t('lift.unitPrice')" :searchParams="queryParams"  prop="unitPrice"  align="right" v-if="checkPermi(['user:contract:lift:unitPrice'])">
           <template #default="{ row }">
             <span>{{ toDecimal2(numFormat(row.unitPrice)) }}</span>
           </template>
         </Column>
-        <!--金额-->
-        <Column :label="$t('lift.amountOfMoney')" :searchParams="queryParams"  prop="amountOfMoney"  align="right" v-if="checkPermi(['user:contract:lift:amountOfMoney'])">
-          <template #default="{ row }">
-            <span>{{ toDecimal2(numFormat(row.amountOfMoney)) }}</span>
-          </template>
-        </Column>
-        <!--报价折扣-->
+
+        <!--报价折扣14-->
         <Column :label="$t('lift.quotationDiscount')" :searchParams="queryParams"  prop="quotationDiscount" v-if="checkPermi(['user:contract:lift:quotationDiscount'])"/>
-        <!--付款方式-->
+        <!--付款方式15-->
         <Column :label="$t('contract.paymentMethod')" :searchParams="queryParams" :showSearch="true" prop="paymentMethod" searchType="select" v-if="checkPermi(['user:contract:lift:paymentMethod'])"  selectMore
-          />      :searchDict="dict.type.contract_payment_method"
-        <!--预计排产日期-->
+                :searchDict="dict.type.contract_payment_method"/>
+
+        <!--城市16-->
+        <Column :label="$t('project.city')"  prop="city" show-search :searchParams="queryParams" v-if="checkPermi(['user:contract:lift:city'])"/>
+
+        <!--代理商17-->
+        <Column :label="$t('agent.agent')" prop="agentId" :showSearch="true" searchType="select" :searchParams="queryParams" :searchDict="agentList" :min-width="200" :selectMore="true" v-if="checkPermi(['user:contract:lift:agentId'])"/>
+        <!--终端客户18  v-hasRole="['system_manager', 'sales_director']" -->
+        <Column :label="$t('contract.endCustomers')" prop="endCustomersName" show-search :searchParams="queryParams" v-if="checkPermi(['user:contract:lift:endCustomers'])"/>
+
+        <!--预计排产日期19-->
         <Column :label="$t('lift.expectedProductionScheduleDate')" :searchParams="queryParams" :showSearch="true" v-if="checkPermi(['user:contract:lift:expectedProductionScheduleDate'])"
                 sortable="custom" prop="expectedProductionScheduleDate" search-type="dateRange"  width="250"/>
-        <!--希望排产日期-->
-        <Column :label="$t('lift.hopeToScheduleProductionDate')" :searchParams="queryParams" :showSearch="true" prop="hopeToScheduleProductionDate" v-if="checkPermi(['user:contract:lift:hopeToScheduleProductionDate'])"
-                sortable="custom" search-type="dateRange" width="250"/>
-        <!--实际排产日期-->
-        <Column :label="$t('lift.actualProductionScheduleDate')" :searchParams="queryParams" :showSearch="true" prop="actualProductionScheduleDate" v-if="checkPermi(['user:contract:lift:actualProductionScheduleDate'])"
-                sortable="custom" search-type="dateRange" width="250"/>
-        <!--排产日期-->
+        <!--评审折扣20-->
+        <Column :label="$t('lift.reviewDiscount')" :searchParams="queryParams"  prop="reviewDiscount" v-if="checkPermi(['user:contract:lift:reviewDiscount'])"/>
+
+        <!--排产日期21-->
         <Column :label="$t('lift.productionScheduleDate')" :searchParams="queryParams" :showSearch="true" prop="productionScheduleDate" v-if="checkPermi(['user:contract:lift:productionScheduleDate'])"
-                search-type="dateRange" sortable="custom"
-                width="250"/>
-        <!--项目取消暂停原因-->
-        <Column :label="$t('lift.reasonForProjectCancellationAndSuspension')" :searchParams="queryParams" :showSearch="true" v-if="checkPermi(['user:contract:lift:reasonForProjectCancellationAndSuspension'])"
-                prop="reasonForProjectCancellationAndSuspension" />
-        <!--希望发货日-->
-        <Column :label="$t('lift.hopeForDeliveryDate')" :searchParams="queryParams" :showSearch="true" prop="hopeForDeliveryDate" v-if="checkPermi(['user:contract:lift:hopeForDeliveryDate'])"
-                search-type="dateRange" width="250" sortable="custom"/>
-        <!--实际发货日-->
+                search-type="dateRange" sortable="custom" width="250"/>
+
+        <!--实际发货日23-->
         <Column :label="$t('lift.actualDeliveryDate')" :searchParams="queryParams" :showSearch="true" prop="actualDeliveryDate" v-if="checkPermi(['user:contract:lift:actualDeliveryDate'])"
                 search-type="dateRange"  width="250" sortable="custom"/>
-        <!--港口-->
-        <Column :label="$t('lift.port')" :searchParams="queryParams" :showSearch="true" prop="port"  v-if="checkPermi(['user:contract:lift:port'])"/>
-        <!--生产订单状态-->
-        <Column :label="$t('lift.productionOrderStatus')" :searchParams="queryParams" :showSearch="true" prop="productionOrderStatus" searchType="select" v-if="checkPermi(['user:contract:lift:productionOrderStatus'])"
-                 selectMore   :searchDict="dict.type.production_order_status"/>
-        <!--评审折扣-->
-        <Column :label="$t('lift.reviewDiscount')" :searchParams="queryParams"  prop="reviewDiscount" v-if="checkPermi(['user:contract:lift:reviewDiscount'])"
-                />
-        <!--评审运费-->
-        <Column :label="$t('lift.reviewShippingCosts')" :searchParams="queryParams" prop="reviewShippingCosts" align="right" v-if="checkPermi(['user:contract:lift:reviewShippingCosts'])"
-                >
+
+        <!--项目状态24-->
+        <Column :label="$t('lift.projectStatus')" :searchParams="queryParams" :showSearch="true" prop="projectStatus" searchType="select" v-if="checkPermi(['user:contract:lift:projectStatus'])"
+                :searchDict="dict.type.contract_project_status"/>
+        <!--项目取消暂停原因25-->
+        <Column :label="$t('lift.reasonForProjectCancellationAndSuspension')" :searchParams="queryParams" :showSearch="true" v-if="checkPermi(['user:contract:lift:reasonForProjectCancellationAndSuspension'])"
+                prop="reasonForProjectCancellationAndSuspension" />
+
+        <!--项目取消暂停原因26-->
+        <Column label="延期过期发货原因" :searchParams="queryParams" :showSearch="true" v-if="checkPermi(['user:contract:lift:reasonForDelayedOverdueShipment'])"
+                prop="reasonForDelayedOverdueShipment" />
+        <!--项目取消暂停原因27-->
+        <Column label="未排产原因" :searchParams="queryParams" :showSearch="true" v-if="checkPermi(['user:contract:lift:reasonForNonScheduling'])"
+                prop="reasonForNonScheduling" />
+        <!--项目名称28-->
+        <Column :label="$t('lift.projectName')" :searchParams="queryParams" :showSearch="true" prop="projectName"  v-if="checkPermi(['user:contract:lift:projectName'])"/>
+
+        <!--销售模式29-->
+        <Column :label="$t('contract.salesModel')" :searchDict="dict.type.contract_sales_model" :showSearch="true" prop="salesModel" v-if="checkPermi(['user:contract:lift:salesModel'])"
+                selectProp="origins" searchType="select" selectMore :searchParams="queryParams"/>
+
+        <!--梯型30-->
+        <Column :label="$t('lift.elevatorModel')" :searchParams="queryParams" :showSearch="true" prop="elevatorModel"  v-if="checkPermi(['user:contract:lift:elevatorModel'])" sortable="custom"/>
+
+        <!--金额31-->
+        <Column :label="$t('lift.amountOfMoney')" :searchParams="queryParams"  prop="amountOfMoney"  align="right" v-if="checkPermi(['user:contract:lift:amountOfMoney'])">
+          <template #default="{ row }">
+            <span>{{ toDecimal2(numFormat(row.amountOfMoney)) }}</span>
+          </template>
+        </Column>
+
+        <!--评审运费32-->
+        <Column :label="$t('lift.reviewShippingCosts')" :searchParams="queryParams" prop="reviewShippingCosts" align="right" v-if="checkPermi(['user:contract:lift:reviewShippingCosts'])">
           <template #default="{ row }">
             <span>{{ toDecimal2(numFormat(row.reviewShippingCosts)) }}</span>
           </template>
         </Column>
-        <!--评审佣金-->
-        <Column :label="$t('lift.reviewCommission')" :searchParams="queryParams"  prop="reviewCommission" align="right" v-if="checkPermi(['user:contract:lift:reviewCommission'])"
-                >
+        <!--评审佣金33-->
+        <Column :label="$t('lift.reviewCommission')" :searchParams="queryParams"  prop="reviewCommission" align="right" v-if="checkPermi(['user:contract:lift:reviewCommission'])">
           <template #default="{ row }">
             <span>{{ toDecimal2(numFormat(row.reviewCommission)) }}</span>
           </template>
         </Column>
-        <!--佣金付款日期-->
+        <!--佣金付款日期34-->
         <Column :label="$t('lift.commissionPaymentDate')" :searchParams="queryParams" :showSearch="true" prop="commissionPaymentDate" v-if="checkPermi(['user:contract:lift:commissionPaymentDate'])"
                 search-type="dateRange" sortable="custom"
                 width="250"/>
-        <!--收款日期-->
+        <!--收款日期35-->
         <Column :label="$t('lift.paymentDate')" :searchParams="queryParams" :showSearch="true" prop="paymentDate" v-if="checkPermi(['user:contract:lift:paymentDate'])" search-type="dateRange"  width="250" sortable="custom"/>
-        <!--收款银行-->
+        <!--收款银行36-->
         <Column :label="$t('lift.receivingBank')" :searchParams="queryParams" :showSearch="true" prop="receivingBank"  v-if="checkPermi(['user:contract:lift:receivingBank'])"/>
-        <!--已收金额-->
+        <!--已收金额37-->
         <Column :label="$t('lift.receivedAmount')" :searchParams="queryParams"  prop="receivedAmount"  align="right" v-if="checkPermi(['user:contract:lift:receivedAmount'])">
           <template #default="{ row }">
             <span>{{ toDecimal2(numFormat(row.receivedAmount)) }}</span>
           </template>
         </Column>
-        <!--收款比例-->
+        <!--收款比例38-->
         <Column :label="$t('contract.paymentRatio')" :searchParams="queryParams" :showSearch="true" prop="paymentRatio"  align="right" v-if="checkPermi(['user:contract:lift:paymentRatio'])"/>
-        <!--应收余额-->
+        <!--应收余额39-->
         <Column :label="$t('lift.accountsReceivableBalance')" :searchParams="queryParams" prop="accountsReceivableBalance" v-if="checkPermi(['user:contract:lift:accountsReceivableBalance'])">
           <template #default="{ row }">
             <span>{{ toDecimal2(numFormat(row.accountsReceivableBalance)) }}</span>
           </template>
         </Column>
-        <!--计划调整日期-->
-        <Column :label="$t('lift.planAdjustmentDate')" :searchParams="queryParams" :showSearch="true" prop="planAdjustmentDate" v-if="checkPermi(['user:contract:lift:planAdjustmentDate'])"
-                search-type="dateRange"  width="250"/>
-        <!--实际内陆运费-->
-        <Column :label="$t('lift.actualInlandFreightCost')" :searchParams="queryParams"  prop="actualInlandFreightCost" align="right" v-if="checkPermi(['user:contract:lift:actualInlandFreightCost'])"
-                >
-          <template #default="{ row }">
-            <span>{{ toDecimal2(numFormat(row.actualInlandFreightCost)) }}</span>
-          </template>
-        </Column>
-        <!--实际海运费-->
-        <Column :label="$t('lift.actualOceanFreight')" :searchParams="queryParams"  prop="actualOceanFreight" align="right" v-if="checkPermi(['user:contract:lift:actualOceanFreight'])"
-                >
-          <template #default="{ row }">
-            <span>{{ toDecimal2(numFormat(row.actualOceanFreight)) }}</span>
-          </template>
-        </Column>
-        <!--开票日期-->
-        <Column :label="$t('lift.invoiceDate')" :searchParams="queryParams" :showSearch="true" prop="invoiceDate" v-if="checkPermi(['user:contract:lift:invoiceDate'])"
-                search-type="dateRange" sortable="custom" width="250"/>
-        <!--报关月份-->
-        <Column :label="$t('lift.customsDeclarationMonth')" :searchParams="queryParams" :showSearch="true" prop="customsDeclarationMonth" v-if="checkPermi(['user:contract:lift:customsDeclarationMonth'])"
-                sortable="custom" />
-        <!--后续收取运费-->
-        <Column :label="$t('lift.subsequentCollectionOfShippingFees')" :searchParams="queryParams"  align="right" v-if="checkPermi(['user:contract:lift:subsequentCollectionOfShippingFees'])"
-                prop="subsequentCollectionOfShippingFees" >
+        <!--计划调整日期40-->
+        <Column :label="$t('lift.planAdjustmentDate')" :searchParams="queryParams" :showSearch="true" prop="planAdjustmentDate" v-if="checkPermi(['user:contract:lift:planAdjustmentDate'])" search-type="dateRange"  width="250"/>
+
+        <!--开票日期43-->
+        <Column :label="$t('lift.invoiceDate')" :searchParams="queryParams" :showSearch="true" prop="invoiceDate" v-if="checkPermi(['user:contract:lift:invoiceDate'])" search-type="dateRange" sortable="custom" width="250"/>
+        <!--报关月份44-->
+        <Column :label="$t('lift.customsDeclarationMonth')" :searchParams="queryParams" :showSearch="true" prop="customsDeclarationMonth" v-if="checkPermi(['user:contract:lift:customsDeclarationMonth'])" sortable="custom" />
+
+        <!--备注45-->
+        <Column :label="$t('common.remark')" :searchParams="queryParams" :showSearch="true" prop="remark"  v-if="checkPermi(['user:contract:lift:remark'])"/>
+        <!--后续收取运费46-->
+        <Column :label="$t('lift.subsequentCollectionOfShippingFees')" :searchParams="queryParams"  align="right" v-if="checkPermi(['user:contract:lift:subsequentCollectionOfShippingFees'])" prop="subsequentCollectionOfShippingFees" >
           <template #default="{ row }">
             <span>{{ toDecimal2(numFormat(row.subsequentCollectionOfShippingFees)) }}</span>
           </template>
         </Column>
-        <!--收取日期-->
+        <!--收取日期47-->
         <Column :label="$t('lift.collectionDate')" :searchParams="queryParams" :showSearch="true" prop="collectionDate" v-if="checkPermi(['user:contract:lift:collectionDate'])" search-type="dateRange"  width="250"/>
-
+        <!--合同更改日期48-->
+        <Column :label="$t('lift.contractAmendmentDate')" :searchParams="queryParams" :showSearch="true" prop="contractAmendmentDate" v-if="checkPermi(['user:contract:lift:contractAmendmentDate'])"
+                search-type="dateRange" width="250"/>
         <!--预计内陆运费-->
-        <Column :label="$t('lift.planInlandFreightCost')" :searchParams="queryParams" align="right" v-if="checkPermi(['user:contract:lift:planInlandFreightCost'])"
-                prop="planInlandFreightCost" >
+        <Column :label="$t('lift.planInlandFreightCost')" :searchParams="queryParams" align="right" v-if="checkPermi(['user:contract:lift:planInlandFreightCost'])" prop="planInlandFreightCost" >
           <template #default="{ row }">
             <span>{{ toDecimal2(numFormat(row.planInlandFreightCost)) }}</span>
           </template>
@@ -202,14 +191,12 @@
           </template>
         </Column>
 
-        <!--项目状态-->
-        <Column :label="$t('lift.projectStatus')" :searchParams="queryParams" :showSearch="true" prop="projectStatus" searchType="select" v-if="checkPermi(['user:contract:lift:projectStatus'])"
-                :searchDict="dict.type.contract_project_status"/>
-        <!--排产月美元汇率-->
+
+        <!--排产月汇率-->
         <Column :label="$t('lift.mUsdRate4ProductionScheduling')" :searchParams="queryParams" prop="rate4ProductionScheduling"  v-if="checkPermi(['user:contract:lift:mEuroRate4ProductionScheduling'])"/>
-        <!--发货月美元汇率-->
+        <!--发货月汇率-->
         <Column :label="$t('lift.mUsdRate4Shipment')" :searchParams="queryParams"  prop="rate4Shipment"  v-if="checkPermi(['user:contract:lift:mUsdRate4Shipment'])"/>
-        <!--签单月美元汇率-->
+        <!--签单月汇率-->
         <Column :label="$t('lift.mUsdRate4SigningContracts')" :searchParams="queryParams"  prop="rate4SigningContracts"  v-if="checkPermi(['user:contract:lift:mUsdRate4SigningContracts'])"/>
         <!--电梯号-->
         <Column :label="$t('lift.elevatorCode')" :searchParams="queryParams" :showSearch="true" prop="elevatorCode"  v-if="checkPermi(['user:contract:lift:elevatorCode'])"/>
@@ -221,12 +208,7 @@
                 :searchDict="dict.type.elevator_type"/>
         <!--报价编号-版本-->
         <Column :label="$t('lift.quotationNoVersion')" :searchParams="queryParams" :showSearch="true" prop="quotationNoVersion"  v-if="checkPermi(['user:contract:lift:quotationNoVersion'])"/>
-        <!--项目名称-->
-        <Column :label="$t('lift.projectName')" :searchParams="queryParams" :showSearch="true" prop="projectName"  v-if="checkPermi(['user:contract:lift:projectName'])"/>
-<!--        <template #default="{ row }">-->
-<!--          <span v-if="row.origin == 0">{{ getNickName(row.quoter) }}</span>-->
-<!--          <span v-if="row.origin == 1">{{ row.quoter }}</span>-->
-<!--        </template>-->
+
 
         <!--报价者-->
         <Column :label="$t('lift.quoter')" :searchParams="queryParams" :showSearch="true" prop="quoter"  v-if="checkPermi(['user:contract:lift:quoter'])">
@@ -246,8 +228,42 @@
             <span>{{ toDecimal2(numFormat(row.otherCost)) }}</span>
           </template>
         </Column>
-        <!--备注-->
-        <Column :label="$t('common.remark')" :searchParams="queryParams" :showSearch="true" prop="remark"  v-if="checkPermi(['user:contract:lift:remark'])"/>
+
+
+        <!--合同号-版本号-->
+        <Column :label="$t('lift.contractNoVersionNo')"  :searchParams="queryParams" :showSearch="true" prop="contractNoVersionNo" v-if="checkPermi(['user:contract:lift:contractNoVersionNo'])" />
+
+
+        <!--希望排产日期-->
+        <Column :label="$t('lift.hopeToScheduleProductionDate')" :searchParams="queryParams" :showSearch="true" prop="hopeToScheduleProductionDate" v-if="checkPermi(['user:contract:lift:hopeToScheduleProductionDate'])"
+                sortable="custom" search-type="dateRange" width="250"/>
+        <!--实际排产日期-->
+        <Column :label="$t('lift.actualProductionScheduleDate')" :searchParams="queryParams" :showSearch="true" prop="actualProductionScheduleDate" v-if="checkPermi(['user:contract:lift:actualProductionScheduleDate'])"
+                sortable="custom" search-type="dateRange" width="250"/>
+
+        <!--希望发货日-->
+        <Column :label="$t('lift.hopeForDeliveryDate')" :searchParams="queryParams" :showSearch="true" prop="hopeForDeliveryDate" v-if="checkPermi(['user:contract:lift:hopeForDeliveryDate'])"
+                search-type="dateRange" width="250" sortable="custom"/>
+
+        <!--港口-->
+        <Column :label="$t('lift.port')" :searchParams="queryParams" :showSearch="true" prop="port"  v-if="checkPermi(['user:contract:lift:port'])"/>
+        <!--生产订单状态-->
+        <Column :label="$t('lift.productionOrderStatus')" :searchParams="queryParams" :showSearch="true" prop="productionOrderStatus" searchType="select" v-if="checkPermi(['user:contract:lift:productionOrderStatus'])"
+                selectMore   :searchDict="dict.type.production_order_status"/>
+
+        <!--实际内陆运费-->
+        <Column :label="$t('lift.actualInlandFreightCost')" :searchParams="queryParams"  prop="actualInlandFreightCost" align="right" v-if="checkPermi(['user:contract:lift:actualInlandFreightCost'])">
+          <template #default="{ row }">
+            <span>{{ toDecimal2(numFormat(row.actualInlandFreightCost)) }}</span>
+          </template>
+        </Column>
+        <!--实际海运费-->
+        <Column :label="$t('lift.actualOceanFreight')" :searchParams="queryParams"  prop="actualOceanFreight" align="right" v-if="checkPermi(['user:contract:lift:actualOceanFreight'])">
+          <template #default="{ row }">
+            <span>{{ toDecimal2(numFormat(row.actualOceanFreight)) }}</span>
+          </template>
+        </Column>
+
 
         <Column :label="$t('common.operate')" :min-width="180" :searchParams="queryParams" :showSearch="true" fixed="right" searchType="operate"></Column>
       </template>
@@ -259,120 +275,120 @@
       <div class="ml20">
         <el-table :data="contractLiftEditList"  v-loading="contractLiftEditLoading" border>
           <Column label="NO" type="index" width="50" ></Column>
-          <!--生产令号-->
+          <!--生产令号3-->
           <Column  :label="$t('lift.productionOrderNo')"  prop="productionOrderNo" v-if="checkPermi(['user:contract:lift:productionOrderNoEdit'])" width="200px"/>
-          <!--合同号-->
+          <!--合同号2-->
           <Column  :label="$t('contract.contractNo')"  prop="contractNo" v-if="checkPermi(['user:contract:lift:contractNoEdit'])"  width="200px"/>
           <!--合同号-版本号-->
           <Column  :label="$t('lift.contractNoVersionNo')" prop="contractNoVersionNo" v-if="checkPermi(['user:contract:lift:contractNoVersionNoEdit'])"  width="200px"/>
-          <!-- 合同名 -->
+          <!-- 合同名4 -->
           <Column  :label="$t('lift.contractName')" prop="contractName" v-if="checkPermi(['user:contract:lift:contractNameEdit'])"  width="200px"/>
-          <!-- 签单日期 -->
+          <!-- 签单日期1 -->
           <Column  :label="$t('contract.signingDate')" prop="signingDate" v-if="checkPermi(['user:contract:lift:signingDateEdit'])" width="250"></Column>
-          <!--区域 -->
+          <!--区域5 -->
           <Column  :label="$t('user.area')" prop="areaId" searchType="select" :searchDict="areaList"  :min-width="200"  v-if="checkPermi(['user:contract:lift:areaIdEdit'])" />
-          <!--国家-->
+          <!--国家6-->
           <Column  :label="$t('project.countryId')" prop="countryId" searchType="select"  :searchDict="countryList" :min-width="200" :selectMore="true" v-if="checkPermi(['user:contract:lift:countryIdEdit'])"/>
-          <!--城市-->
+          <!--城市16-->
           <Column  :label="$t('project.city')"  prop="city"  v-if="checkPermi(['user:contract:lift:cityEdit'])"/>
-          <!--业务员-->
+          <!--业务员7-->
           <Column  :label="$t('contract.salesman')"  prop="salesmanName" width="250" v-if="checkPermi(['user:contract:lift:salesmanEdit'])">
             <template #default="{ row }">
               <span>{{ row.salesmanName }}</span>
             </template>
           </Column >
-          <!--代理商-->
+          <!--代理商17-->
           <Column  :label="$t('agent.agent')" prop="agentId" searchType="select"  :searchDict="agentList" :min-width="200" v-if="checkPermi(['user:contract:lift:agentIdEdit'])"/>
-          <!--终端客户  v-hasRole="['system_manager', 'sales_director']" -->
+          <!--终端客户18  v-hasRole="['system_manager', 'sales_director']" -->
           <Column  :label="$t('contract.endCustomers')" prop="endCustomersName"  v-if="checkPermi(['user:contract:lift:endCustomersEdit'])"/>
-          <!--贸易条款-->
+          <!--贸易条款9-->
           <Column  :label="$t('contract.tradeTerms')" :searchDict="dict.type.contract_trade_terms" searchType="select"   prop="tradeTerms"  v-if="checkPermi(['user:contract:lift:tradeTermsEdit'])"/>
-          <!--销售模式-->
+          <!--销售模式29-->
           <Column  :label="$t('contract.salesModel')" :searchDict="dict.type.contract_sales_model" searchType="select"   prop="salesModel" v-if="checkPermi(['user:contract:lift:salesModelEdit'])" />
-          <!--付款方式-->
+          <!--付款方式15-->
           <Column  :label="$t('contract.paymentMethod')"  prop="paymentMethod" searchType="select" :searchDict="dict.type.contract_payment_method" v-if="checkPermi(['user:contract:lift:paymentMethodEdit'])" />
-          <!--收款比例-->
+          <!--收款比例38-->
           <Column  :label="$t('contract.paymentRatio')"  prop="paymentRatio" searchType="select" :searchDict="dict.type.contract_payment_ratio"  v-if="checkPermi(['user:contract:lift:paymentRatioEdit'])"/>
-          <!--合同更改日期-->
+          <!--合同更改日期48-->
           <Column  :label="$t('lift.contractAmendmentDate')"  prop="contractAmendmentDate" v-if="checkPermi(['user:contract:lift:contractAmendmentDateEdit'])" width="250"></Column>
-          <!--产品类别-->
+          <!--产品类别8-->
           <Column  :label="$t('lift.productCategory')"  prop="productCategory" :searchDict="dict.type.product_category" searchType="select" v-if="checkPermi(['user:contract:lift:productCategoryEdit'])" />
 
-          <!--梯型-->
+          <!--梯型30-->
           <InputColumn  :label="$t('lift.elevatorModel')"  prop="elevatorModel" v-if="checkPermi(['user:contract:lift:elevatorModelEdit'])"/>
-          <!--规格-->
+          <!--规格11-->
           <InputColumn  :label="$t('lift.specification')"  prop="specification" v-if="checkPermi(['user:contract:lift:specificationEdit'])" width="200px"  :show-overflow-tooltip="true"/>
-          <!--数量-->
+          <!--数量12-->
           <Column  :label="$t('lift.count')"  prop="count" v-if="checkPermi(['user:contract:lift:countEdit'])"/>
-          <!--币种-->
+          <!--币种10-->
           <Column  :label="$t('contract.currencyId')"  prop="currencyId" searchType="select" :searchDict="dict.type.currency_type" v-if="checkPermi(['user:contract:lift:currencyIdEdit'])"/>
 <!--          <InputDictColumn  :label="$t('contract.currencyId')"  prop="currencyId" :searchDict="dict.type.currency_type" v-if="checkPermi(['user:contract:lift:currencyIdEdit'])"/>-->
-          <!--单价-->
+          <!--单价13-->
           <Column  :label="$t('lift.unitPrice')"  prop="unitPrice"   align="right" v-if="checkPermi(['user:contract:lift:unitPriceEdit'])">
             <template v-slot="scope">
               <MoneyInput :inputValue="scope.row.unitPrice" :zeroLength="2" @change="item=>valueChanged(item,scope.row,'unitPrice')" ></MoneyInput>
             </template>
           </Column >
-          <!--金额-->
+          <!--金额31-->
           <Column  :label="$t('lift.amountOfMoney')"  prop="amountOfMoney"  align="right" v-if="checkPermi(['user:contract:lift:amountOfMoneyEdit'])">
             <template v-slot="scope">
               <MoneyInput :inputValue="scope.row.amountOfMoney" :zeroLength="2" @change="item=>valueChanged(item,scope.row,'amountOfMoney')" ></MoneyInput>
             </template>
           </Column >
-          <!--报价折扣-->
+          <!--报价折扣14-->
           <InputNumberColumn  :label="$t('lift.quotationDiscount')"  prop="quotationDiscount" :step="0.0001"  :precision="4"  :min="0" :max="100" v-if="checkPermi(['user:contract:lift:quotationDiscountEdit'])"/>
-          <!--预计排产日期-->
+          <!--预计排产日期19-->
           <DatePickSelectColumn  :label="$t('lift.expectedProductionScheduleDate')"  v-if="checkPermi(['user:contract:lift:expectedProductionScheduleDateEdit'])" prop="expectedProductionScheduleDate"  width="250"></DatePickSelectColumn>
           <!--希望排产日期-->
           <DatePickSelectColumn  :label="$t('lift.hopeToScheduleProductionDate')"  prop="hopeToScheduleProductionDate" v-if="checkPermi(['user:contract:lift:hopeToScheduleProductionDateEdit'])" width="250"></DatePickSelectColumn>
           <!--实际排产日期-->
           <DatePickSelectColumn  :label="$t('lift.actualProductionScheduleDate')"  prop="actualProductionScheduleDate" v-if="checkPermi(['user:contract:lift:actualProductionScheduleDateEdit'])" width="250"></DatePickSelectColumn>
-          <!--排产日期-->
+          <!--排产日期21-->
           <DatePickSelectColumn  :label="$t('lift.productionScheduleDate')"  prop="productionScheduleDate" v-if="checkPermi(['user:contract:lift:productionScheduleDateEdit'])" width="250"></DatePickSelectColumn>
-          <!--项目取消暂停原因-->
+          <!--项目取消暂停原因25-->
           <InputColumn  :label="$t('lift.reasonForProjectCancellationAndSuspension')"  v-if="checkPermi(['user:contract:lift:reasonForProjectCancellationAndSuspensionEdit'])" prop="reasonForProjectCancellationAndSuspension"   />
           <!--希望发货日-->
           <DatePickSelectColumn  :label="$t('lift.hopeForDeliveryDate')"  prop="hopeForDeliveryDate" v-if="checkPermi(['user:contract:lift:hopeForDeliveryDateEdit'])"width="250"></DatePickSelectColumn>
-          <!--实际发货日-->
+          <!--实际发货日23-->
           <DatePickSelectColumn  :label="$t('lift.actualDeliveryDate')"  prop="actualDeliveryDate" v-if="checkPermi(['user:contract:lift:actualDeliveryDateEdit'])" width="250"></DatePickSelectColumn>
           <!--港口-->
           <InputColumn  :label="$t('lift.port')"  prop="port"  v-if="checkPermi(['user:contract:lift:portEdit'])"/>
           <!--生产订单状态-->
           <DictSelectColumn  :label="$t('lift.productionOrderStatus')"  prop="productionOrderStatus" searchType="select" :searchDict="dict.type.production_order_status" v-if="checkPermi(['user:contract:lift:productionOrderStatusEdit'])"/>
-          <!--评审折扣-->
+          <!--评审折扣20-->
           <InputNumberColumn  :label="$t('lift.reviewDiscount')"  prop="reviewDiscount" v-if="checkPermi(['user:contract:lift:reviewDiscountEdit'])" :step="0.0001"  :precision="4"  :min="0" :max="100"/>
-          <!--评审运费-->
+          <!--评审运费32-->
           <Column  :label="$t('lift.reviewShippingCosts')"  prop="reviewShippingCosts" align="right" v-if="checkPermi(['user:contract:lift:reviewShippingCostsEdit'])">
             <template v-slot="scope">
               <MoneyInput :inputValue="scope.row.reviewShippingCosts" :zeroLength="2" @change="item=>valueChanged(item,scope.row,'reviewShippingCosts')" ></MoneyInput>
             </template>
           </Column >
-          <!--评审佣金-->
+          <!--评审佣金33-->
           <Column :label="$t('lift.reviewCommission')"  prop="reviewCommission" align="right" v-if="checkPermi(['user:contract:lift:reviewCommissionEdit'])">
             <template v-slot="scope">
               <MoneyInput :inputValue="scope.row.reviewCommission" :zeroLength="2" @change="item=>valueChanged(item,scope.row,'reviewCommission')" ></MoneyInput>
             </template>
           </Column >
 
-          <!--佣金付款日期-->
+          <!--佣金付款日期34-->
           <DatePickSelectColumn  :label="$t('lift.commissionPaymentDate')"  prop="commissionPaymentDate" v-if="checkPermi(['user:contract:lift:commissionPaymentDateEdit'])" width="250"></DatePickSelectColumn>
-          <!--收款日期-->
+          <!--收款日期35-->
           <DatePickSelectColumn  :label="$t('lift.paymentDate')"  prop="paymentDate" v-if="checkPermi(['user:contract:lift:paymentDateEdit'])"  width="250"></DatePickSelectColumn>
-          <!--收款银行-->
+          <!--收款银行36-->
           <InputColumn :label="$t('lift.receivingBank')"  prop="receivingBank"  v-if="checkPermi(['user:contract:lift:receivingBankEdit'])"></InputColumn>
-          <!--已收金额-->
+          <!--已收金额37-->
           <Column  :label="$t('lift.receivedAmount')"  prop="receivedAmount"  align="right" v-if="checkPermi(['user:contract:lift:receivedAmountEdit'])">
             <template v-slot="scope">
               <MoneyInput :inputValue="scope.row.receivedAmount" :zeroLength="2" @change="item=>valueChanged(item,scope.row,'receivedAmount')" ></MoneyInput>
             </template>
           </Column >
-          <!--应收余额-->
+          <!--应收余额39-->
           <Column  :label="$t('lift.accountsReceivableBalance')"  prop="accountsReceivableBalance" v-if="checkPermi(['user:contract:lift:accountsReceivableBalanceEdit'])">
             <template v-slot="scope">
               <MoneyInput :inputValue="scope.row.accountsReceivableBalance" :zeroLength="2" @change="item=>valueChanged(item,scope.row,'accountsReceivableBalance')" ></MoneyInput>
             </template>
           </Column >
-          <!--计划调整日期-->
+          <!--计划调整日期40-->
           <DatePickSelectColumn  :label="$t('lift.planAdjustmentDate')"  prop="planAdjustmentDate" v-if="checkPermi(['user:contract:lift:planAdjustmentDateEdit'])" width="250" sortable="custom"></DatePickSelectColumn>
           <!--实际内陆运费-->
           <Column  :label="$t('lift.actualInlandFreightCost')"  prop="actualInlandFreightCost" align="right" v-if="checkPermi(['user:contract:lift:actualInlandFreightCostEdit'])">
@@ -386,19 +402,19 @@
               <MoneyInput :inputValue="scope.row.actualOceanFreight" :zeroLength="2" @change="item=>valueChanged(item,scope.row,'actualOceanFreight')" ></MoneyInput>
             </template>
           </Column >
-          <!--开票日期-->
+          <!--开票日期43-->
           <DatePickSelectColumn  :label="$t('lift.invoiceDate')"  prop="invoiceDate" v-if="checkPermi(['user:contract:lift:invoiceDateEdit'])" width="250"></DatePickSelectColumn>
-          <!--报关月份-->
+          <!--报关月份44-->
           <DictSelectColumn  :label="$t('lift.customsDeclarationMonth')"  prop="customsDeclarationMonth" :search-dict="months" v-if="checkPermi(['user:contract:lift:customsDeclarationMonthEdit'])"></DictSelectColumn>
-          <!--后续收取运费-->
+          <!--后续收取运费46-->
           <Column  :label="$t('lift.subsequentCollectionOfShippingFees')"  align="right" v-if="checkPermi(['user:contract:lift:subsequentCollectionOfShippingFeesEdit'])" prop="subsequentCollectionOfShippingFees"   >
             <template v-slot="scope">
               <MoneyInput :inputValue="scope.row.subsequentCollectionOfShippingFees" :zeroLength="2" @change="item=>valueChanged(item,scope.row,'subsequentCollectionOfShippingFees')" ></MoneyInput>
             </template>
           </Column >
-          <!--收取日期-->
+          <!--收取日期47-->
           <DatePickSelectColumn  :label="$t('lift.collectionDate')"  prop="collectionDate" v-if="checkPermi(['user:contract:lift:collectionDateEdit'])" width="250"></DatePickSelectColumn>
-          <!--备注-->
+          <!--备注45-->
           <Column  :label="$t('common.remark')" prop="remark"  v-if="checkPermi(['user:contract:lift:remarkEdit'])">
             <template slot-scope="scope">
               <el-tooltip effect="dark" :content="scope.row.remark" placement="top">