把erp中文修改成语言变量

廖井涛

2025-09-24 5cfaaffd38b1cd91e1279261fa7f5df0675117e0

把erp中文修改成语言变量

 north-glass-erp/northglass-erp/src/components/pp/SelectProcessCardDetail.vue

@@ -143,9 +143,9 @@

  toolbarConfig: {
    buttons: [
      {code: 'update', name: t('合架'), status: 'primary'},
      {code: 'save', name: t('保存'), status: 'primary'},
      {code: 'clear', name: t('清空'), status: 'primary'},
      {code: 'update', name: t('processCard.combinedFrame'), status: 'primary'},
      {code: 'save', name: t('basicData.save'), status: 'primary'},
      {code: 'clear', name: t('basicData.empty'), status: 'primary'},
    ],

  },

 north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue

@@ -174,7 +174,7 @@
          },
          {
            code: 'flashback',
            name: '倒叙',
            name: t('processCard.flashback'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false

 north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue

@@ -33,27 +33,27 @@
  alType:'order.alType',
  customerBatch:'order.customerBatch',
  processingNote:'order.processingNote',
  remarks:'订单备注',
  remarks:'basicData.orderRemarks',
  customerAbbreviation:'customer.customerAbbreviation',
  productAbbreviation:'product.msg.productAbbreviation',
  processId:'processCard.processId',
  createTime:'下单日期',
  createTime:'report.orderTime',
  orderNumber:'order.OrderNum',
  technologyNumber:'processCard.technologyNumber',
  process:'orderBasicData.process',
  color:'mainIngredient.films',
  figureNumber:'图号',
  colourCeramicGlaze:'彩釉图号',
  figureNumber:'order.drawingNo',
  colourCeramicGlaze:'order.colourCeramicGlaze',
  glassNumber:"reportingWorks.glassNumber",
  remarks1:'备注1',
  remarks2:'备注2',
  remarks3:'备注3',
  remarks4:'备注4',
  filmNumber:'产品备注',
  remarks1:'basicData.remarks1',
  remarks2:'basicData.remarks2',
  remarks3:'basicData.remarks3',
  remarks4:'basicData.remarks4',
  filmNumber:'basicData.filmNumber',
  bendRadius:'order.bendRadius',
  glassChild:'reportingWorks.glassChild',
  glassAddress:'replenish.sliceMarking',
  quantity:'工程用数量'
  quantity:'processCard.quantity'



@@ -214,8 +214,8 @@
            </el-select>

            <el-button v-if="tag.id!==null" @click="close" type="primary" circle  :icon="CloseBold"/>
            <el-input placeholder="宽" v-model="tag.tagWidth" style="width: 40px"/>
            <el-input placeholder="高" v-model="tag.tagHeight" style="width: 40px"/>
            <el-input :placeholder="$t('order.width')" v-model="tag.tagWidth" style="width: 40px"/>
            <el-input :placeholder="$t('order.height')" v-model="tag.tagHeight" style="width: 40px"/>
          </el-row>

        </el-header>

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

@@ -206,7 +206,7 @@
      circle.value.r=0
      exportToDXF(1)
    }else{
      ElMessage.warning("请输入大于0的有效参数")
      ElMessage.warning(t('basicData.greater0Msg'))
    }

  }
@@ -242,7 +242,7 @@
      rect.value.h=0
      exportToDXF(1)
    }else{
      ElMessage.warning("请输入大于0的有效参数")
      ElMessage.warning(t('basicData.greater0Msg'))
    }

  }
@@ -643,7 +643,7 @@
  else if(value===2&&state.value){
    saveAs(blob, 'map.dxf');
  }else{
    ElMessage.warning("该格式不支持导出")
    ElMessage.warning(t('basicData.notExport'))
  }
}


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

@@ -368,7 +368,7 @@
  else if(value===2&&state.value){
    saveAs(blob, 'map.dxf');
  }else{
    ElMessage.warning("该格式不支持导出")
    ElMessage.warning(t('basicData.notExport'))
  }
}

@@ -744,7 +744,7 @@
    }
    emits('getUploadPicture', fileName.value,fileDate.value,fileJson.value)
  }else{
    ElMessage.warning("未参与修改")
    ElMessage.warning(t('basicData.notUpdate'))
  }

}

 north-glass-erp/northglass-erp/src/lang/ar.js

