提交 订单相关参数

guoyujie

2025-10-15 c15a52adb73482dbafc5c8311dca8909801dd7b0

提交 订单相关参数

 north-glass-erp/northglass-erp/package-lock.json

@@ -33,8 +33,8 @@
        "vue-router": "^4.2.4",
        "vue3-grid-layout": "^1.0.0",
        "vue3-print-nb": "^0.1.4",
        "vxe-pc-ui": "~4.0.78",
        "vxe-table": "~4.7.57",
        "vxe-pc-ui": "^4.0.78",
        "vxe-table": "^4.7.57",
        "vxe-table-plugin-export-xlsx": "^4.0.6",
        "xe-utils": "^3.5.14",
        "xlsx": "^0.18.5"
@@ -11376,8 +11376,8 @@
        "vue-router": "^4.2.4",
        "vue3-grid-layout": "^1.0.0",
        "vue3-print-nb": "^0.1.4",
        "vxe-pc-ui": "~4.0.78",
        "vxe-table": "~4.7.57",
        "vxe-pc-ui": "^4.0.78",
        "vxe-table": "^4.7.57",
        "vxe-table-plugin-export-xlsx": "^4.0.6",
        "xe-utils": "^3.5.14",
        "xlsx": "^0.18.5"

 north-glass-erp/northglass-erp/package.json

@@ -33,8 +33,8 @@
    "vue-router": "^4.2.4",
    "vue3-grid-layout": "^1.0.0",
    "vue3-print-nb": "^0.1.4",
    "vxe-pc-ui": "~4.0.78",
    "vxe-table": "~4.7.57",
    "vxe-pc-ui": "^4.0.78",
    "vxe-table": "^4.7.57",
    "vxe-table-plugin-export-xlsx": "^4.0.6",
    "xe-utils": "^3.5.14",
    "xlsx": "^0.18.5"

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

@@ -385,7 +385,8 @@
              orderIdType:company.orderIdType,
              creator:userStore.user.userName,
              creatorId:userStore.user.userId,
              newOrderId:newOrderId.value
              newOrderId:newOrderId.value,
              position:company.position
            }
            const grossAreaList = $grid.getTableData().fullData.filter(
                item=>item.grossArea === 0
@@ -1587,7 +1588,7 @@
  }
  if(evnt.$event.keyCode === 13 ){
    const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
    let nextRowIndex = xGrid.value.getRowIndex(row) + 1
    let nextRowIndex = xGrid.value.getVTRowIndex(row) + 1


    switch (column.field){

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

@@ -23,7 +23,9 @@
            od.order_id,
            od.order_number,
            pd.glass_sort,
            if(pd.glass_sort=1,'(外)',if(pd2.glass_sort=pd.glass_sort,'(内)','')),
            if(pd.glass_sort=1 or pd2.glass_sort=pd.glass_sort,
                JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.position')),
                ''),
            pd.detail,
            if( od.bend_radius!='',
                round(od.width*