Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java

@@ -125,5 +125,12 @@ public class BaseVehicleOutApplyVoNew implements Vo {
     private String distributorPriceAll;
     @ApiModelProperty("开票类型")
     private String kpType;
+
+    @ApiModelProperty("业务sid")
+    private String busSid;
+    @ApiModelProperty("出库类型")
+    private String ckType;
+    @ApiModelProperty("欠款时长（天）")
+    private String qkDate;
 }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@@ -32,6 +32,11 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
 import com.yxt.anrui.base.api.basevehicleoutapply.*;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsFeign;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailQuery;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailVo;
+import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
@@ -79,6 +84,12 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
     private LoanSolutionsFeign loanSolutionsFeign;
     @Autowired
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
+    @Autowired
+    private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
+    @Autowired
+    private BusArrearsCarryVehicleDetailsFeign busArrearsCarryVehicleDetailsFeign;
+    @Autowired
+    private BusDeliveredApplyFeign busDeliveredApplyFeign;
 
     private QueryWrapper<BaseVehicleOutApply> createQueryWrapper(BaseVehicleOutApplyQueryNew params) {
         QueryWrapper<BaseVehicleOutApply> qw = new QueryWrapper<>();
@@ -187,6 +198,15 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
             if (finVehicleInvoice != null) {
                 record.setKpType(finVehicleInvoice.getBusinessState());
             }
+            //出库类型
+            Integer i = busArrearsCarryVehicleDetailsFeign.selByVinSidAndYBJ(vinSid).getData();
+            if (i > 0){
+                record.setCkType("欠款出库");
+                //欠款时长（天）
+                String saleDate = record.getSaleDate();
+            }else {
+                record.setCkType("正常出库");
+            }
         }
         PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);
         //p.setTotal(countTotal);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeign.java