@@ -69,6 +69,13 @@
        partiallySelected:'部分选中',
        unchecked :'未选中',
        copy:'复制',

        orderRemarks:'订单备注',
        filmNumber:'产品备注',
        remarks1:'备注1',
        remarks2:'备注2',
        remarks3:'备注3',
        remarks4:'备注4',
        msg:{
            max255:'أدخل 255 حرفًا كحد أقصى',
            max10:"最多输入10个字符",
@@ -96,7 +103,10 @@
            range9999Dec:'يرجى إدخال عدد صحيح مكون من أربعة أرقام',
            quantityError: "数量错误，请刷新再保存",
            dataDoesNotExist: "数据不存在",
            greater0Sec1:"请输入大于0的整数或者保留一位小数"
            greater0Sec1:"请输入大于0的整数或者保留一位小数",
            greater0Msg:"请输入大于0的数字",
            notExport:"该格式不支持导出",
            notUpdate:"参数未修改",
        }
    },
    product:{
@@ -272,6 +282,7 @@
        surtax:'附加税',
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        colourCeramicGlaze:'彩釉图号',
        msg:{
            productCheck:'الرجاء اختيار منتج',
            tableLengthNot:'لا توجد بيانات للجدول',
@@ -553,6 +564,21 @@
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
            msg3:'所选数据的数量总和',
            msg4:'与订单数量',
            msg5:'不匹配，请检查后重试！',
            msg6:'是否合并?',
            msg7:'撤销失败，请检查是否已生成工程号',
        }
    },
    reportingWorks:{
        page:{
@@ -669,6 +695,17 @@
        pleaseNumber13:'下工序报工数:',
        pleaseNumber14:'本工序修改数不能小于下工序报工数',
        pleaseNumber15:'已入库数量不能大于已完工数量',

        pleaseNumber16:'请选择最后工序报工入库',

        woodenBox:'木箱:',
        brandreth:'铁架',
        tilting:'倒架',
        secondaryBreakage:'序号次破相同',
        checkedBreakage:'选中次破相同',
        unreviewed:'未审核',
        notunreviewed:'审核未通过',
        notQualified:'无需质检',
    },
    productStock:{
        page:{
@@ -779,6 +816,8 @@
        packing:'装箱调架',
        msgPacking:'装箱调架成功',
        boxNumberOrRemarks:'箱号或备注',
        msg4:'发货单已创建',
        msg5:'物料可能存在装箱调架，无法退回',
    },
    customer:{
        page:{
@@ -856,6 +895,8 @@
        freightQuantity:'运费数量',
        freight:'运费金额',
        pleaseMsg1:'订单存在其他金额单价没有填写',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',

    },
    replenish:{
@@ -894,6 +935,7 @@
        PleaseSelectAReworkTeam:'الرجاء تحديد فريق إعادة العمل',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'لا يمكن أن تكون كمية إعادة العمل أكبر من كمية الفاصل الثاني',
        reworkQuantityCannotBeEmptyOr0:'لا يمكن أن تكون كمية إعادة العمل فارغة أو 0',
        msg1:'请填入需要合并的层',
    },


@@ -1125,6 +1167,7 @@
        pleaseEnter :'من فضلك أدخل',
        msg1 :'库存已存在此物料不能删除',
        unit :'单位',
        msg2 :'该物料已存在',
    },
    ingredientsStock:{
        page:{
@@ -1179,7 +1222,10 @@
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
        pleaseSelectTheTypeOfReturnToStock:'请选择返库类型',
        pleaseSelectOneData:'请选中一行数据'
        pleaseSelectOneData:'请选中一行数据',
        msg1:'库存存在多条',
        msg2:'数量不对请检查',
        msg3:'库存不存在或者存在多条',
    },
    warehouseBasicData:{
        page:{
@@ -1317,6 +1363,24 @@
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
        summary:'汇总',
        detail:'明细',
    },
    bom:{
        orderBOM:'订单BOM',
        productBOM:'产品BOM',
        materialBOM:'物料BOM',
        msg:{
            msg1:'请先选择一个产品标签',
        },
        bomType:'类型',
        consume:'消耗量',
        price:'使用价格',
        price1:'价格',
        usageType:'使用类型',
        bomPrice:'BOM成本',
        other:'其它',

    }



 north-glass-erp/northglass-erp/src/lang/en.js

@@ -69,6 +69,13 @@
        partiallySelected:'partially selected',
        unchecked :'unchecked',
        copy:'Copy',

        orderRemarks:'订单备注',
        filmNumber:'产品备注',
        remarks1:'备注1',
        remarks2:'备注2',
        remarks3:'备注3',
        remarks4:'备注4',
        msg:{
            max255:"The value contains a maximum of 255 characters",
            max10:"最多输入10个字符",
@@ -96,7 +103,10 @@
            range9999Dec: "Please enter a four digit integer",
            quantityError: "Quantity Error",
            dataDoesNotExist: "Data Does Not Exist",
            greater0Sec1:"请输入大于0的整数或者保留一位小数"
            greater0Sec1:"请输入大于0的整数或者保留一位小数",
            greater0Msg:"请输入大于0的数字",
            notExport:"该格式不支持导出",
            notUpdate:"参数未修改",
        }
    },
    product:{
@@ -272,6 +282,7 @@
        surtax:'附加税',
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        colourCeramicGlaze:'彩釉图号',
        msg:{
            productCheck:'Please select a product',
            tableLengthNot:'No table data',
@@ -554,6 +565,21 @@
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
            msg3:'所选数据的数量总和',
            msg4:'与订单数量',
            msg5:'不匹配，请检查后重试！',
            msg6:'是否合并?',
            msg7:'撤销失败，请检查是否已生成工程号',
        }
    },
    reportingWorks:{
        page:{
@@ -670,6 +696,17 @@
        pleaseNumber13:'下工序报工数:',
        pleaseNumber14:'本工序修改数不能小于下工序报工数',
        pleaseNumber15:'已入库数量不能大于已完工数量',

        pleaseNumber16:'请选择最后工序报工入库',

        woodenBox:'木箱:',
        brandreth:'铁架',
        tilting:'倒架',
        secondaryBreakage:'序号次破相同',
        checkedBreakage:'选中次破相同',
        unreviewed:'未审核',
        notunreviewed:'审核未通过',
        notQualified:'无需质检',
    },
    productStock:{
        page:{
@@ -780,6 +817,8 @@
        packing:'装箱调架',
        msgPacking:'装箱调架成功',
        boxNumberOrRemarks:'箱号或备注',
        msg4:'发货单已创建',
        msg5:'物料可能存在装箱调架，无法退回',
    },
    customer:{
        page:{
@@ -858,6 +897,8 @@
        freightQuantity:'Freight Quantity',
        freight:'Freight Money',
        pleaseMsg1:'There are other amounts in the order and the unit price is not filled in',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',

    },
    replenish:{
@@ -895,6 +936,7 @@
        PleaseSelectAReworkTeam:'Please select a rework team',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'The rework quantity cannot be greater than the second break quantity',
        reworkQuantityCannotBeEmptyOr0:'Rework quantity cannot be empty or 0',
        msg1:'请填入需要合并的层',
    },


@@ -1126,6 +1168,7 @@
        pleaseEnter :'Please enter',
        msg1 :'This material is already in stock and cannot be deleted',
        unit :'unit',
        msg2 :'该物料已存在',
    },
    ingredientsStock:{
        page:{
@@ -1180,7 +1223,10 @@
        additionOfSurplusMaterials :'Surplus addition',
        excessMaterialOutflow :'Residual materials out of storage',
        pleaseSelectTheTypeOfReturnToStock:'Please select a return type',
        pleaseSelectOneData:'请选中一行数据'
        pleaseSelectOneData:'请选中一行数据',
        msg1:'库存存在多条',
        msg2:'数量不对请检查',
        msg3:'库存不存在或者存在多条',
    },
    warehouseBasicData:{
        page:{
@@ -1318,6 +1364,24 @@
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
        summary:'汇总',
        detail:'明细',
    },
    bom:{
        orderBOM:'订单BOM',
        productBOM:'产品BOM',
        materialBOM:'物料BOM',
        msg:{
            msg1:'请先选择一个产品标签',
        },
        bomType:'类型',
        consume:'消耗量',
        price:'使用价格',
        price1:'价格',
        usageType:'使用类型',
        bomPrice:'BOM成本',
        other:'其它',

    }



 north-glass-erp/northglass-erp/src/lang/kr.js

@@ -69,6 +69,13 @@
        partiallySelected:'부분 선택',
        unchecked :'미선택 데이터',
        copy:'주문 복제',

        orderRemarks:'订单备注',
        filmNumber:'产品备注',
        remarks1:'备注1',
        remarks2:'备注2',
        remarks3:'备注3',
        remarks4:'备注4',
        msg:{
            max255:"최대 255자 입력 가능",
            max10:"最多输入10个字符",
@@ -96,7 +103,10 @@
            range9999Dec: "4자리 정수 입력하세요",
            quantityError: '수량 오류, 새로고침 후 저장하세요',
            dataDoesNotExist: "데이터 없음",
            greater0Sec1:"请输入大于0的整数或者保留一位小数"
            greater0Sec1:"请输入大于0的整数或者保留一位小数",
            greater0Msg:"请输入大于0的数字",
            notExport:"该格式不支持导出",
            notUpdate:"参数未修改",
        }
    },
    product:{
@@ -272,6 +282,7 @@
        surtax:'부가세',
        valueAddedTax:'부가세',
        cuttingTransport:'재단전송',
        colourCeramicGlaze:'彩釉图号',
        transferPage:{
            oldOrderId:'기존 주문 번호',
            newOrderId:'신규 주문 번호',
@@ -561,6 +572,21 @@
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
            msg3:'所选数据的数量总和',
            msg4:'与订单数量',
            msg5:'不匹配，请检查后重试！',
            msg6:'是否合并?',
            msg7:'撤销失败，请检查是否已生成工程号',
        }
    },
    reportingWorks:{
        page:{
@@ -677,6 +703,17 @@
        pleaseNumber13:'下工序报工数:',
        pleaseNumber14:'本工序修改数不能小于下工序报工数',
        pleaseNumber15:'已入库数量不能大于已完工数量',

        pleaseNumber16:'请选择最后工序报工入库',

        woodenBox:'木箱:',
        brandreth:'铁架',
        tilting:'倒架',
        secondaryBreakage:'序号次破相同',
        checkedBreakage:'选中次破相同',
        unreviewed:'未审核',
        notunreviewed:'审核未通过',
        notQualified:'无需质检',
    },
    productStock:{
        page:{
@@ -787,6 +824,8 @@
        packing:'装箱调架',
        msgPacking:'装箱调架成功',
        boxNumberOrRemarks:'箱号或备注',
        msg4:'发货单已创建',
        msg5:'物料可能存在装箱调架，无法退回',
    },
    customer:{
        page:{
@@ -864,6 +903,8 @@
        freightQuantity:'운송 수량',
        freight:'운송 비용',
        pleaseMsg1:'주문서 기타금액 단가가 기입되지 않았습니다',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',

    },
    replenish:{
@@ -903,6 +944,7 @@
        PleaseSelectAReworkTeam:'재작업 팀을 선택해 주세요',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'재작업 수량은 첫번째 파손 수량을 초과할 수 없음',
        reworkQuantityCannotBeEmptyOr0:'재작업 수량은 공백이거나 0일 수 없음',
        msg1:'请填入需要合并的层',
    },


@@ -1135,6 +1177,7 @@
        pleaseEnter :'입력',
        msg1 :'최대 5MB 이내 이미지 파일을 선택해주세요',
        unit :'单位',
        msg2 :'该物料已存在',
    },
    ingredientsStock:{
        page:{
@@ -1189,7 +1232,10 @@
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
        pleaseSelectTheTypeOfReturnToStock:'请选择返库类型',
        pleaseSelectOneData:'请选中一行数据'
        pleaseSelectOneData:'请选中一行数据',
        msg1:'库存存在多条',
        msg2:'数量不对请检查',
        msg3:'库存不存在或者存在多条',
    },
    warehouseBasicData:{
        page:{
@@ -1327,6 +1373,24 @@
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
        summary:'汇总',
        detail:'明细',
    },
    bom:{
        orderBOM:'订单BOM',
        productBOM:'产品BOM',
        materialBOM:'物料BOM',
        msg:{
            msg1:'请先选择一个产品标签',
        },
        bomType:'类型',
        consume:'消耗量',
        price:'使用价格',
        price1:'价格',
        usageType:'使用类型',
        bomPrice:'BOM成本',
        other:'其它',

    }



 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -69,6 +69,13 @@
        partiallySelected:'部分选中',
        unchecked :'未选中',
        copy:'复制',

        orderRemarks:'订单备注',
        filmNumber:'产品备注',
        remarks1:'备注1',
        remarks2:'备注2',
        remarks3:'备注3',
        remarks4:'备注4',
        msg:{
            max255:"Введите 255 символов.",
            max10:"最多输入10个字符",
@@ -96,7 +103,10 @@
            range9999Dec: "Введите четыре целых числа.",
            quantityError: "数量错误，请刷新再保存",
            dataDoesNotExist: "数据不存在",
            greater0Sec1:"请输入大于0的整数或者保留一位小数"
            greater0Sec1:"请输入大于0的整数或者保留一位小数",
            greater0Msg:"请输入大于0的数字",
            notExport:"该格式不支持导出",
            notUpdate:"参数未修改",
        }
    },
    product:{
@@ -273,6 +283,7 @@
        surtax:'附加税',
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        colourCeramicGlaze:'彩釉图号',
        msg:{
            productCheck:'Пожалуйста, выберите продукт',
            tableLengthNot:'Нет данных таблицы',
@@ -551,6 +562,21 @@
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
            msg3:'所选数据的数量总和',
            msg4:'与订单数量',
            msg5:'不匹配，请检查后重试！',
            msg6:'是否合并?',
            msg7:'撤销失败，请检查是否已生成工程号',
        }
    },
    reportingWorks:{
        page:{
@@ -667,6 +693,17 @@
        pleaseNumber13:'下工序报工数:',
        pleaseNumber14:'本工序修改数不能小于下工序报工数',
        pleaseNumber15:'已入库数量不能大于已完工数量',

        pleaseNumber16:'请选择最后工序报工入库',

        woodenBox:'木箱:',
        brandreth:'铁架',
        tilting:'倒架',
        secondaryBreakage:'序号次破相同',
        checkedBreakage:'选中次破相同',
        unreviewed:'未审核',
        notunreviewed:'审核未通过',
        notQualified:'无需质检',
    },
    productStock:{
        page:{
@@ -777,6 +814,8 @@
        packing:'装箱调架',
        msgPacking:'装箱调架成功',
        boxNumberOrRemarks:'箱号或备注',
        msg4:'发货单已创建',
        msg5:'物料可能存在装箱调架，无法退回',
    },
    customer:{
        page:{
@@ -854,6 +893,8 @@
        freightQuantity:'运费数量',
        freight:'运费金额',
        pleaseMsg1:'订单存在其他金额单价没有填写',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',

    },
    replenish:{
@@ -893,6 +934,7 @@
        PleaseSelectAReworkTeam:'Пожалуйста, выберите рабочую группу.',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'Переработка не должна превышать количество повреждений.',
        reworkQuantityCannotBeEmptyOr0:'Переработка не может быть пустой или нулевой.',
        msg1:'请填入需要合并的层',
    },


@@ -1124,6 +1166,7 @@
        pleaseEnter :'Введите',
        msg1 :'库存已存在此物料不能删除',
        unit :'单位',
        msg2 :'该物料已存在',
    },
    ingredientsStock:{
        page:{
@@ -1178,7 +1221,10 @@
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
        pleaseSelectTheTypeOfReturnToStock:'请选择返库类型',
        pleaseSelectOneData:'请选中一行数据'
        pleaseSelectOneData:'请选中一行数据',
        msg1:'库存存在多条',
        msg2:'数量不对请检查',
        msg3:'库存不存在或者存在多条',
    },
    warehouseBasicData:{
        page:{
@@ -1316,6 +1362,24 @@
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
        summary:'汇总',
        detail:'明细',
    },
    bom:{
        orderBOM:'订单BOM',
        productBOM:'产品BOM',
        materialBOM:'物料BOM',
        msg:{
            msg1:'请先选择一个产品标签',
        },
        bomType:'类型',
        consume:'消耗量',
        price:'使用价格',
        price1:'价格',
        usageType:'使用类型',
        bomPrice:'BOM成本',
        other:'其它',

    }



 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -69,6 +69,13 @@
        partiallySelected:'部分选中',
        unchecked :'未选中',
        copy:'复制',

        orderRemarks:'订单备注',
        filmNumber:'产品备注',
        remarks1:'备注1',
        remarks2:'备注2',
        remarks3:'备注3',
        remarks4:'备注4',
        msg:{
            max255:"最多输入255个字符",
            max10:"最多输入10个字符",
@@ -96,7 +103,10 @@
            range9999Dec: "请输入四位整数",
            quantityError: "数量错误，请刷新再保存",
            dataDoesNotExist: "数据不存在",
            greater0Sec1:"请输入大于0的整数或者保留一位小数"
            greater0Sec1:"请输入大于0的整数或者保留一位小数",
            greater0Msg:"请输入大于0的数字",
            notExport:"该格式不支持导出",
            notUpdate:"参数未修改",
        }
    },
    product:{
@@ -167,6 +177,8 @@

           productAbbreviation:'产品简称',
           productDuplication:'产品重复',
           msg1:'创建人是：',
           msg2:'无法操作！',
       }
    },
    order:{
@@ -272,6 +284,7 @@
        surtax:'附加税',
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        colourCeramicGlaze:'彩釉图号',
        transferPage:{
            oldOrderId:'原订单号',
            newOrderId:'新订单号',
@@ -566,6 +579,19 @@
        maxCompleted:'最大已完工数量',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
            msg3:'所选数据的数量总和',
            msg4:'与订单数量',
            msg5:'不匹配，请检查后重试！',
            msg6:'是否合并?',
            msg7:'撤销失败，请检查是否已生成工程号',
        }
    },
    reportingWorks:{
        page:{
@@ -685,6 +711,17 @@
        pleaseNumber13:'下工序报工数:',
        pleaseNumber14:'本工序修改数不能小于下工序报工数',
        pleaseNumber15:'已入库数量不能大于已完工数量',

        pleaseNumber16:'请选择最后工序报工入库',

        woodenBox:'木箱:',
        brandreth:'铁架',
        tilting:'倒架',
        secondaryBreakage:'序号次破相同',
        checkedBreakage:'选中次破相同',
        unreviewed:'未审核',
        notunreviewed:'审核未通过',
        notQualified:'无需质检',
    },
    productStock:{
        page:{
@@ -795,6 +832,8 @@
        packing:'装箱调架',
        msgPacking:'装箱调架成功',
        boxNumberOrRemarks:'箱号或备注',
        msg4:'发货单已创建',
        msg5:'物料可能存在装箱调架，无法退回',
    },
    customer:{
        page:{
@@ -872,6 +911,8 @@
        freightQuantity:'运费数量',
        freight:'运费金额',
        pleaseMsg1:'订单存在其他金额单价没有填写',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',

    },
    replenish:{
@@ -889,7 +930,8 @@
        sliceMarking:'片标记',
        printPatchesMsg1:'请选择标签模板',
        labelTemplate:'标签模板：',
        listLabelTemplates:'标签模板列表'
        listLabelTemplates:'标签模板列表',
        label:'小片标签',
    },
    rework:{
        page:{
@@ -910,6 +952,7 @@
        PleaseSelectAReworkTeam:'请选择返工班组',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'返工数量不能大于次破数量',
        reworkQuantityCannotBeEmptyOr0:'返工数量不能为空或者是0',
        msg1:'请填入需要合并的层',
    },


@@ -1145,6 +1188,7 @@
        pleaseEnter :'请输入',
        msg1 :'库存已存在此物料不能删除',
        unit :'单位',
        msg2 :'该物料已存在',
    },
    ingredientsStock:{
        page:{
@@ -1199,7 +1243,10 @@
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
        pleaseSelectTheTypeOfReturnToStock:'请选择返库类型',
        pleaseSelectOneData:'请选中一行数据'
        pleaseSelectOneData:'请选中一行数据',
        msg1:'库存存在多条',
        msg2:'数量不对请检查',
        msg3:'库存不存在或者存在多条',
    },
    warehouseBasicData:{
        page:{
@@ -1337,6 +1384,24 @@
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
        summary:'汇总',
        detail:'明细',
    },
    bom:{
        orderBOM:'订单BOM',
        productBOM:'产品BOM',
        materialBOM:'物料BOM',
        msg:{
            msg1:'请先选择一个产品标签',
        },
        bomType:'类型',
        consume:'消耗量',
        price:'使用价格',
        price1:'价格',
        usageType:'使用类型',
        bomPrice:'BOM成本',
        other:'其它',

    }



 north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue

@@ -339,8 +339,8 @@
        <template #toolbar_buttons="{ $grid }">
          &nbsp;&nbsp;
          <vxe-select @change="changeOrderType" v-model="values" >
            <vxe-option value="1" label="汇总"></vxe-option>
            <vxe-option value="2" label="明细"></vxe-option>
            <vxe-option value="1" :label= t('finishedGlassShelf.summary')></vxe-option>
            <vxe-option value="2" :label= t('finishedGlassShelf.detail')></vxe-option>
          </vxe-select>
          &nbsp;&nbsp;


 north-glass-erp/northglass-erp/src/views/mm/ingredient/CreateIngredients.vue

@@ -130,7 +130,7 @@
        resetForm()
        ElMessage.success(t('basicData.msg.saveSuccess'))
      }else if(res.data==="false1"){
        ElMessage.warning("该物料已存在")
        ElMessage.warning(t('ingredients.msg2'))
      }else{
        ElMessage.warning(t('basicData.msg.saveFail'))
      }

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue

@@ -28,12 +28,12 @@
const getTableRow = (row,type) =>{
  switch (type) {
    case 'edit' :{
      alert('我接收到子组件传送的编辑信息')

      router.push({path: '/main/trader/CreateTrader', query: { id: row.id }})
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')

      break
    }
  }
@@ -534,7 +534,7 @@
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return '合计:'
          return t('basicData.total')
        }
        // if (props.tableProp.footList.includes(column.field)) {
        //   return sumNum(data, column.field)

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialAddition.vue

@@ -193,7 +193,7 @@
      ElMessage.success(t('basicData.msg.saveSuccess'))
      router.push({path: '/main/ingredientsStock/SelectIngredientsStock', query:{random:Math.random()}})
    }else if(res.data==="false1") {
      ElMessage.warning("库存存在多条")
      ElMessage.warning(t('ingredientsStock.msg1'))
    }else {
      ElMessage.warning(t('basicData.msg.ServerConnectionError'))
    }

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialAdditionRecord.vue

@@ -22,11 +22,9 @@
const getTableRow = (row,type) =>{
  switch (type) {
    case 'add' :{
      alert('我接收到子组件传送的编辑信息')
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
  }
@@ -361,9 +359,9 @@
                  })

                }else if(res.data === "false1"){
                  ElMessage.warning(t('数量不对请检查'))
                  ElMessage.warning(t('ingredientsStock.msg2'))
                }else if(res.data === "false2"){
                  ElMessage.warning(t('库存不存在或者存在多条'))
                  ElMessage.warning(t('ingredientsStock.msg3'))
                }else {
                  ElMessage.warning(t('productStock.cancellationFailed'))
                }

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue

@@ -36,7 +36,6 @@
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
  }

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectSurplusMaterials.vue

@@ -26,7 +26,6 @@
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
  }

 north-glass-erp/northglass-erp/src/views/mm/productStock/OrderAllocation.vue

@@ -25,7 +25,6 @@
const getTableRow = (row,type) =>{
  switch (type) {
    case 'edit' :{
      alert('我接收到子组件传送的编辑信息')
      // router.push({path: '/main/productStock/OrderAllocation', query: { id: row.id }})
      break
    }

 north-glass-erp/northglass-erp/src/views/mm/productStock/ProductStockList.vue

@@ -433,7 +433,7 @@
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="changeRack">
            调架
            {{t('basicData.save')}}
          </el-button>
        </div>
      </template>
@@ -442,7 +442,7 @@
    <el-dialog
        id="sizePrintCalrd1"
        v-model="dialogTableVisible1"
        title="装箱单打印"
        :title="$t('productStock.boxingPrinting')"
        destroy-on-close
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">

 north-glass-erp/northglass-erp/src/views/mm/productStock/ReworkRecord.vue

@@ -21,11 +21,9 @@
const getTableRow = (row,type) =>{
  switch (type) {
    case 'add' :{
      alert('我接收到子组件传送的编辑信息')
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
  }

 north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue

@@ -24,11 +24,9 @@
const getTableRow = (row,type) =>{
  switch (type) {
    case 'add' :{
      alert('我接收到子组件传送的编辑信息')
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
  }
@@ -292,9 +290,9 @@
                router.push({path:'/main/productStock/storageRecord',query:{random:Math.random(),storageType: type.value}})

              }else if(res.data==="false1"){
                ElMessage.warning("发货单已创建")
                ElMessage.warning(t('productStock.msg4'))
              }else if(res.data==="false2"){
                ElMessage.warning("物料可能存在装箱调架，无法退回")
                ElMessage.warning(t('productStock.msg5'))
              }else{
                ElMessage.warning(t('productStock.cancellationFailed'))
              }

 north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecordPint.vue

@@ -206,16 +206,16 @@

    {type: 'checkbox',fixed:"left", title: t('basicData.check'), width: '80' },
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
    {field: 'remarks', width:'150', title: t('箱号'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'remarks', width:'150', title: t('productStock.boxNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderId', width: '150',title: t('order.orderId'),showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'processId', width: '150',title: t('processCard.processId'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productId',width: '100', title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productName',width: '140', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.width', width: '100',title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.height',width: '100', title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.project', width: '100',title: t('项目名称'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.customerName', width:'140', title: t('客户名称'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.deliveryAddress', width: '100',title: t('送货地址'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.project', width: '100',title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.customerName', width:'140', title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.deliveryAddress', width: '100',title: t('delivery.shippingAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
  ],//表头按钮
  toolbarConfig: {
    buttons: [
@@ -387,7 +387,7 @@
    <el-dialog
        id="sizePrintCalrd"
        v-model="dialogTableVisible"
        title="装箱单打印"
        :title="$t('productStock.boxingPrinting')"
        destroy-on-close
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">

 north-glass-erp/northglass-erp/src/views/mm/productStock/TakeOutRecord.vue

@@ -22,11 +22,9 @@
const getTableRow = (row,type) =>{
  switch (type) {
    case 'add' :{
      alert('我接收到子组件传送的编辑信息')
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
  }

 north-glass-erp/northglass-erp/src/views/mm/productStock/TransferRecord.vue

@@ -21,11 +21,9 @@
const getTableRow = (row,type) =>{
  switch (type) {
    case 'add' :{
      alert('我接收到子组件传送的编辑信息')
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
  }

 north-glass-erp/northglass-erp/src/views/mm/stockReport/FinishedGlassShelfEmitReport.vue

@@ -31,7 +31,7 @@
  data:[],//表格数据
  url :'/finishedGlassShelf/getFinishedGlassShelfLogReport/料架出库',
  exportUrl :'/finishedGlassShelf/exportFinishedGlassShelfLogReport/料架出库',
  exportName:t('料架出库报表'),
  exportName:t('stockReport.finishedGlassShelfEmitReport'),
  footList:['quantity']
})


 north-glass-erp/northglass-erp/src/views/mm/stockReport/FinishedGlassShelfWithdrawReport.vue

@@ -32,7 +32,7 @@
  data:[],//表格数据
  url :'/finishedGlassShelf/getFinishedGlassShelfLogReport/料架入库',
  exportUrl :'/finishedGlassShelf/exportFinishedGlassShelfLogReport/料架入库',
  exportName:t('料架入库报表'),
  exportName:t('stockReport.finishedGlassShelfWithdrawReport'),
  footList:['quantity']
})


 north-glass-erp/northglass-erp/src/views/mm/stockReport/FinishedProductInventoryReport.vue

@@ -40,7 +40,7 @@
  url :'/finishedGoodsInventory/getSelectFinishedOperateLogReport/入库',
  exportUrl :'/finishedGoodsInventory/exportFinishedOperateLogReport/入库',
  exportName:t('stockReport.finishedProductInventoryReport'),
  footList:['quantity']
  footList:['quantity','area','money']
})

</script>

 north-glass-erp/northglass-erp/src/views/mm/stockReport/MaterialAdditionReport.vue

@@ -11,7 +11,7 @@
const childrenData = ref({
  columns:[
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
    {field: 'operationOrderNumber', width:'150', title: t('productStock.operationOrderNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operationOrderNumber', width:'150', title: t('ingredientsStock.dateOfManufacture'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operationNumber', width: '100',title: t('order.OrderNum'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateType', width: '120',title:t('warehouseBasicData.type'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'quantity', width: '140',title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -26,7 +26,7 @@
    {field: 'singlePieceArea', width:'140', title: t('productStock.singlePieceArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'inventoryArea', width:'140', title: t('productStock.inventoryArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operator', width: '100',title: t('productStock.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateTime', width:'140', title: t('productStock.productionDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateTime', width:'140', title: t('productStock.productionDate')},
    {field: 'remarks', width: '140',title: t('productStock.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

  ],//表格表头字段

 north-glass-erp/northglass-erp/src/views/mm/stockReport/MaterialOutboundReport.vue

@@ -29,7 +29,8 @@
    {field: 'singlePieceArea', width:'140', title: t('productStock.singlePieceArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'inventoryArea', width:'140', title: t('productStock.inventoryArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operator', width: '100',title: t('productStock.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateTime', width:'140', title: t('productStock.productionDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateTime', width:'140', title: t('productStock.productionDate')},
    {field: 'materialOutboundDetail.dateOfManufacture', width:'140', title: t('ingredientsStock.dateOfManufacture')},
    {field: 'remarks', width: '140',title: t('productStock.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

  ],//表格表头字段

 north-glass-erp/northglass-erp/src/views/mm/stockReport/StockMonthReport.vue

@@ -13,7 +13,7 @@
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
    {field: 'operationOrderNumber', width:'150', title: t('productStock.operationOrderNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderId', width: '150',title: t('order.orderId'),showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateType', width: '120',title:'类型',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'operateType', width: '120',title:t('machine.type'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'operationNumber', width: '100',title: t('order.OrderNum'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'quantity', width: '140',title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productId',width: '100', title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

 north-glass-erp/northglass-erp/src/views/mm/stockReport/StockWarehouseReport.vue

@@ -14,14 +14,14 @@
    {field: 'operationOrderNumber', width:'150', title: t('productStock.operationOrderNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderId', width: '150',title: t('order.orderId'),showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operationNumber', width: '100',title: t('order.OrderNum'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateType', width: '120',title:'类型',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateType', width: '120',title:t('machine.type'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'quantity', width: '140',title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productId',width: '100', title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productName',width: '140', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.width', width: '100',title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.height',width: '100', title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'staterOperationOrderNumber', width: '150',title: '调拨销售单号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'endOperationOrderNumber', width: '100',title: '调拨序号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'staterOperationOrderNumber', width: '150',title: t('productStock.staterOperationOrderNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'endOperationOrderNumber', width: '100',title: t('productStock.endOperationOrderNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operator', width: '100',title: t('productStock.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateTime', width:'140', title: t('productStock.productionDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'reviewed', width: '100',title: t('productStock.reviewed'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

 north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue

@@ -47,7 +47,6 @@
      break
    }
    case  'setType': {
      alert('我接收到子组件传送的反审状态')
      break
    }
  }

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

@@ -567,7 +567,7 @@
    checkedNum.value = ''

  } catch (e) {
    ElMessage.warning(e.message || '流程卡创建失败')
    ElMessage.warning(e.message || t('processCard.msg.msg1'))
  }
}

@@ -1016,7 +1016,7 @@

      checkedList.forEach((item) => {
        if ((item.baiscQuantity * 1) < moveQty) {
          throw new Error('请输入小于等于待分数量的数字')
          throw new Error(t('processCard.msg.msg2'))
        }

        // 右表扣数量、扣面积（只扣一次，避免左表再扣重复）
@@ -1225,7 +1225,7 @@
            let totalQuantity = data.reduce((sum, record) => sum + (Number(record.quantity) || 0), 0);
            // 对比全局变量 orderQuantity
            if (totalQuantity !== orderQuantity*1) {
              ElMessage.warning(`所选数据的数量总和 (${totalQuantity}) 与订单数量 (${orderQuantity}) 不匹配，请检查后重试！`);
              ElMessage.warning(`${t('processCard.msg.msg3')} (${totalQuantity}) ${t('processCard.msg.msg4')} (${orderQuantity}) ${t('processCard.msg.msg5')}`);
              gridLeftOptions.toolbarConfig.buttons[0].disabled = false;
              return;
            }

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

@@ -38,7 +38,7 @@


//工序
const processVal = ref('切割')
const processVal = ref(t('machine.cutting'))


//排产状态

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

@@ -22,11 +22,9 @@
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
    case  'setType':{
      alert('我接收到子组件传送的排版状态')
      break
    }
  }

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

@@ -315,7 +315,7 @@

          })
          ElMessageBox.confirm(
              "是否合并？",
              t('processCard.msg.msg6'),
              {
                confirmButtonText: t('basicData.confirmButtonText'),
                cancelButtonText: t('basicData.cancelButtonText'),

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

@@ -437,8 +437,8 @@

        <template #toolbar_buttons="{ $grid }">
          <vxe-select @change="changeOrderType" v-model="printStyle" >
            <vxe-option value="1" label="11列4行"></vxe-option>
            <vxe-option value="2" label="6行3列"></vxe-option>
            <vxe-option value="1" :label="t('processCard.print1')"></vxe-option>
            <vxe-option value="2" :label="t('processCard.print2')"></vxe-option>
          </vxe-select>
          &nbsp;&nbsp;
<!--          <el-button

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

@@ -459,7 +459,7 @@
                })
              } else {

                ElMessage.warning("撤销失败，请检查是否已生成工程号")
                ElMessage.warning(t('processCard.msg.msg7'))

              }
            })
@@ -701,7 +701,7 @@
    <el-dialog
        id="sizePrintCalrd"
        v-model="dialogTableVisible"
        :title="$t('流程卡合架')"
        :title="$t('processCard.combinedFrame')"
        destroy-on-close
        style="width: 75%;height:75% ">
      <select-process-card-detail

 north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue

@@ -62,7 +62,6 @@
      break
    }
    case  'setType':{
      alert('我接收到子组件传送的反审状态')
      break
    }
  }

 north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue

@@ -210,7 +210,7 @@
              router.push("/login")
            }
          }).catch(err =>{
            ElMessage.error('提交失败，请刷新后重试')
            ElMessage.error(t('basicData.msg.ServerConnectionError'))
          }).finally(()=>{
            gridOptions.toolbarConfig.buttons[0].disabled=false
          })

 north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue

@@ -182,7 +182,7 @@
})

//打印类型
const printType = ref('小片标签')
const printType = ref(t('replenish.label'))

//定义接收加载表头下拉数据
const titleSelectJson = ref({
@@ -358,7 +358,7 @@
    {field: 'patch_area', title:  t('order.area'),width:80,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
    {field: 'responsible_team', title:  t('reportingWorks.responsibleTeam'),width:110,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
    {field: 'responsible_equipment', title:  t('reportingWorks.responsibleEquipment'),width:110,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
    {field: 'responsible_personnel', title:  '责任信息',width:110,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
    {field: 'responsible_personnel', title:  t('rework.responsibilityInformation'),width:110,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
    {field: 'patch_type', title:  t('reportingWorks.breakageType'),width:110,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
    {field: 'patch_reason', title:  t('reportingWorks.breakageReason'),width:110,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
    {field: 'patch_processes', title:  t('reportingWorks.responsibleProcess'),width:110,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
@@ -527,7 +527,7 @@
            return
          }
          if(printMerge.value===null ||printMerge.value===''){
            ElMessage.warning('请填入需要合并的层')
            ElMessage.warning(t('rework.msg1'))
            return
          }


 north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue

@@ -28,11 +28,9 @@
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
    case  'setType':{
      alert('我接收到子组件传送的反审状态')
      break
    }
  }

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

@@ -119,16 +119,16 @@
  //   label: t('reportingWorks.nightShift'),
  // },
   {
    value: '木箱',
    label: '木箱',
    value: t('reportingWorks.woodenBox'),
    label: t('reportingWorks.woodenBox'),
  },
  {
    value: '铁架',
    label: '铁架',
    value: t('reportingWorks.brandreth'),
    label: t('reportingWorks.brandreth'),
  },
  {
    value: '倒架',
    label: '倒架',
    value: t('reportingWorks.tilting'),
    label: t('reportingWorks.tilting'),
  },
]

@@ -305,14 +305,14 @@
          },
          {
            code: 'SecondaryBreakage',
            name: "序号次破相同",
            name: t('reportingWorks.secondaryBreakage'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'checkedBreakage',
            name: "选中次破相同",
            name: t('reportingWorks.checkedBreakage'),
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
@@ -609,7 +609,7 @@
          //层号
          let technologyStr = resultProcessId[2];
          if (last != titleUploadData.value.thisProcess){
            ElMessage.error('请选择最后工序报工入库')
            ElMessage.error(t('reportingWorks.pleaseNumber16'))
            return
          }
          storageBtn.value = true
@@ -821,7 +821,7 @@
    },
    {
      field: 'responsiblePersonnel',
      title: '责任信息',
      title: t('rework.responsibilityInformation'),
      editRender: {name: 'input', attrs: {placeholder: ''}}

    },
@@ -1121,7 +1121,7 @@
      ElMessage.error(msg)
    }
  }).catch(err =>{
    ElMessage.error('提交失败，请刷新后重试')
    ElMessage.error(t('basicData.msg.ServerConnectionError'))
  }).finally(()=>{

    gridOptions.toolbarConfig.buttons[0].disabled=false
@@ -1328,10 +1328,10 @@
      // 使用map方法来处理每个对象
      let modifiedCollection = res.data.Detail.map(item => {
        if (item.reviewed_state === 1) {
          return { ...item, reviewed_state: "已审核" };
          return { ...item, reviewed_state: t('productStock.approved') };
        }
        else if (item.reviewed_state === 0) {
          return { ...item, reviewed_state: "未审核" };
          return { ...item, reviewed_state: t('reportingWorks.unreviewed') };
        }
        else {
          // 其他情况保持不变

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

@@ -22,7 +22,6 @@
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
    case  'setType':{
@@ -179,13 +178,13 @@
      produceList = deepClone(res.data.data)
      produceList.forEach(item => {
        if (item.damageDetails.qualityInsStatus === 2) {
          item.damageDetails.qualityInsStatus = '已质检';
          item.damageDetails.qualityInsStatus = t('reportingWorks.qualified');
        }
        else if (item.damageDetails.qualityInsStatus === 1){
          item.damageDetails.qualityInsStatus = '待质检';
          item.damageDetails.qualityInsStatus = t('reportingWorks.unqualified');
        }
        else if (item.damageDetails.qualityInsStatus === 0){
          item.damageDetails.qualityInsStatus = '无需质检';
          item.damageDetails.qualityInsStatus = t('reportingWorks.notQualified');
        }
      });
      xGrid.value.reloadData(produceList)
@@ -407,7 +406,7 @@
                     size="small">
            {{ $t('basicData.edit') }}
          </el-button>
          <el-button v-if="row.damageDetails.qualityInsStatus==='已质检'||row.damageDetails.qualityInsStatus==='无需质检'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{ $t('basicData.review') }}</el-button>
          <el-button v-if="row.damageDetails.qualityInsStatus===t('reportingWorks.qualified')||row.damageDetails.qualityInsStatus===t('reportingWorks.notQualified')" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{ $t('basicData.review') }}</el-button>
          <el-button v-else  @click="getTableRow(row,'setType')" link type="primary" size="small">{{ $t('basicData.review') }}</el-button>
        </template>


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

@@ -134,11 +134,11 @@
      // 使用map方法来处理每个对象
      let modifiedCollection = produceList.map(item => {
        if (item.reviewedState === 1) {
          return {...item, reviewedState: "已审核"};
          return {...item, reviewedState: t('productStock.approved')};
        } else if (item.reviewedState === 0) {
          return {...item, reviewedState: "未审核"};
          return {...item, reviewedState: t('reportingWorks.unreviewed')};
        } else if (item.reviewedState === 2) {
          return {...item, reviewedState: "审核不通过"};
          return {...item, reviewedState: t('reportingWorks.notunreviewed')};
        } else {
          // 其他情况保持不变
          return item;
@@ -172,13 +172,13 @@
      // 使用map方法来处理每个对象
      let modifiedCollection = produceList.map(item => {
        if (item.reviewedState === 1) {
          return { ...item, reviewedState: "已审核" };
          return { ...item, reviewedState: t('productStock.approved') };
        }
        else if (item.reviewedState === 0) {
          return { ...item, reviewedState: "未审核" };
          return { ...item, reviewedState: t('reportingWorks.unreviewed') };
        }
        else if (item.reviewedState === 2){
          return { ...item, reviewedState: "审核不通过" };
          return { ...item, reviewedState: t('reportingWorks.notunreviewed') };
        }
        else {
          // 其他情况保持不变
@@ -217,13 +217,13 @@
      // 使用map方法来处理每个对象
      let modifiedCollection = produceList.map(item => {
        if (item.reviewedState === 1) {
          return { ...item, reviewedState: "已审核" };
          return { ...item, reviewedState: t('productStock.approved') };
        }
        else if (item.reviewedState === 0) {
          return { ...item, reviewedState: "未审核" };
          return { ...item, reviewedState: t('reportingWorks.unreviewed') };
        }
        else if (item.reviewedState === 2){
          return { ...item, reviewedState: "审核不通过" };
          return { ...item, reviewedState: t('reportingWorks.notunreviewed') };
        }
        else {
          // 其他情况保持不变
@@ -283,13 +283,13 @@
      // 使用map方法来处理每个对象
      let modifiedCollection = produceList.map(item => {
        if (item.reviewedState === 1) {
          return { ...item, reviewedState: "已审核" };
          return { ...item, reviewedState: t('productStock.approved') };
        }
        else if (item.reviewedState === 0) {
          return { ...item, reviewedState: "未审核" };
          return { ...item, reviewedState: t('reportingWorks.unreviewed') };
        }
        else if (item.reviewedState === 2){
          return { ...item, reviewedState: "审核不通过" };
          return { ...item, reviewedState: t('reportingWorks.notunreviewed') };
        }
        else {
          // 其他情况保持不变

 north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue

@@ -525,7 +525,7 @@
            return
          }
          if(printMerge.value===null ||printMerge.value===''){
            ElMessage.warning('请填入需要合并的层')
            ElMessage.warning(t('rework.msg1'))
            return
          }


 north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue

@@ -39,11 +39,9 @@
      break
    }
    case 'delete': {
      alert('我接收到子组件传送的删除信息')
      break
    }
    case  'setType': {
      alert('我接收到子组件传送的排版状态')
      break
    }
  }

 north-glass-erp/northglass-erp/src/views/sd/bom/BOM.vue

@@ -20,9 +20,9 @@
  <div id="main-div">
    <div id="div-title">
      <el-breadcrumb :separator-icon="ArrowRight">
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/bom/orderBOM' }">订单BOM</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/bom/productBOM' }">产品BOM</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/bom/materialBOM' }">物料BOM</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/bom/orderBOM' }">{{ $t('bom.orderBOM') }}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/bom/productBOM' }">{{ $t('bom.productBOM') }}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/bom/materialBOM' }">{{ $t('bom.materialBOM') }}</el-breadcrumb-item>
        <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }"></el-breadcrumb-item>
      </el-breadcrumb>
    </div>

 north-glass-erp/northglass-erp/src/views/sd/bom/MaterialBOM.vue

@@ -133,9 +133,9 @@
  {title: t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:'left'},
  { type: 'seq',fixed:'left', title: t('basicData.Number'), width: '80' },
  {field: 'id', width: '150',title: t('ingredients.materialCode'), sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'bomType',title: '类型', showOverflow:'ellipsis' },
  {field: 'consume',title: '消耗量',showOverflow:'ellipsis' },
  {field: 'price',title: '使用价格',showOverflow:'ellipsis' }
  {field: 'bomType',title: t('bom.bomType'), showOverflow:'ellipsis' },
  {field: 'consume',title: t('bom.consume'),showOverflow:'ellipsis' },
  {field: 'price',title: t('bom.price'),showOverflow:'ellipsis' }
]
const bomTitle = [

@@ -211,13 +211,13 @@
        materialStore.value[i].consume= res.data.data[i].consume
        switch (res.data.data[i].bomType) {
          case '1':
            materialStore.value[i].bomType = '面积';
            materialStore.value[i].bomType = t('order.area');
            break;
          case '2':
            materialStore.value[i].bomType = '周长';
            materialStore.value[i].bomType = t('order.perimeter');
            break;
          case "3":
            materialStore.value[i].bomType = '数量';
            materialStore.value[i].bomType = t('order.quantity');
            break;
          default:
            materialStore.value[i].bomType = res.data.data[i].bomType; // 保留原值
@@ -443,26 +443,26 @@
        label-width="auto"
        class="demo-ruleForm"
    >
      <el-form-item label="使用类型" prop="type">
      <el-form-item :label="t('bom.usageType')" prop="type">
        <el-select v-model="ruleForm.type" autocomplete="off">
          <el-option label="面积" :value="1" />
          <el-option label="周长" :value="2" />
          <el-option label="数量" :value="3" />
          <el-option :label="t('order.area')" :value="1" />
          <el-option :label="t('order.perimeter')" :value="2" />
          <el-option :label="t('order.quantity')" :value="3" />
        </el-select>
      </el-form-item>

      <el-form-item label="消耗量" prop="consume">
      <el-form-item :label="t('bom.consume')" prop="consume">
        <el-input v-model="ruleForm.consume" autocomplete="off" />
      </el-form-item>

      <el-form-item label="价格" prop="price">
      <el-form-item :label="t('bom.price1')" prop="price">
        <el-input v-model="ruleForm.price" autocomplete="off" />
      </el-form-item>

      <el-form-item>
        <el-button style="margin-left: 235px" @click="resetForm(ruleFormRef)">重置</el-button>
        <el-button style="margin-left: 235px" @click="resetForm(ruleFormRef)">{{ $t('product.msg.reset') }}</el-button>
        <el-button style="float: right"  type="primary" @click="submitForm(ruleFormRef)">
          提交
          {{ $t('basicData.save') }}
        </el-button>

      </el-form-item>

 north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue

@@ -129,7 +129,7 @@
    {field: 'quantity',width:120,  title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
   // {field: 'goodsQuantity',width:120,  title: t('searchOrder.inventoryNum'), sortable: true},
    {field: 'area',width:120,  title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'bomPrice',width:120,  title: 'BOM成本',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'bomPrice',width:120,  title: t('bom.bomPrice'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'money',width:120,  title: t('order.money'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'createTime',width:120,filters:[{ data: '' }],slots: { filter: 'num1_filter' },   title: t('basicData.reportData'), sortable: true},
    {field: 'packType',width:120,  title: t('order.packType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

 north-glass-erp/northglass-erp/src/views/sd/bom/ProductBomAdd.vue

@@ -91,14 +91,14 @@
  },
  columns:[
    {title: '', width: '110', slots: { default: 'button_slot' },fixed:'left'},
    {field:'id',title: '物料编号', },
    {field: 'name', title: '物料名称'},
    {field: 'thickness', title: '厚度'},
    {field: 'width', title: '宽'},
    {field: 'height', title: '高'},
    {field:'consume',title: '消耗量' },
    {field:'unit',title: '单位' },
    {field:'price',title: '价格' }
    {field:'id',title: t('ingredients.materialCode') },
    {field: 'name', title: t('ingredientsStock.materialName')},
    {field: 'thickness', title: t('product.msg.allThickness')},
    {field: 'width', title: t('order.width')},
    {field: 'height', title: t('order.height')},
    {field:'consume',title: t('bom.consume') },
    {field:'unit',title: t('ingredients.unit') },
    {field:'price',title: t('bom.price1') }
  ],//表头参数
  data:[

@@ -114,8 +114,8 @@
  {title: t('basicData.add'), width: '110', slots: { default: 'button_slot' },fixed:'left'},
  {field: 'tabId', width: '150',title: 'BOMId', sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'id', width: '150',title: t('ingredients.materialCode'), sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'consume',title: '消耗量',showOverflow:'ellipsis' },
  {field: 'price',title: '使用价格',showOverflow:'ellipsis' }
  {field: 'consume',title: t('bom.consume'),showOverflow:'ellipsis' },
  {field: 'price',title: t('bom.price'),showOverflow:'ellipsis' }
]
const bomTitle = [

@@ -207,13 +207,13 @@
        materialStore.value[i].tabId= res.data.data[i].tabId
        switch (res.data.data[i].bomType) {
          case '1':
            materialStore.value[i].bomType = '面积';
            materialStore.value[i].bomType = t('order.area');
            break;
          case '2':
            materialStore.value[i].bomType = '周长';
            materialStore.value[i].bomType = t('order.perimeter');
            break;
          case "3":
            materialStore.value[i].bomType = '数量';
            materialStore.value[i].bomType = t('order.quantity');
            break;
          default:
            materialStore.value[i].bomType = res.data.data[i].bomType; // 保留原值
@@ -239,14 +239,14 @@
//拆分每个产品
const productList = computed(() => {
  const raw = (props.productName ?? '').toString().trim()
  if (!raw) return ['其它']
  if (!raw) return [t('bom.other')]

  const parts = raw
      .split(/[+*]/)
      .map(s => s.trim())
      .filter(Boolean)

  parts.push('其它')
  parts.push(t('bom.other'))

  return parts
})
@@ -267,7 +267,7 @@
  if (type !== 'add') return
  const key = activeProductIndex.value
  if (key=="" && key==null) {
    ElMessage.warning('请先选择一个产品标签')
    ElMessage.warning(t('bom.msg.msg1'))
    return
  }
  const plainRow = JSON.parse(JSON.stringify(row))

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -326,7 +326,7 @@
    {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left"},
    {field: 'orderId',width:120,  title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'orderNumber',width:120,  title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'finishedGoodsInventory.boxNo',width:120,  title: t('箱号'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'finishedGoodsInventory.boxNo',width:120,  title: t('productStock.boxNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'productName',width:120,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'width',width:120,  title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'height',width:120,  title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -463,10 +463,10 @@
        [
          { code: 'sheet1', name: t('basicData.print'), prefixIcon: 'vxe-icon-file-txt', visible: true},
          { code: 'sheet2', name: t('basicData.print')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: true},
          { code: 'sheet3', name: t('洛阳打印无尺寸'), prefixIcon: 'vxe-icon-file-txt', visible: false},
          { code: 'sheet4', name: t('洛阳打印无尺寸')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: false},
          { code: 'sheet5', name: t('洛阳打印有尺寸'), prefixIcon: 'vxe-icon-file-txt', visible: false},
          { code: 'sheet6', name: t('洛阳打印有尺寸')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: false},
          { code: 'sheet3', name: t('delivery.print1'), prefixIcon: 'vxe-icon-file-txt', visible: false},
          { code: 'sheet4', name: t('delivery.print1')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: false},
          { code: 'sheet5', name: t('delivery.print2'), prefixIcon: 'vxe-icon-file-txt', visible: false},
          { code: 'sheet6', name: t('delivery.print2')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: false},
        ]
      ]
    }

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue

@@ -27,7 +27,6 @@
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
  }

 north-glass-erp/northglass-erp/src/views/sd/glassPrice/ProductList.vue

@@ -241,7 +241,7 @@
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
    {field: 'id', title: t('basicData.number'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'productName', title: t('product.productName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'productAbbreviation', title: '产品简称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'productAbbreviation', title: t('product.msg.productAbbreviation'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'basicGlassType.typeName', title: t('product.typeName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'query', title: t('product.query'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
    {field: 'remarks', title: t('basicData.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},

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

@@ -1689,7 +1689,7 @@
  row.fileName = name
  row.fileData = fileData
  row.shape=2
  ElMessage.success("保存成功")
  ElMessage.success(t('basicData.msg.saveSuccess'))
  alienEditorVisible.value=false

}

 north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue

@@ -157,7 +157,7 @@
          productTotal.value.creator !== userInfo.user.userName
          & company.notChangeProduct
      ){
    ElMessage.warning('创建人是：'+productTotal.value.creator+'    无法操作！')
    ElMessage.warning(t('product.msg.msg1')+productTotal.value.creator+t('product.msg.msg2'))
    return;
  }

@@ -196,7 +196,7 @@
//审核产品状态
const updateProductState =  (state) => {
  if(productTotal.value.id!==null && productTotal.value.creator!==userInfo.user.userName && company.notChangeProduct){
    ElMessage.warning('创建人是：'+productTotal.value.creator+'    无法操作！')
    ElMessage.warning(t('product.msg.msg1')+productTotal.value.creator+t('product.msg.msg2'))
    return;
  }
  request.post(`/product/updateProductStateById/${productTotal.value.id}/${state}/${userInfo.user.userName}`).then((res) =>{

 north-glass-erp/src/main/java/com/example/erp/dto/mm/MaterialLogDTO.java

@@ -59,6 +59,8 @@
    private String batch;
    @ExcelProperty("销售单号")
    private String orderId;
    @ExcelProperty("生产日期")
    private LocalDate dateOfManufacture;




 north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java

@@ -55,5 +55,7 @@

    private MaterialOutbound materialOutbound;

    private MaterialOutboundDetail materialOutboundDetail;


}

 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml

@@ -59,6 +59,8 @@
        <result column="order_id" property="materialOutbound.orderId"/>
        <result column="project" property="materialOutbound.project"/>
        <result column="batch" property="materialOutbound.batch"/>

        <result column="date_of_manufacture" property="materialOutboundDetail.dateOfManufacture"/>
    </resultMap>


@@ -1012,6 +1014,7 @@
    <select id="getMaterialLogReport" resultMap="selectMaterialOutboundLog">
        select *
        from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
        left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
        <where>
            date(ml.operate_time)>=#{startDate} and date(ml.operate_time) &lt;= #{endDate} and ml.operate_type=#{type}
            <if test="materialLog.operateType != null and materialLog.operateType != ''">
@@ -1085,6 +1088,7 @@
        select CEILING(count(ml.id)/#{pageSize}) as 'pageTotal',
        count(ml.id) as 'total'
        from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
        left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
        <where>
            date(ml.operate_time)>=#{startDate} and date(ml.operate_time) &lt;= #{endDate} and ml.operate_type=#{type}
            <if test="materialLog.operateType != null and materialLog.operateType != ''">
@@ -1155,6 +1159,7 @@
    <select id="exportMaterialLogReport" >
        select *
        from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
                                left join mm.material_outbound_detail md on md.material_outbound_id=ml.operation_order_number and md.material_outbound_number=ml.operation_number
        where  date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type=#{type}

    </select>