中英俄文补充

chenlu

2024-11-06 45e0b5f776976faffbc7a22ba106e13d0e57ed21

中英俄文补充

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

@@ -46,7 +46,7 @@
    {field: 'buildingNumber',width:120,  title: t('order.buildingNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
    {field: 'productId',width:140,  title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'productName',width:300,  title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'otherColumns.S01',width:140,  title: '编号',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'otherColumns.S01',width:140,  title: t('reportingWorks.glassNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    //{field: 'grossAmount',width:160,  title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'width',width:120,  title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'height',width:140,  title: t('order.height'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},

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

@@ -92,8 +92,8 @@
            noProductDataInTheTable:'There is no product data in the table',
            tableDataExceedsMaximumLimit:'The table data exceeds the maximum limit',
            range9999Dec: "Please enter a four digit integer",
            quantityError: "数量错误，请刷新再保存",
            dataDoesNotExist: "数据不存在",
            quantityError: "Quantity Error",
            dataDoesNotExist: "Data Does Not Exist",
        }
    },
    product:{
@@ -272,7 +272,7 @@
            calculationAreaPrompt5:'Do you want to continue creating duplicate orders',

            pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
            grossAreaIsNot0:'存在实际总面积等于0',
            grossAreaIsNot0:'There is an actual total area equal to0',
        }

    },
@@ -340,7 +340,7 @@
    workOrder:{
        page:{
            selectWorkOrder:'Work order',
            addWorkOrder:'转生产订单'
            addWorkOrder:'Forward production order'
        },
        productionId:'Production Order Number',
        convert:'Convert',
@@ -359,10 +359,10 @@
            productionScheduling:'Production Scheduling',
            selectPrintProject:'Engineering Printing',
            selectPrintFlowCard:"print",
            splittingDetails:"分架查询",
            addProcessCard:"分架新增",
            printFlowCard:"流程卡打印",
            selectDetailProcessCard:"流程卡明细查询"
            splittingDetails:"Frame query",
            addProcessCard:"Split-frame addition",
            printFlowCard:"Process card printing",
            selectDetailProcessCard:"Process card details query"
        },
        processId:'Process Card Number',
        founder:'Divider',
@@ -377,6 +377,7 @@
        weight:'Weight',
        selectedQuantity:'Select Quantity',
        establishProcessCards:'Add',
        createBySequenceNumber:'By Sequence Number',
        return:'Return',
        ProductionSchedulingOk:'Scheduled Production',
        ProductionSchedulingNo:'Unscheduled Production',
@@ -434,6 +435,8 @@
        landingSequence:'Landing sequence',

        labelStyle:'Label Style',
        detailPrinting:'Detail Printing',
        detailsPrintedSeparately:'Details Printed Separately',
        customLabelPrinting:'Custom label printing',
        labelPrinting:'Lable Printing',
        sortingSuccessful:'Sorting successful',
@@ -448,11 +451,18 @@
        mergePrinting:'Merge printing',
        printStatus:'Print times',
        labelPrinting2:'Label printing 2',
        finishedProductPrinting2:'Finished Product Printing2',
        editablePrinting:'Editable Printing',
        invertSelection:'Invert Selection',
        sortSummary:'Sort Summary',
        addAutomatically:'Auto fill',
        selectFill:'Selected fill',
        engineeringPrinting:'Engineering Printing',
        pleaseSelectProject:'Please Select Project',

        mergeState:'合并状态',

        mergeState:'Merge State',
        merge:'Merge',
    },
    reportingWorks:{
        page:{
@@ -532,7 +542,7 @@
        thisCompletedQuantity:'This Completed Quantity',
        thisWornQuantity:'This Worn Quantity',
        passAudit:'Pass The Audit',

        patchCondition:'Patch Condition',

        selectResponsibleTeam:'Please select a responsible team',
        selectWorkReportingTeam:'Please select a responsible team',
@@ -565,7 +575,7 @@
        page:{
            productStockList:"Stock Inquiry",
            createProductStock:"Finished product Into Stock",
            storageRecord:"出入库记录",
            storageRecord:"Entry and exit records",
            orderAllocation:'Order Allocation',
            finishedProductOut:'Finished Product Out Of Stock',
            finishedGoodsIssue:'Finished Goods Delivery',
@@ -662,10 +672,10 @@
        typeClaim:'Take out type',
        pleaseEnterTheBoxNumber:'Please enter the box number',

        boxNumber:'箱号',
        msg1:'发货单已出库请刷新界面',
        msg2:'发货单库存数不存在',
        msg3:'入库数量不能超过订单总数'
        boxNumber:'Case number',
        msg1:'The invoice is out of the warehouse. Please refresh the interface',
        msg2:'Invoice inventory number does not exist',
        msg3:'The quantity of incoming orders shall not exceed the total number of orders'
    },
    customer:{
        page:{
@@ -740,7 +750,7 @@
        freightPrice:'Freight Price',
        freightQuantity:'Freight Quantity',
        freight:'Freight Money',
        pleaseMsg1:'订单存在其他金额单价没有填写',
        pleaseMsg1:'There are other amounts in the order and the unit price is not filled in',

    },
    replenish:{
@@ -772,6 +782,7 @@
        reworkProcess:'Rework Process',
        reworkType:'Rework Type',
        reworkArea:'Rework Area',
        responsibilityInformation:'responsibility Information',
        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',
@@ -783,7 +794,7 @@
            roleList:'Role Home',
        },
        id:'ID',
        characterHomepage:'角色首页',
        characterHomepage:'Role Home',
        role:'Character',
        roleAdd:'Role addition',
        menu:'Menu',
@@ -813,6 +824,7 @@
        ConfirmPasswordCannotBeEmpty:'Confirm that the password cannot be empty',
        TheTwoPasswordsAreNotTheSame:'Two different passwords',
        OldPasswordError:'Old password error',
        roleSelection:'Role Selection',

        userName:'User name',
        changeUserName:'Modifying a user name',
@@ -860,7 +872,7 @@
    },
    machine:{
        page:{
            selectMachine:'设备管理',
            selectMachine:'Equipment management',
            addMachine:"Device addition",
            maintenanceAndRepair:"Maintenance and repair",
            addMaintenanceAndRepair:"Maintenance and repair added"
@@ -993,16 +1005,16 @@
        films :'Coating Type',
        pleaseEnterData :'Please enter data',
        pleaseEnter :'Please enter',
        msg1 :'库存已存在此物料不能删除',
        unit :'单位',
        msg1 :'This material is already in stock and cannot be deleted',
        unit :'unit',
    },
    ingredientsStock:{
        page:{
            selectIngredientsStock:"Material inventory",
            materialOutbound:"Material delivery",
            returnToStorage:"Return to the warehouse",
            selectSurplusMaterials:"余料管理",
            createOutbound:'物料出库新增',
            selectSurplusMaterials:"Waste material management",
            createOutbound:'New material delivery',
            returnToStorageCreate:'Returned warehouse addition'
        },
        materialName :'Material name',
@@ -1045,10 +1057,10 @@
        materialReturnType :'Material return type',
        createTime :'Returned warehouse date',

        surplusMaterialManagement :'余料管理',
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
        pleaseSelectTheTypeOfReturnToStock:'请选择返库类型'
        surplusMaterialManagement :'Waste material management',
        additionOfSurplusMaterials :'Surplus addition',
        excessMaterialOutflow :'Residual materials out of storage',
        pleaseSelectTheTypeOfReturnToStock:'Please select a return type'
    },
    warehouseBasicData:{
        page:{
@@ -1063,17 +1075,17 @@
    stockReport:{
        page:{
            warehouseReport:"Warehouse Basic Data",
            finishedProductReport:"成品报表",
            materialReport:"物料报表",
            finishedProductReport:"Finished product report",
            materialReport:"Material statement",

        },
        finishedProductInventoryReport:"成品入库报表",
        finishedProductOutboundReport:"成品出库报表",
        finishedProductTransferReport:"成品调拨报表",
        finishedProductDeliveryReport:"成品领出报表",
        materialAdditionReport:"物料新增报表",
        materialOutboundReport:"物料出库报表",
        materialReturnReport:"物料返库报表",
        finishedProductInventoryReport:"Finished product receipt report",
        finishedProductOutboundReport:"Finished product delivery report",
        finishedProductTransferReport:"Finished product transfer report",
        finishedProductDeliveryReport:"Finished product take-out report",
        materialAdditionReport:"Material addition report",
        materialOutboundReport:"Material delivery report",
        materialReturnReport:"Material return report",
    },
    components:{
        addNewSignature :'Add label name',
@@ -1126,21 +1138,21 @@
        glassPrice:'Glass Price'
    },
    glassPrice:{
        glassPriceComputed:'玻璃报价',
        priceSet:'价格设置',
        priceList:'价格列表',
        glassPriceComputed:'Glass quotation',
        priceSet:'Price setting',
        priceList:'Price list',
        msg:{
            error1:'请选择全部参数',
            error2:'此膜系已经存在，请重新选择',
            success:'数据保存成功',
            addProduce:'请先添加产品'
            error1:'Please select all parameters',
            error2:'This membrane system already exists, please re-select',
            success:'Data saved successfully',
            addProduce:'Please add the product first'
        },
        glass:'玻璃',
        interlayer:'夹胶',
        hollow:'中空',
        process:'工艺',
        addProduce:'选择产品',
        reorder:'转订单'
        glass:'glass',
        interlayer:'gum',
        hollow:'hollow',
        process:'process',
        addProduce:'Select product',
        reorder:'reorder'
    }



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

@@ -377,6 +377,7 @@
        weight:'Вес',
        selectedQuantity:'Выберите количество',
        establishProcessCards:'Карта процесса создания',
        createBySequenceNumber:'按序号创建',
        return:'Возвращение',
        ProductionSchedulingOk:'Организовано производство',
        ProductionSchedulingNo:'Неорганизованное производство',
@@ -435,6 +436,8 @@
        landingSequence:'Landing sequence',

        labelStyle:'Стиль метки',
        detailPrinting:'明细打印',
        detailsPrintedSeparately:'明细分架打印',
        customLabelPrinting:'Настройка печати вкладок',
        labelPrinting:'标签打印',
        sortingSuccessful:'Сортировать успешно',
@@ -449,11 +452,16 @@
        mergePrinting:'Слияние печати',
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        finishedProductPrinting2:'成品打印2',
        editablePrinting:'可编辑打印',
        invertSelection:'反选',
        sortSummary:'排序汇总',
        addAutomatically:'自动填充',
        selectFill:'自动填充',
        engineeringPrinting:'Инженерная печать',

        pleaseSelectProject:'请选择工程',
        mergeState:'合并状态',
        merge:'合并',
    },
    reportingWorks:{
        page:{
@@ -533,7 +541,7 @@
        thisCompletedQuantity:'Это процесс завершена.',
        thisWornQuantity:'Это процесс повреждение ',
        passAudit:'Проверка прошла',

        patchCondition:'补片状态',

        selectResponsibleTeam:'Пожалуйста, выберите группу ответственности.',
        selectWorkReportingTeam:'Пожалуйста, выберите группу ответственности.',
@@ -772,6 +780,7 @@
        reworkProcess:'Переработка',
        reworkType:'Тип переработки',
        reworkArea:'Площадь переработки',
        responsibilityInformation:'责任信息',
        PleaseSelectAReworkTeam:'Пожалуйста, выберите рабочую группу.',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'Переработка не должна превышать количество повреждений.',
        reworkQuantityCannotBeEmptyOr0:'Переработка не может быть пустой или нулевой.',
@@ -783,6 +792,7 @@
            roleList:'Персонажи Начальная страница',
        },
        id:'ID',
        characterHomepage:'角色首页',
        role:'Роль',
        roleAdd:'Увеличение роли',
        menu:'Меню',
@@ -813,6 +823,7 @@
        ConfirmPasswordCannotBeEmpty:'Пароль подтверждения не может быть пустым',
        TheTwoPasswordsAreNotTheSame:'Два разных пароля.',
        OldPasswordError:'Старая ошибка пароля',
        roleSelection:'角色选择',

        userName:'用户名称',
        changeUserName:'修改用户名称',

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

@@ -377,6 +377,7 @@
        weight:'重量',
        selectedQuantity:'选中数量',
        establishProcessCards:'建立流程卡',
        createBySequenceNumber:'按序号创建',
        return:'返回',
        ProductionSchedulingOk:'已排产',
        ProductionSchedulingNo:'未排产',
@@ -435,6 +436,8 @@
        landingSequence:'落架顺序',

        labelStyle:'标签样式',
        detailPrinting:'明细打印',
        detailsPrintedSeparately:'明细分架打印',
        customLabelPrinting:'自定义标签打印',
        labelPrinting:'标签打印',
        sortingSuccessful:'排序成功',
@@ -449,11 +452,18 @@
        mergePrinting:'合并打印',
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        finishedProductPrinting2:'成品打印2',
        editablePrinting:'可编辑打印',
        invertSelection:'反选',
        sortSummary:'排序汇总',
        addAutomatically:'自动填充',
        selectFill:'选中填充',
        engineeringPrinting:'工程打印',

        pleaseSelectProject:'请选择工程',
        mergeState:'合并状态',
        merge:'合并',


    },
    reportingWorks:{
        page:{
@@ -533,6 +543,7 @@
        thisCompletedQuantity:'本工序完工',
        thisWornQuantity:'本工序次破',
        passAudit:'审核通过',
        patchCondition:'补片状态',


        selectResponsibleTeam:'请选择责任班组',
@@ -772,6 +783,7 @@
        reworkProcess:'返工工序',
        reworkType:'返工类型',
        reworkArea:'返工面积',
        responsibilityInformation:'责任信息',
        PleaseSelectAReworkTeam:'请选择返工班组',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'返工数量不能大于次破数量',
        reworkQuantityCannotBeEmptyOr0:'返工数量不能为空或者是0',
@@ -813,6 +825,7 @@
        ConfirmPasswordCannotBeEmpty:'确认密码不能为空',
        TheTwoPasswordsAreNotTheSame:'两次密码不相同',
        OldPasswordError:'旧密码错误',
        roleSelection:'角色选择',

        userName:'用户名称',
        changeUserName:'修改用户名称',

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

@@ -39,10 +39,10 @@
            </span>
              <template #dropdown>
                <el-dropdown-menu>
                  <el-dropdown-item command="/main/stockReport/finishedProductInventoryReport" >{{$t('成品入库报表')}}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/finishedProductOutboundReport" >{{ $t('成品出库报表') }}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/finishedProductTransferReport" >{{ $t('成品调拨报表') }}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/finishedProductDeliveryReport" >{{ $t('成品领出报表') }}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/finishedProductInventoryReport" >{{$t('stockReport.finishedProductInventoryReport')}}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/finishedProductOutboundReport" >{{ $t('stockReport.finishedProductOutboundReport') }}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/finishedProductTransferReport" >{{ $t('stockReport.finishedProductTransferReport') }}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/finishedProductDeliveryReport" >{{ $t('stockReport.finishedProductDeliveryReport') }}</el-dropdown-item>
                </el-dropdown-menu>
              </template>
            </el-dropdown>
@@ -62,9 +62,9 @@
            </span>
              <template #dropdown>
                <el-dropdown-menu>
                  <el-dropdown-item command="/main/stockReport/materialAdditionReport" >{{$t('物料新增报表')}}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/materialOutboundReport" >{{ $t('物料出库报表') }}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/materialReturnReport" >{{ $t('物料返库报表') }}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/materialAdditionReport" >{{$t('stockReport.materialAdditionReport')}}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/materialOutboundReport" >{{ $t('stockReport.materialOutboundReport') }}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/materialReturnReport" >{{ $t('stockReport.materialReturnReport') }}</el-dropdown-item>
                </el-dropdown-menu>
              </template>
            </el-dropdown>

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

@@ -899,7 +899,7 @@
            <el-button type="primary" @click="createProcessCard">{{ $t('processCard.establishProcessCards') }}
            </el-button>
            <br><br><br><br><br>
            <el-button type="primary" @click="createProcessCardNo">按序号创建
            <el-button type="primary" @click="createProcessCardNo">{{ $t('processCard.createBySequenceNumber') }}
            </el-button>
          </el-main>
        </div>

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

@@ -338,7 +338,7 @@
      {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
      {code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
      {code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
      {code: 'sortTable', name: "排序汇总", status: 'primary'},
      {code: 'sortTable', name: t('processCard.sortSummary'), status: 'primary'},
      // {code: 'printTest', name: "测试打印", status: 'primary'},
      // {code: 'printLike', name: "同配置打印", status: 'primary'},
    ],
@@ -821,7 +821,7 @@
    <el-dialog
        id="sizeCheck"
        v-model="dialogSortTable"
        title="排序汇总"
        :title="$t('processCard.sortSummary')"
        destroy-on-close
        style="width: 80%;height:75% ">
      <select-sort-table id="child" :orderId="tableRow.orderId"/>

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

@@ -345,9 +345,9 @@
      {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
      {code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
      {code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
      {code: 'printLabel3', name: '成品打印2', status: 'primary'},
      {code: 'printTest', name: "可编辑打印", status: 'primary'},
      {code: 'invertSelection', name: "反选", status: 'primary'},
      {code: 'printLabel3', name: t('processCard.finishedProductPrinting2'), status: 'primary'},
      {code: 'printTest', name: t('processCard.editablePrinting'), status: 'primary'},
      {code: 'invertSelection', name: t('processCard.invertSelection'), status: 'primary'},
      // {code: 'printLike', name: "同配置打印", status: 'primary'},
    ],
    // import: false,

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

@@ -271,7 +271,7 @@
  toolbarConfig: {
    buttons: [

      {code: 'printLabel3', name: '成品打印2', status: 'primary'},
      {code: 'printLabel3', name: t('processCard.finishedProductPrinting2'), status: 'primary'},
      // {code: 'printLike', name: "同配置打印", status: 'primary'},
    ],
    // import: false,

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

@@ -431,7 +431,7 @@
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()
            if (selectRecords.length == 0) {
              ElMessage.warning("请勾选排产数据")
              ElMessage.warning(t('processCard.checkProductionScheduling'))
              return;
            }
            for (let i = 0; i < selectRecords.length; i++) {
@@ -440,13 +440,13 @@
              let number = selectRecords[i].schedulingQuantity
              //计划开始、结束时间，排产数量不能为空
              if (start == null || end == null || number == null) {
                ElMessage.warning("请填入对应的值再进行保存")
                ElMessage.warning(t('processCard.saveCorrespondingValues'))
                return;
              }
            }
            let selectProcesses = processVal.value
            if (selectProcesses == null || selectProcesses == "") {
              ElMessage.warning("请选择排产工序")
              ElMessage.warning(t('processCard.selectProductionSchedulingProcess'))
              return;
            }

@@ -460,7 +460,7 @@
            //保存排产数据
            request.post("/productionScheduling/addScheduling", schedulingData.value).then((res) => {
              if (res.code == 200) {
                ElMessage.success("保存成功")
                ElMessage.success(t('basicData.msg.saveSuccess'))
                // 启用保存
                gridOptions.toolbarConfig.buttons[2].disabled = false
                router.push({
@@ -485,11 +485,11 @@
          const selectRecords = $table.getCheckboxRecords()
          if ($table) {
            if (selectRecords.length == 0) {
              ElMessage.warning("请勾选排产数据")
              ElMessage.warning(t('processCard.checkProductionScheduling'))
              return;
            }

            const type = await VXETable.modal.confirm('您确定要删除该数据?')
            const type = await VXETable.modal.confirm(t('processCard.deleteThisData'))
            if (type === 'confirm') {
              let schedulingData = ref({
                scheduling: selectRecords,
@@ -497,7 +497,7 @@

              request.post("/productionScheduling/deleteScheduling", schedulingData.value).then((res) => {
                if (res.code == 200) {
                  ElMessage.success("删除成功")
                  ElMessage.success(t('basicData.msg.deleteSuccess'))
                  location.reload();
                } else {
                  ElMessage.warning(res.msg)
@@ -517,7 +517,7 @@
          let inputVal = form.orderId
          if ($table) {
            if (selectRecords.length == 0) {
              ElMessage.warning("请勾选排产数据")
              ElMessage.warning(t('processCard.checkProductionScheduling'))
              return;
            }
            let schedulingData = ref({
@@ -526,7 +526,7 @@
            })
            request.post("/productionScheduling/examineScheduling", schedulingData.value).then((res) => {
              if (res.code == 200) {
                ElMessage.success("审核成功")
                ElMessage.success(t('basicData.msg.ReviewSuccess'))
                router.push({
                  path: '/main/processCard/ProductionScheduling',
                  query: {random: Math.random()}
@@ -545,7 +545,7 @@
          const selectRecords = $table.getCheckboxRecords()
          if ($table) {
            if (selectRecords.length == 0) {
              ElMessage.warning("请勾选排产数据")
              ElMessage.warning(t('processCard.checkProductionScheduling'))
              return;
            }
            let schedulingData = ref({
@@ -554,7 +554,7 @@
            })
            request.post("/productionScheduling/cancelReviewScheduling", schedulingData.value).then((res) => {
              if (res.code == 200) {
                ElMessage.success("反审成功")
                ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
                location.reload();
              } else {
                ElMessage.warning(res.msg)
@@ -629,7 +629,7 @@
  let selectState = stateValue.value
  selectRecords.forEach((selectRecords) => {
    if (selectRecords.schedulingQuantity > selectRecords.pendingProductionQuantity) {
      ElMessage.warning("排产数量不能大于待排产数量")
      ElMessage.warning(ElMessage.warning(t('processCard.schedulingQuantityNoQuantityScheduled')))
      //禁用保存按钮
      //gridOptions.toolbarConfig.buttons[2].disabled = true
    }
@@ -657,9 +657,9 @@
        <el-date-picker
            v-model="orderInfo.workOrderDate"
            :default-time="defaultTime"
            end-placeholder="结束时间"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
            start-placeholder="开始时间"
            type="daterange"
            value-format="YYYY-MM-DD"

@@ -676,7 +676,7 @@
          />
        </el-select>
        &nbsp;
        <el-select v-model="stateValue" class="m-2" placeholder="是否排产" style="width: 120px">
        <el-select v-model="stateValue" class="m-2" :placeholder="$t('processCard.whetherToScheduleProduction')" style="width: 120px">
          <el-option
              v-for="item in stateOptions"
              :key="item.value"

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

@@ -153,7 +153,7 @@

  toolbarConfig: {
    buttons: [
      {'code': 'add', 'name': "合并",status: 'primary'}
      {'code': 'add', 'name': t('processCard.merge'),status: 'primary'}
    ],
    import: false,
    // export: true,

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

@@ -230,8 +230,8 @@
    buttons: [
      {code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
      {'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
      {code: 'detailsPrint', name: '明细打印', status: 'primary'},
      {code: 'detailsProcessPrint', name: '明细分架打印', status: 'primary'},
      {code: 'detailsPrint', name: t('processCard.detailPrinting'), status: 'primary'},
      {code: 'detailsProcessPrint', name: t('processCard.detailsPrintedSeparately'), status: 'primary'},

    ],

@@ -357,7 +357,7 @@
            :icon="Search"
            type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
        </el-button>
        <vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value"  content="合并" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
        <vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value"  :content="$t('processCard.merge')" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
      </el-row>
    </div>
    <vxe-grid

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

@@ -111,12 +111,12 @@
      remove(gridOptions.toolbarConfig.slots)
      const button = {'code': 'printLabel',
        status: 'primary',
        'name': "成品打印2"}
        'name': t('processCard.finishedProductPrinting2')}
      gridOptions.toolbarConfig.buttons.push(button)

      const button2 = {'code': 'detailPrinting',
        status: 'primary',
        'name': "明细打印"}
        'name': t('processCard.detailPrinting')}
      gridOptions.toolbarConfig.buttons.push(button2)

    }
@@ -243,7 +243,7 @@
        }
        case 'printLabel': {
          if(rowClickIndex.value===null){
            ElMessage.warning(t('请选择工程'))
            ElMessage.warning(t('processCard.pleaseSelectProject'))
            return
          }
          labelRow.value.type = '恒鑫'
@@ -256,7 +256,7 @@
        }
        case 'detailPrinting': {
          if(rowClickIndex.value===null){
            ElMessage.warning(t('请选择工程'))
            ElMessage.warning(t('processCard.pleaseSelectProject'))
            return
          }
          router.push({path: '/main/processCard/PrintProjectDetails', query: {projectNo: rowClickIndex.value.project_no}})

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

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

 north-glass-erp/northglass-erp/src/views/pp/report/CrossProcessBreaking.vue

@@ -7,7 +7,7 @@
const childrenData = ref({
  columns:[
    {type:'expand',fixed:"left",width: 80},
    {type: 'seq',fixed:"left", title: '自序', width: 80 },
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
    {field: 'reportingWorkTime', width: 120, title: t('reportingWorks.reportingWorkTime'), sortable: true, },
    {field: 'processId', width: 160,title: t('processCard.processId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'code', width: 160,title: t('reportingWorks.glassNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue

@@ -380,7 +380,7 @@
        &nbsp;&nbsp;
        <el-input v-model="form.project" clearable :placeholder="$t('order.project')" style="width: 130px"></el-input>
        &nbsp;
        <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
        <el-select v-model="value" clearable :placeholder="$t('reportingWorks.selectProcess')" default-value="default_city" style="width: 120px">
          <el-option
              v-for="item in titleSelectJson['processType']"
              :key="item.id"

 north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue

@@ -216,12 +216,12 @@
  <div class="main-div-customer" >
    <div id="selectForm">
      <el-row :gutter="0">
<!--        <el-input-->
<!--            v-model="form.orderId"-->
<!--            clearable-->
<!--            :disabled="props.orderId"-->
<!--            :placeholder="$t('order.orderId')"-->
<!--            style="width: 130px"></el-input>-->
        <el-input
            v-model="form.orderId"
            clearable
            :disabled="props.orderId"
            :placeholder="$t('order.orderId')"
            style="width: 130px"></el-input>
        <el-date-picker
            v-model="time.date1"
            :start-placeholder="$t('basicData.startDate')"

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

@@ -104,7 +104,7 @@
        layer= res.data.layer

        //添加补片状态列
        let column = {field: 'patchStatusOther', width: 90,title: res.data.title}
        let column = {field: 'patchStatusOther', width: 90,title: t('reportingWorks.patchCondition')}
        gridOptions.columns.push(column)

        const s01Values = [];

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

@@ -337,7 +337,7 @@
    {field: 'deviceName', width: 100,title: t('reportingWorks.deviceType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
    {field: 'teamsGroupsName',width: 120, title: t('reportingWorks.teamsType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
    {field: 'reviewedState',width: 120, title: t('processCard.reviewedState'), },
    {field: 'reviewed',width: 120, title: '审核人', },
    {field: 'reviewed',width: 120, title: t('processCard.reviewed'), },
    {field: 'notes',width: 120, title: t('basicData.remarks'), },

  ],//表头按钮

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

@@ -308,7 +308,7 @@
    {field: 'rework_area', title:  t('order.area'),width:70},
    {field: 'rework_team', title:  t('reportingWorks.responsibleTeam'),width:90},
    {field: 'responsible_equipment', title:  t('reportingWorks.responsibleEquipment'),width:120},
    {field: 'responsible_personnel', title:  '责任信息',width:100},
    {field: 'responsible_personnel', title:  t('rework.responsibilityInformation'),width:100},
    {field: 'rework_type', title:  t('reportingWorks.breakageType'),width:80},
    {field: 'rework_reason', title:  t('reportingWorks.breakageReason'),width:90},
    {field: 'rework_processes', title:  t('reportingWorks.responsibleProcess'),width:80},

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

@@ -16,7 +16,7 @@
    {field: 'order.batch',width:120, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'productId',width:120, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'productName',width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderNumber',width:120, title: '订单序号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderNumber',width:120, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    // {field: 'buildingNumber',width:120, title: '楼号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'width',width:120, title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'height',width:120, title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

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

@@ -213,7 +213,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/system/role/RoleList.vue

@@ -336,6 +336,7 @@
              :options="options"
              @change="selectChange"
              clearable
              :placeholder="$t('processCard.pleaseSelect')"
          />
        </template>
        <template #save_buttons>

 north-glass-erp/northglass-erp/src/views/system/user/UserList.vue

@@ -171,7 +171,7 @@

    <el-dialog
        v-model="dialogVisible"
        title="角色选择"
        :title="$t('user.roleSelection')"
        width="30%"
        :before-close="handleClose"
    >