@@ -62,4 +62,8 @@ public interface BusArrearsCarryVehicleDetailsFeign {
           @ApiOperation("获取一条记录")
     @GetMapping("/fetchSid/{sid}")
     public ResultBean<BusArrearsCarryVehicleDetailsVo> fetchSid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据车辆sid和已办结流程状态查询是否为欠款提车")
+    @GetMapping("/selByVinSidAndYBJ/{vinSid}")
+    ResultBean<Integer> selByVinSidAndYBJ(String vinSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsFeignFallback.java

@@ -66,4 +66,9 @@ public class BusArrearsCarryVehicleDetailsFeignFallback implements BusArrearsCar
 	public ResultBean<BusArrearsCarryVehicleDetailsVo> fetchSid(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<Integer> selByVinSidAndYBJ(String vinSid) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -184,4 +184,17 @@ public class AppBusSalesOrderVo implements Vo {
     private String factoryDiscount;
     @ApiModelProperty("中介返利")
     private String distributorPriceAll;
+
+    @ApiModelProperty("单台指导价")
+    private String guildPrice;
+    @ApiModelProperty("单台成交价")
+    private String finalPrice;
+    @ApiModelProperty("中介人1")
+    private String distributorName;
+    @ApiModelProperty("单车中介服务费")
+    private String distributorPrice;
+    @ApiModelProperty("中介人2")
+    private String distributorNameTwo;
+    @ApiModelProperty("单车中介服务费2")
+    private String distributorPriceTwo;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.java

@@ -70,4 +70,6 @@ public interface BusArrearsCarryVehicleDetailsMapper extends BaseMapper<BusArrea
     List<String> selectByApplySidOne(String sid);
 
     List<AdCarListVo> selectByApplySidVehicle(String sid);
+
+    int selByVinSidAndYBJ(String vinSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsMapper.xml

@@ -35,11 +35,24 @@
     </select>
 
     <select id="selectByApplySidOne" resultType="java.lang.String">
-        select RIGHT(vinNo,8) from bus_arrears_carry_vehicle_details where applySid = #{sid}
+        select RIGHT (vinNo, 8)
+        from bus_arrears_carry_vehicle_details
+        where applySid = #{sid}
     </select>
 
     <select id="selectByApplySidVehicle"
             resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo">
-        select vinSid as carSid,vinNo as vin from bus_arrears_carry_vehicle_details where applySid = #{sid}
+        select vinSid as carSid, vinNo as vin
+        from bus_arrears_carry_vehicle_details
+        where applySid = #{sid}
+    </select>
+
+    <select id="selByVinSidAndYBJ" resultType="int">
+        SELECT COUNT(bacvd.*)
+        FROM bus_arrears_carry_vehicle_details bacvd
+                     LEFT JOIN bus_arrears_carry_vehicle_apply bacva
+                ON bacvd.`applySid` = bacva.`sid`
+        WHERE bacvd.`vinSid` = #{vinSid}
+          AND bacva.`nodeState` = "已办结"
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsRest.java

@@ -91,5 +91,10 @@ public class BusArrearsCarryVehicleDetailsRest implements BusArrearsCarryVehicle
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<Integer> selByVinSidAndYBJ(String vinSid) {
+        return busArrearsCarryVehicleDetailsService.selByVinSidAndYBJ(vinSid);
+    }
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java

@@ -8,6 +8,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -140,4 +141,10 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService<Bus
     public List<AdCarListVo> selectByApplySidVehicle(String sid) {
         return baseMapper.selectByApplySidVehicle(sid);
     }
+
+    public ResultBean<Integer> selByVinSidAndYBJ(String vinSid) {
+        ResultBean rb = ResultBean.fireFail();
+        int i = baseMapper.selByVinSidAndYBJ(vinSid);
+        return rb.success().setData(i);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -76,6 +76,8 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
      */
     IPage<AppBusSalesOrderVo> getSaleOrders(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw, @Param("name") String name, @Param("typeState") String typeState);
 
+    IPage<AppBusSalesOrderVo> getSaleOrdersByOrgPath(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw, @Param("name") String name, @Param("typeState") String typeState, @Param("vinNo") String vinNo, @Param("orderingNo") String orderingNo);
+
     /**
      * 根据销售订单sid查询车型信息
      *
@@ -197,6 +199,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
 
     /**
      * 根据车辆sid查询销售订单的数据
+     *
      * @param vinSid 车辆sid
      * @return
      */

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -39,8 +39,56 @@
     </update>
     <!--app查询销售订单列表-->
     <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo">
-        SELECT DISTINCT
-        bo.sid AS saleOrderSid,
+        SELECT bo.sid as saleOrderSid,
+        bo.billNo as saleOrderId,
+        bo.customerClassKey as customerType,
+        bo.customerSid,
+        bo.customerName,
+        bo.customerPhoto as customerImage,
+        bo.mobile,
+        bo.payType as carPurchaseType,
+        bo.payTypeKey as carPurchaseKey,
+        bd.depositAll,
+        bo.nodeState as saleOrderState,
+        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate,
+        case bo.isInsurance
+        when 0 then '否'
+        when 1 then '是' end as insuranceInfo,
+        if(bo.nodeState = '已办结', true, false) as showStopBtn,
+        bo.nodeState is null as showUpdateBtn,
+        bo.nodeState is null as showDeleteBtn,
+        0 as showFinancialBtn,
+        bo.type,
+        bo.contractNo as contractId,
+        bo.staffName as saler,
+        bo.procDefId,
+        bo.procInstId
+        FROM bus_sales_order bo
+        left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+        left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and concat(IFNULL(bo.customerName
+                , '')
+                , IFNULL(bo.staffName
+                , '')
+                , ifnull(bo.billNo
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+            <if test="typeState != null and typeState != ''">
+                and LENGTH(bo.nodeState)
+                >0
+            </if>
+        </where>
+        order by bo.id desc
+    </select>
+
+    <select id="getSaleOrdersByOrgPath"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo">
+        SELECT bo.sid AS saleOrderSid,
         bo.billNo AS saleOrderId,
         bo.customerClassKey AS customerType,
         bo.customerSid,
@@ -52,18 +100,10 @@
         bd.depositAll,
         bo.nodeState AS saleOrderState,
         DATE_FORMAT(bo.createDate, '%Y-%m-%d') AS createdDate,
-        CASE
-        bo.isInsurance
-        WHEN 0
-        THEN '否'
-        WHEN 1
-        THEN '是'
-        END AS insuranceInfo,
-        IF(
-        bo.nodeState = '已办结',
-        TRUE,
-        FALSE
-        ) AS showStopBtn,
+        CASE bo.isInsurance
+        WHEN 0 THEN '否'
+        WHEN 1 THEN '是' END AS insuranceInfo,
+        IF(bo.nodeState = '已办结', TRUE, FALSE) AS showStopBtn,
         bo.nodeState IS NULL AS showUpdateBtn,
         bo.nodeState IS NULL AS showDeleteBtn,
         0 AS showFinancialBtn,
@@ -72,37 +112,36 @@
         bo.staffName AS saler,
         bo.procDefId,
         bo.procInstId,
-        bo.useOrgSid,
-        bo.useOrgName,
-        bo.purchaseSystemName,
-        bo.orgName,
-        bm.modelName,
-        bsos.distributorPriceAll,
         ls.`factoryDiscount`,
-        GROUP_CONCAT(
-        IF(bsov.linkNo = '', NULL, bsov.linkNo)
-        ) AS vinNo,
+        GROUP_CONCAT(IF(ov.`linkNo` = '', NULL, ov.`linkNo`)) AS vinNo,
         GROUP_CONCAT(
         IF(
-        bsov.orderingNo = '',
+        ov.orderingNo = '',
         NULL,
-        bsov.orderingNo
+        ov.orderingNo
         )
-        ) AS orderingNo
-        FROM
-        bus_sales_order bo
-        LEFT JOIN bus_sales_order_price bp
-        ON bp.salesOrderSid = bo.sid
-        LEFT JOIN bus_sales_order_deposit bd
-        ON bd.salesOrderSid = bo.sid
-        LEFT JOIN bus_sales_order_model bm
-        ON bm.salesOrderSid = bo.sid
-        LEFT JOIN bus_sales_order_vehicle bsov
-        ON bsov.salesOrderSid = bo.sid
-        LEFT JOIN bus_sales_order_submit bsos
-        ON bsos.salesOrderSid = bo.sid
+        ) AS orderingNo,
+        bm.guildPrice,
+        bm.finalPrice,
+        bsos.distributorName,
+        bsos.distributorPrice,
+        bsos.distributorNameTwo,
+        bsos.distributorPriceTwo,
+        bm.modelName,
+        bo.useOrgName,
+        bo.purchaseSystemName,
+        bo.orgName
+        FROM bus_sales_order bo
+        LEFT JOIN bus_sales_order_price bp ON bp.salesOrderSid = bo.sid
+        LEFT JOIN bus_sales_order_deposit bd ON bd.salesOrderSid = bo.sid
+        LEFT JOIN bus_sales_order_vehicle ov ON ov.salesOrderSid=bo.sid
         LEFT JOIN anrui_riskcenter.`loan_solutions` ls
         ON ls.`salesOrderSid` = bo.sid
+        LEFT JOIN `bus_sales_vehicle_order` bso ON bo.sid = bso.salesOrderSid
+        LEFT JOIN bus_sales_order_submit bsos
+        ON bsos.salesOrderSid = bo.sid
+        LEFT JOIN bus_sales_order_model bm
+        ON bm.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
@@ -119,6 +158,22 @@
                 and LENGTH(bo.nodeState)
                 >0
             </if>
+            GROUP BY bo.sid
+
+            <if test="vinNo != null and vinNo != '' and orderingNo != null and orderingNo != ''">
+                HAVING vinNo like concat('%',#{vinNo},'%')
+                AND orderingNo like concat('%',#{orderingNo},'%')
+            </if>
+            <if test="vinNo != null and vinNo != ''">
+                <if test="orderingNo == null or orderingNo == ''">
+                HAVING vinNo like concat('%',#{vinNo},'%')
+                </if>
+            </if>
+            <if test="vinNo == null or vinNo == ''">
+                <if test="orderingNo != null and orderingNo != ''">
+                    HAVING orderingNo like concat('%',#{orderingNo},'%')
+                </if>
+            </if>
         </where>
         order by bo.id desc
     </select>
@@ -478,6 +533,8 @@
     </select>
 
     <select id="selectByContractNos" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
-        select * from bus_sales_order where contractNo = #{contractNo}
+        select *
+        from bus_sales_order
+        where contractNo = #{contractNo}
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -5807,18 +5807,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (StringUtils.isNotBlank(pagerQuery.getFactoryDiscount())) {
             qw.like("ls.factoryDiscount", pagerQuery.getFactoryDiscount());
         }
-        //根据销售订单sid分组
-        qw.groupBy("bo.sid");
-        //车架号
-        if (StringUtils.isNotBlank(pagerQuery.getVinNo())){
-            qw.having("vinNo LIKE %",pagerQuery.getVinNo(),"%");
-        }
-        //排产订单编号
-        if (StringUtils.isNotBlank(pagerQuery.getOrderingNo())){
-            qw.having("orderingNo LIKE %",pagerQuery.getOrderingNo(),"%");
-        }
         String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
-        IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState);
+        IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrdersByOrgPath(page, qw, pq.getParams().getName(), typeState, pagerQuery.getVinNo(), pagerQuery.getOrderingNo());
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
             record.setShowStopBtn(false);
             record.setShowContractBtn(false);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -200,10 +200,13 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         entity.setNodeState("待提交");
         String applyNo = "";
+        String orgPath = dto.getOrgPath();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         if (StringUtils.isNotBlank(dto.getUseOrgSid())) {
             applyNo = getXSDDTCSQApplyCode(dto.getUseOrgSid());
         } else {
-            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getCreateBySid()).getData();
+            //SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getCreateBySid()).getData();
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
             applyNo = getXSDDTCSQApplyCode(sysOrganizationVo.getSid());
             entity.setUseOrgSid(sysOrganizationVo.getSid());
             entity.setUseOrgName(sysOrganizationVo.getName());

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@@ -178,12 +178,19 @@ export default {
       this.$refs['divadd'].showEdit(row)
     },
     handleCancellation(row) {
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         req.cancal({ sid: row.sid }).then((res) => {
           if (res.success) {
             this.$message({ showClose: true, type: 'success', message: '操作成功' })
             this.loadList()
           }
         })
+      })
     },
     handleLooK(row) {
       this.viewState = 4

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue

@@ -80,6 +80,11 @@
                 <span>{{ scope.row.purchaseSystemName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="采购类型" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.manPurOrderTypeValue }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="排产订单编号" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.orderingNo }}</span>
@@ -90,129 +95,129 @@
                 <span>{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="贴息" align="center" width="90">
+            <el-table-column label="车型(配置简述)" align="center" width="130">
               <template slot-scope="scope">
-                <span>{{ scope.row.factoryDiscount }}</span>
+                <span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.modelName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="中介返利" align="center" width="100">
+            <el-table-column label="车架号" align="center" width="90">
               <template slot-scope="scope">
-                <span>{{ scope.row.distributorPriceAll }}</span>
+                <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="开票类型" align="center" width="120">
+            <el-table-column label="销售部门" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.kpType }}</span>
+                <span>{{ scope.row.orgName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="物料名称" align="center" width="100">
+            <el-table-column label="销售专员" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.materialName }}</span>
+                <span>{{ scope.row.staffName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="物料编码" align="center" width="100">
+            <el-table-column label="客户名称" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.materialCode }}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车架号" align="center" width="90">
+            <el-table-column label="实际购车人" align="center" width="140">
               <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+                <span>{{ scope.row.realityBuyCarName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车型(配置简述)" align="center" width="130">
+            <el-table-column label="手机号码" align="center" width="120">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.modelName }}</span>
+                <span>{{ scope.row.mobile }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="内部编码" align="center" width="120">
+            <el-table-column label="成交价(元)" align="center" width="110">
               <template slot-scope="scope">
-                <span>{{ scope.row.insideCode }}</span>
+                <span>{{ scope.row.price }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售类型" align="center" width="100">
+            <el-table-column label="贴息" align="center" width="90">
               <template slot-scope="scope">
-                <span>{{ scope.row.type }}</span>
+                <span>{{ scope.row.factoryDiscount }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="采购类型" align="center" width="120">
+            <el-table-column label="销售折让" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.manPurOrderTypeValue }}</span>
+                <span>{{ scope.row.salesAllowance }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售日期" align="center" width="100">
+            <el-table-column label="赠品价值(元)" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.saleDate }}</span>
+                <span>{{ scope.row.giftsDescription }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="成交价(元)" align="center" width="110">
+            <el-table-column label="中介人1" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.price }}</span>
+                <span>{{ scope.row.middleOne }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售部门" align="center" width="100">
+            <el-table-column label="返利金额1" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.orgName }}</span>
+                <span>{{ scope.row.rebateMoneyOne }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售专员" align="center" width="100">
+            <el-table-column label="中介人2" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.staffName }}</span>
+                <span>{{ scope.row.middleTwo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="合同编号" align="center" width="100">
+            <el-table-column label="返利金额2" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.concatNo }}</span>
+                <span>{{ scope.row.rebateMoneyTwo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="实际购车人" align="center" width="140">
+            <el-table-column label="开票类型" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.realityBuyCarName }}</span>
+                <span>{{ scope.row.kpType }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="客户名称" align="center" width="100">
+            <el-table-column label="出库类型" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.customerName }}</span>
+                <span>{{ scope.row.ckType }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="手机号码" align="center" width="120">
+            <el-table-column label="欠款时长(天)" align="center" width="130">
               <template slot-scope="scope">
-                <span>{{ scope.row.mobile }}</span>
+                <span>{{ scope.row.qkDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="赠品价值(元)" align="center" width="120">
+            <el-table-column label="销售类型" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.giftsDescription }}</span>
+                <span>{{ scope.row.type }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售折让" align="center" width="120">
+            <el-table-column label="销售日期" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.salesAllowance }}</span>
+                <span>{{ scope.row.saleDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="中介人1" align="center" width="120">
+            <el-table-column label="内部引荐人" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.middleOne }}</span>
+                <span>{{ scope.row.innerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="返利金额1" align="center" width="120">
+            <el-table-column label="合同编号" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.rebateMoneyOne }}</span>
+                <span>{{ scope.row.concatNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="中介人2" align="center" width="120">
+            <el-table-column label="物料名称" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.middleTwo }}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="返利金额2" align="center" width="120">
+            <el-table-column label="物料编码" align="center" width="100">
               <template slot-scope="scope">
-                <span>{{ scope.row.rebateMoneyTwo }}</span>
+                <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="内部引荐人" align="center" width="120">
+            <el-table-column label="内部编码" align="center" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.innerName }}</span>
+                <span>{{ scope.row.insideCode }}</span>
               </template>
             </el-table-column>
           </el-table>

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@@ -229,12 +229,19 @@ export default {
       this.$refs['divinfo'].showInfo(sid, row)
     },
     toTermination(row) {
+      const tip = '请确认是否终止该记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         req.cancal({ sid: row.sid }).then((res) => {
           if (res.success) {
             this.$message({ showClose: true, type: 'success', message: '操作成功' })
             this.loadList()
           }
         })
