guoyujie
2025-07-24 a61d61f3dfe64da5f49287fae3371e2538608d9c
提交首页流程卡显示问题
9个文件已修改
57 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ar.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/en.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/kr.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ru.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/zh.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/Report.xml 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyang.vue
@@ -350,10 +350,7 @@
  text-align: center;
}
tbody *{
  font-size: 16px;
}
tbody *{
  font-size: 16px;
  font-size: 12px;
}
#footsum1,#footsum{
  font-weight: bold;font-size: 17px;
@@ -384,6 +381,7 @@
:deep(.el-textarea__inner){
  color: #333333;
  font-family: 'Microsoft YaHei', '微软雅黑', sans-serif;
  font-size: 12px;
}
:deep(.aaa){
  width: 150px;
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue
@@ -349,10 +349,7 @@
  text-align: center;
}
tbody *{
  font-size: 16px;
}
tbody *{
  font-size: 16px;
  font-size: 12px;
}
#footsum1,#footsum{
  font-size: 17px;
@@ -391,6 +388,7 @@
:deep(.el-textarea__inner){
  color: #333333;
  font-family: 'Microsoft YaHei', '微软雅黑', sans-serif;
  font-size: 12px;
}
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -80,13 +80,14 @@
  {field: 'child_width', width: 90,title:  t('order.width'),showOverflow:"ellipsis"},
  {field: 'child_height', width: 90,title:  t('order.height'),showOverflow:"ellipsis"},
  {field: 'quantity', width: 90,title: t('order.quantity')},
  {field: 'glassQuantity', width: 90,title: t('order.glassQuantity')},
  {field: 'gross_area', width: 90,title: t('order.area')},
  {field: 'shippedQuantity',width: 120, title: t('delivery.deliveryQuantity')},
  {field: 'inventory',width: 120, title: t('productStock.inventoryQuantity')},
  {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
  {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
]
let column = [0,1,3,6,7,8,9,10,11,12]
let column = [0,1,3,6,7,8,10,11,12,13]
onMounted(()=>{
@@ -108,7 +109,7 @@
      gridOptions.columns.forEach(item =>{
        item.filterMethod = filterChanged
      })
      list.value = ['quantity','inventory','inventoryArea','gross_area']
      list.value = ['quantity','inventory','inventoryArea','gross_area','shippedQuantity','glassQuantity']
      res.data.title.forEach((item,index) =>{
        list.value.push('reportWorkQuantity.'+item.process)
        let column = {slots: { default: 'quantitySum'},
@@ -123,7 +124,7 @@
      })
      await xGrid.value.loadData(res.data.data)
      //await xGrid.value.setMergeCells(res.data.mergeCells)
      await xGrid.value.setMergeCells(res.data.mergeCells)
      gridOptions.loading = false
    } else {
north-glass-erp/northglass-erp/src/lang/ar.js
@@ -288,7 +288,8 @@
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围'
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量'
    },
    searchOrder:{
north-glass-erp/northglass-erp/src/lang/en.js
@@ -289,7 +289,8 @@
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围'
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量'
    },
    searchOrder:{
north-glass-erp/northglass-erp/src/lang/kr.js
@@ -297,7 +297,8 @@
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围'
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量'
    },
    searchOrder:{
north-glass-erp/northglass-erp/src/lang/ru.js
@@ -288,7 +288,8 @@
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围'
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量'
    },
    searchOrder:{
north-glass-erp/northglass-erp/src/lang/zh.js
@@ -297,7 +297,8 @@
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围'
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量'
    },
    searchOrder:{
north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -172,25 +172,26 @@
               c.technology_number,
               b.child_width,
               b.child_height,
#               if(c.technology_number=1,c.quantity,0) as quantity,
               c.quantity,
              if(c.technology_number=1,c.quantity,0) as quantity,
#                c.quantity,
               c.quantity as thisQuantity,/*用于判断是否改变颜色*/
               e.reportWorkQuantity,
               e.reportWorkQuantityCount,
               e.reportWorkTime,
               e.broken_num,
               c.quantity as glassQuantity,
               c.quantity*a.area as gross_area,
               ifnull(f.inventory, 0) as inventory,
               round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
               ifnull(dd.quantity, 0) as shippedQuantity,
#                c.quantity*a.area as gross_area,
#                ifnull(f.inventory, 0) as inventory,
#                round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
#                ifnull(dd.quantity, 0) as shippedQuantity,
#                if(c.technology_number=1,c.quantity*a.area,0) as gross_area,
#                if(c.technology_number=1,ifnull(f.inventory, 0) ,0)                        as inventory,
#                if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.area, 2),0)      as inventoryArea,
#                if(c.technology_number=1,ifnull(dd.quantity, 0) ,0)                          as shippedQuantity,
               if(c.technology_number=1,c.quantity*a.area,0) as gross_area,
               if(c.technology_number=1,ifnull(f.inventory, 0) ,0)                        as inventory,
               if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.area, 2),0)      as inventoryArea,
               if(c.technology_number=1,ifnull(dd.quantity, 0) ,0)                          as shippedQuantity,
               ifnull(dd.quantity, 0)  as shippedQuantity,
               ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
        from pp.flow_card as c
                 left join