guoyujie
2025-08-06 e24107cb6c8db5ddb4653c9e8150e362c34d96cf
提交 订单流程卡界面
6个文件已修改
50 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ar.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/en.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/kr.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ru.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/zh.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -120,19 +120,14 @@
      xGrid.value.clearMergeCells()
      xGrid.value.clearMergeFooterItems()
      xGrid.value.updateFooter()
      //title.value[title.value.length-1]
      const users = [
        { name: 'Alice', age: 25 },
        { name: 'Bob', age: 30 },
        { name: 'Charlie', age: 20 }
      ];
      // const olderUsers = users.filter(user => user.age > 25);
      // console.log(olderUsers);
      // const lastProcess = title.value[title.value.length-1].process
      // const filter =  data.value.filter(item => item.quantity > (parseInt(item['reportWorkQuantity'][lastProcess]) ))
      const lastProcess = title.value[title.value.length-1].process
      const filter =  data.value.filter(item => {
        const lastFinish = parseInt(item['reportWorkQuantity'][lastProcess])
        const allFinish = item.glassQuantity*1
        return allFinish>lastFinish
      })
      // console.log(filter)
      // xGrid.value.loadData(filter)
      xGrid.value.loadData(filter)
      break
    }
  }
@@ -264,9 +259,9 @@
      <template #type>
        <vxe-select @change="changeProcessType" v-model="orderType" >
          <vxe-option :value="1" :label="'完整模式'"></vxe-option>
          <vxe-option :value="2" :label="'单片模式'"></vxe-option>
          <vxe-option :value="3" :label="'待完工'"></vxe-option>
          <vxe-option :value="1" :label="t('order.merge')"></vxe-option>
          <vxe-option :value="2" :label="t('order.layer')"></vxe-option>
          <vxe-option :value="3" :label="t('order.notFinish')"></vxe-option>
        </vxe-select>
      </template>
    </vxe-grid>
north-glass-erp/northglass-erp/src/lang/ar.js
@@ -302,7 +302,10 @@
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量'
        glassQuantity:'小片数量',
        merge:'完整模式',
        layer:'单片模式',
        notFinish:'待完成'
    },
    searchOrder:{
north-glass-erp/northglass-erp/src/lang/en.js
@@ -303,7 +303,10 @@
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量'
        glassQuantity:'小片数量',
        merge:'完整模式',
        layer:'单片模式',
        notFinish:'待完成'
    },
    searchOrder:{
north-glass-erp/northglass-erp/src/lang/kr.js
@@ -312,7 +312,10 @@
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量'
        glassQuantity:'小片数量',
        merge:'完整模式',
        layer:'单片模式',
        notFinish:'待完成'
    },
    searchOrder:{
north-glass-erp/northglass-erp/src/lang/ru.js
@@ -302,7 +302,10 @@
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量'
        glassQuantity:'小片数量',
        merge:'完整模式',
        layer:'单片模式',
        notFinish:'待完成'
    },
    searchOrder:{
north-glass-erp/northglass-erp/src/lang/zh.js
@@ -312,7 +312,10 @@
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量'
        glassQuantity:'小片数量',
        merge:'完整模式',
        layer:'单片模式',
        notFinish:'待完成'
    },
    searchOrder:{