Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-17 7d1dcd74604d8a1b4369cf2f966cc6b628893fc7

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/components/sd/order/OrderCraftDetail.vue

@@ -14,7 +14,7 @@
  showOverflow:true,
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  virtualScroll: true, // 开启虚拟滚动功能
  id: 'OrderList',
  id: 'OrderCraftDetail',
  printConfig: {},
  importConfig: {},
  exportConfig: {},

 north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue

@@ -16,7 +16,7 @@
  showFooter: true,//显示脚
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  virtualScroll: true, // 开启虚拟滚动功能
  id: 'OrderList',
  id: 'OrderDetail',
  printConfig: {},
  importConfig: {},
  exportConfig: {},

 north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue

@@ -16,7 +16,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'OrderList',
  id: 'OrderOtherMoney',
  showFooter: true,//显示脚
  scrollY:{ enabled: true },//开启虚拟滚动
  showOverflow:true,

 north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue

@@ -15,7 +15,7 @@
  showOverflow:true,
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  virtualScroll: true, // 开启虚拟滚动功能
  id: 'OrderList',
  id: 'OrderProcess',
  printConfig: {},
  importConfig: {},
  exportConfig: {},

 north-glass-erp/northglass-erp/src/hook/mouseMove.ts

@@ -116,7 +116,10 @@
        const activeElement = getTablexGrid().$el.querySelector(".vxe-table--main-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
        const element = xGrid.value.$el.querySelector(".vxe-table--fixed-wrapper .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
        activeElement.innerHTML =''
        element.innerHTML =''
        if(element){
            element.innerHTML =''
        }


        isSelecting.value = true//标记为正在选择操作
    }
@@ -142,13 +145,19 @@
        isSelecting.value = false//标记为停止选择操作
    }
    const result = exportData()
    if(!result){
        return
    }
    const activeElement = getTablexGrid().$el.querySelector(".vxe-table--main-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")
    const element = xGrid.value.$el.querySelector(".vxe-table--fixed-wrapper .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper .vxe-table--cell-main-area p")


    if(result.length<=2 && result[0].length===1){
        activeElement.innerHTML =''
        element.innerHTML =''
        if(element){
            element.innerHTML =''
        }

        return
    }
    let sum = 0
@@ -162,7 +171,10 @@
    sum=isNaN(sum)?0:sum
    setTimeout(()=>{
        activeElement.innerHTML ="SUM:"+parseFloat(sum.toFixed(2))
        element.innerHTML ="SUM:"+parseFloat(sum.toFixed(2))
        if(element){
            element.innerHTML ="SUM:"+parseFloat(sum.toFixed(2))
        }

    },200)

}

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue

@@ -146,7 +146,7 @@
#entirety{
  text-align: center;
  width: 50%;
  height: 150px;
  height: 140px;
  border: black 1px;
}

@@ -159,7 +159,7 @@
.row2 {
  font-size: 12pt;
  font-weight: bold;
  height: 30px;
  height: 25px;
}
span {
  font-size: 12pt;

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -1126,7 +1126,7 @@
}
onMounted(() => {
  window.addEventListener('keypress', qrcodeScanner);
 // addListener(xGrid.value, gridOptions)
  addListener(xGrid.value, gridOptions)
})

// 在组件卸载时移除键盘事件监听

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -89,7 +89,7 @@
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  //virtualScroll: true, // 开启虚拟滚动功能
  id: 'OrderList',
  id: 'CreateOrder',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -155,6 +155,7 @@
                from patch_log as a
                where a.process_id=#{processIdStr}
                and a.technology_number =  #{technologyStr}
                and a.patch_processes = #{process}
                and a.review_status = 1
                group by a.process_id,a.order_sort,a.technology_number
            ) as patch

 north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml

@@ -54,7 +54,7 @@
               od.width,
               od.height,
               o.batch,
               o.money,
               sum(od.gross_amount) as money,
               o.order_type,
               o.salesman,
               o.create_time