+      })
     },
     hangleLook(row) {
       this.viewState = 5

anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

@@ -307,12 +307,19 @@ export default {
       })
     },
     handCancellation(row) {
+      const tip = '请确认是否作废该记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         req.cancel({ sid: row.sid }).then((res) => {
           if (res.success) {
             this.$message({ showClose: true, type: 'success', message: '操作成功' })
             this.getList()
           }
         })
+      })
     },
     handleGetCheck(row) {
       this.dialogImgVisible = true

anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue

@@ -255,9 +255,11 @@
                   <tr>
                     <td>可操作功能列表</td>
                     <td>
+                      <div style="height:230px;line-height:120px;overflow:auto;overflow-x:hidden;">
                         <el-tree v-loading="loading" :data="treedata" ref="funTree" show-checkbox accordion node-key="sid"
                                  :default-checked-keys="checkedId" :props="defaultProps" @check-change="checkchange">
                         </el-tree>
+                      </div>
                     </td>
                   </tr>
                 </table>
@@ -289,7 +291,7 @@
                       </el-form-item>
                     </el-col>
                   </el-row>
-                  <el-table :key="tableKey" :data="formobj.tableData" :index="index" border style="width: 100%">
+                  <el-table :key="tableKey" :data="formobj.tableData" :index="index" border style="width: 100%" max-height="300">
                     <el-table-column type="index" label="序号" :index="index + 1" width="80" align="center">
                     </el-table-column>
                     <el-table-column prop="name" label="菜单名称" header-align="center" align="left">