合同电梯增加type 以解决作废数据显示问题

RuoYi-Vue-fast-master/src/main/java/com/ruoyi/project/business/domain/TqContractLift.java

@@ -301,6 +301,8 @@ public class TqContractLift extends BaseEntity
 
     /** 数据权限字符 */
     private String permissionChar;
+
+    private String type;
 }
 
 

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

@@ -313,4 +313,6 @@ public class TqContractLift4OrderNoBo extends BaseEntity
     /** 电梯总价 */
     private BigDecimal liftAmount;
 
+    private String type;
+
 }

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

@@ -319,4 +319,7 @@ public class TqContractLiftBo extends BaseEntity
 
     private Long version;
 
+
+    private String type;
+
 }

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

@@ -368,6 +368,7 @@ public class TqContractServiceImpl implements ITqContractService
             item.setContractNoVersionNo(tqContractDto.getContractNo()+"-"+tqContractDto.getVersion());
             item.setPermissionChar(SecurityUtils.getPermissionCharIns());
             item.setRate4SigningContracts(tqContractDto.getRate4SigningContracts());
+            item.setType(tqContractDto.getType());
             //将签单币种汇率赋值
             if(scheduleListIdAndRateMap.containsKey(Long.parseLong(item.getCurrencyId()))){
                 item.setRate4ProductionScheduling(scheduleListIdAndRateMap.get(Long.parseLong(item.getCurrencyId())));

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

@@ -78,6 +78,7 @@
         <result property="additionalCost"    column="additional_cost"    />
         <result property="otherCost"    column="other_cost"    />
         <result property="liftAmount"    column="lift_amount"    />
+        <result property="type"    column="type"    />
     </resultMap>
 
     <resultMap type="com.ruoyi.project.business.domain.vo.contract.TqContractLiftVo" id="TqContractLiftVoResult" extends="TqContractLiftResult">
@@ -128,7 +129,7 @@
         <where>
             l.del_flag != '1'
             <if test="version != null  "> and SUBSTRING_INDEX(l.contract_no_version_no, '-', -1)  = #{version}</if>
-            <if test="approveStatus != null  and approveStatus != ''"> and (contract.approve_status = #{approveStatus} or CAST(SUBSTRING_INDEX(l.contract_no_version_no, '-', -1) AS UNSIGNED) &lt; contract.version)</if>
+            <if test="approveStatus != null  and approveStatus != ''"> and (contract.approve_status = #{approveStatus} or CAST(SUBSTRING_INDEX(l.contract_no_version_no, '-', -1) AS UNSIGNED) &lt; contract.version or l.type = 'toVoid')</if>
             <if test="contractNo != null  and contractNo != ''"> and l.contract_no like concat('%', #{contractNo}, '%')</if>
             <if test="contractName != null  and contractName != ''"> and l.contract_name like concat('%', #{contractName}, '%')</if>
             <if test="areaId != null and areaId.size() > 0">
@@ -480,7 +481,7 @@
         actual_ocean_freight, invoice_date, customs_declaration_month, subsequent_collection_of_shipping_fees, collection_date,
         plan_inland_freight_cost, plan_ocean_freight, project_status, rate_4_production_scheduling,
         rate_4_shipment,rate_4_signing_contracts, elevator_code,
-        origin,elevator_type,quotation_no_version,project_name,quoter,additional_cost,other_cost,lift_amount
+        origin,elevator_type,quotation_no_version,project_name,quoter,additional_cost,other_cost,lift_amount,type
         )
         values
         <foreach collection="list" item="item"  separator=",">
@@ -501,7 +502,7 @@
             #{item.rate4ProductionScheduling},#{item.rate4Shipment},
             #{item.rate4SigningContracts},#{item.elevatorCode},
             #{item.origin},#{item.elevatorType},#{item.quotationNoVersion},#{item.projectName},#{item.quoter},#{item.additionalCost},#{item.otherCost},
-            #{item.liftAmount}
+            #{item.liftAmount},#{item.type}
             )
         </foreach>
     </insert>
@@ -581,7 +582,8 @@
             quoter=#{item.quoter},
             additional_cost=#{item.additionalCost},
             other_cost=#{item.otherCost},
-            lift_amount=#{item.liftAmount}
+            lift_amount=#{item.liftAmount},
+            type = #{item.type}
             where id = #{item.id}
         </foreach>
     </insert>
@@ -662,6 +664,7 @@
             <if test="additionalCost != null">additional_cost = #{additionalCost},</if>
             <if test="otherCost != null">other_cost = #{otherCost},</if>
             <if test="liftAmount != null">lift_amount = #{liftAmount},</if>
+            <if test="type != null">type = #{type},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -28,6 +28,8 @@
         <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 -->
@@ -52,6 +54,21 @@
         <!--币种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"/>
+        <!--来源-->
+        <Column :label="$t('contract.origin')" :searchParams="queryParams" :showSearch="true" prop="origin" searchType="select" v-if="checkPermi(['user:contract:lift:origin'])"
+                :searchDict="dict.type.contract_lift_origin"/>
+        <!--设备类型-->
+        <Column :label="$t('lift.elevatorType')" :searchParams="queryParams" :showSearch="true" prop="elevatorType" searchType="select" v-if="checkPermi(['user:contract:lift:elevatorType'])"
+                :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.quoter')" :searchParams="queryParams" :showSearch="true" prop="quoter"  v-if="checkPermi(['user:contract:lift:quoter'])">
+          <template #default="{ row }">
+            {{ row.origin === '0' ? row.quoterName : row.quoter }}
+          </template>
+        </Column>
         <!--规格11-->
         <Column :label="$t('lift.specification')" :searchParams="queryParams" :showSearch="true" prop="specification"  v-if="checkPermi(['user:contract:lift:specification'])"/>
         <!--数量12-->
@@ -161,6 +178,8 @@
 
         <!--开票日期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"/>
+        <!--港口-->
+        <Column :label="$t('lift.port')" :searchParams="queryParams" :showSearch="true" prop="port"  v-if="checkPermi(['user:contract:lift:port'])"/>
         <!--报关月份44-->
         <Column :label="$t('lift.customsDeclarationMonth')" :searchParams="queryParams" :showSearch="true" prop="customsDeclarationMonth" v-if="checkPermi(['user:contract:lift:customsDeclarationMonth'])" sortable="custom" />
 
@@ -177,19 +196,6 @@
         <!--合同更改日期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" >
-          <template #default="{ row }">
-            <span>{{ toDecimal2(numFormat(row.planInlandFreightCost)) }}</span>
-          </template>
-        </Column>
-
-        <!--预计海运费-->
-        <Column :label="$t('lift.planOceanFreight')" :searchParams="queryParams"  align="right" v-if="checkPermi(['user:contract:lift:planOceanFreight'])" prop="planOceanFreight" >
-          <template #default="{ row }">
-            <span>{{ toDecimal2(numFormat(row.planOceanFreight)) }}</span>
-          </template>
-        </Column>
 
 
         <!--排产月汇率-->
@@ -198,24 +204,13 @@
         <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'])"/>
-        <!--来源-->
-        <Column :label="$t('contract.origin')" :searchParams="queryParams" :showSearch="true" prop="origin" searchType="select" v-if="checkPermi(['user:contract:lift:origin'])"
-                :searchDict="dict.type.contract_lift_origin"/>
-        <!--设备类型-->
-        <Column :label="$t('lift.elevatorType')" :searchParams="queryParams" :showSearch="true" prop="elevatorType" searchType="select" v-if="checkPermi(['user:contract:lift:elevatorType'])"
-                :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.quoter')" :searchParams="queryParams" :showSearch="true" prop="quoter"  v-if="checkPermi(['user:contract:lift:quoter'])">
-          <template #default="{ row }">
-            {{ row.origin === '0' ? row.quoterName : row.quoter }}
-          </template>
-        </Column>
+
+
+<!--        &lt;!&ndash;电梯号&ndash;&gt;-->
+<!--        <Column :label="$t('lift.elevatorCode')" :searchParams="queryParams" :showSearch="true" prop="elevatorCode"  v-if="checkPermi(['user:contract:lift:elevatorCode'])"/>-->
+
         <!--附加费用-->
         <Column :label="$t('lift.additionalCost')" :searchParams="queryParams" prop="additionalCost"  v-if="checkPermi(['user:contract:lift:additionalCost'])">
           <template #default="{ row }">
@@ -230,8 +225,6 @@
         </Column>
 
 
-        <!--合同号-版本号-->
-        <Column :label="$t('lift.contractNoVersionNo')"  :searchParams="queryParams" :showSearch="true" prop="contractNoVersionNo" v-if="checkPermi(['user:contract:lift:contractNoVersionNo'])" />
 
 
         <!--希望排产日期-->
@@ -245,24 +238,12 @@
         <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>
@@ -323,6 +304,8 @@
           <!--币种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">
@@ -388,6 +371,32 @@
               <MoneyInput :inputValue="scope.row.accountsReceivableBalance" :zeroLength="2" @change="item=>valueChanged(item,scope.row,'accountsReceivableBalance')" ></MoneyInput>
             </template>
           </Column >
+          <!--预计内陆运费-->
+          <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>
+          </Column>
+
+          <!--预计海运费-->
+          <Column :label="$t('lift.planOceanFreight')" :searchParams="queryParams"  align="right" v-if="checkPermi(['user:contract:lift:planOceanFreight'])" prop="planOceanFreight" >
+            <template #default="{ row }">
+              <span>{{ toDecimal2(numFormat(row.planOceanFreight)) }}</span>
+            </template>
+          </Column>
+
+          <!--实际内陆运费-->
+          <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>
           <!--计划调整日期40-->
           <DatePickSelectColumn  :label="$t('lift.planAdjustmentDate')"  prop="planAdjustmentDate" v-if="checkPermi(['user:contract:lift:planAdjustmentDateEdit'])" width="250" sortable="custom"></DatePickSelectColumn>
           <!--实际内陆运费-->
@@ -406,6 +415,7 @@
           <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">