Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-11-11 8f7c5b48419ee7fb720f9c23884b86d09f1522f0

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 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,20 @@
        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',
        printQuantity:'Print Quantity',
        printWarn1:'The print quantity cannot be greater than the order quantity'
    },
    reportingWorks:{
        page:{
@@ -532,7 +544,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',
@@ -559,13 +571,14 @@
        pleaseNumber7:'The quantity cannot be greater than the quantity of the previous process',
        pleaseNumber8:'Please enter serial number',
        pleaseNumber9:'Correct number of completions or breakdowns',
        pleaseNumber10:'The number of completions cannot be greater than the number of process cards',

    },
    productStock:{
        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 +675,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 +753,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 +785,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 +797,7 @@
            roleList:'Role Home',
        },
        id:'ID',
        characterHomepage:'角色首页',
        characterHomepage:'Role Home',
        role:'Character',
        roleAdd:'Role addition',
        menu:'Menu',
@@ -813,6 +827,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 +875,7 @@
    },
    machine:{
        page:{
            selectMachine:'设备管理',
            selectMachine:'Equipment management',
            addMachine:"Device addition",
            maintenanceAndRepair:"Maintenance and repair",
            addMaintenanceAndRepair:"Maintenance and repair added"
@@ -993,16 +1008,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 +1060,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 +1078,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 +1141,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,18 @@
        mergePrinting:'Слияние Ð¿ÐµÑ‡Ð°Ñ‚и',
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        finishedProductPrinting2:'成品打印2',
        editablePrinting:'可编辑打印',
        invertSelection:'反选',
        sortSummary:'排序汇总',
        addAutomatically:'自动填充',
        selectFill:'自动填充',
        engineeringPrinting:'Инженерная Ð¿ÐµÑ‡Ð°Ñ‚ÑŒ',

        pleaseSelectProject:'请选择工程',
        mergeState:'合并状态',
        merge:'合并',
        printQuantity:'打印数',
        printWarn1:'打印数量不能大于订单数量'
    },
    reportingWorks:{
        page:{
@@ -533,7 +543,7 @@
        thisCompletedQuantity:'Это Ð¿Ñ€Ð¾Ñ†ÐµÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°.',
        thisWornQuantity:'Это Ð¿Ñ€Ð¾Ñ†ÐµÑÑ Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ ',
        passAudit:'Проверка Ð¿Ñ€Ð¾ÑˆÐ»Ð°',

        patchCondition:'补片状态',

        selectResponsibleTeam:'Пожалуйста, Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚е Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ð¾Ñ‚ветственности.',
        selectWorkReportingTeam:'Пожалуйста, Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚е Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ Ð¾Ñ‚ветственности.',
@@ -560,6 +570,7 @@
        pleaseNumber7:'*количество Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°Ñ‚ÑŒ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚во Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐ¾Ð².',
        pleaseNumber8:'Введите ÑÐµÑ€Ð¸Ð¹Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€.',
        pleaseNumber9:'Правильное Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ Ð¸ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚во Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð½Ñ‹Ñ…',
        pleaseNumber10:'完工数不能大于流程卡数量',
    },
    productStock:{
        page:{
@@ -772,6 +783,7 @@
        reworkProcess:'Переработка',
        reworkType:'Тип Ð¿ÐµÑ€ÐµÑ€Ð°Ð±Ð¾Ñ‚ки',
        reworkArea:'Площадь Ð¿ÐµÑ€ÐµÑ€Ð°Ð±Ð¾Ñ‚ки',
        responsibilityInformation:'责任信息',
        PleaseSelectAReworkTeam:'Пожалуйста, Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚е Ñ€Ð°Ð±Ð¾Ñ‡ÑƒÑŽ Ð³Ñ€ÑƒÐ¿Ð¿Ñƒ.',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'Переработка Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°Ñ‚ÑŒ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚во Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ð¹.',
        reworkQuantityCannotBeEmptyOr0:'Переработка Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÑƒÑÑ‚ой Ð¸Ð»Ð¸ Ð½ÑƒÐ»ÐµÐ²Ð¾Ð¹.',
@@ -783,6 +795,7 @@
            roleList:'Персонажи ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð°Ñ ÑÑ‚раница',
        },
        id:'ID',
        characterHomepage:'角色首页',
        role:'Роль',
        roleAdd:'Увеличение Ñ€Ð¾Ð»Ð¸',
        menu:'Меню',
@@ -813,6 +826,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,19 @@
        mergePrinting:'合并打印',
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        finishedProductPrinting2:'成品打印2',
        editablePrinting:'可编辑打印',
        invertSelection:'反选',
        sortSummary:'排序汇总',
        addAutomatically:'自动填充',
        selectFill:'选中填充',
        engineeringPrinting:'工程打印',

        pleaseSelectProject:'请选择工程',
        mergeState:'合并状态',
        merge:'合并',
        printQuantity:'打印数',
        printWarn1:'打印数量不能大于订单数量'

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


        selectResponsibleTeam:'请选择责任班组',
@@ -560,6 +572,7 @@
        pleaseNumber7:'的数量不能大于上工序数量',
        pleaseNumber8:'请输入序号',
        pleaseNumber9:'正确的完工或次破数量',
        pleaseNumber10:'完工数不能大于流程卡数量',
    },
    productStock:{
        page:{
@@ -772,6 +785,7 @@
        reworkProcess:'返工工序',
        reworkType:'返工类型',
        reworkArea:'返工面积',
        responsibilityInformation:'责任信息',
        PleaseSelectAReworkTeam:'请选择返工班组',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'返工数量不能大于次破数量',
        reworkQuantityCannotBeEmptyOr0:'返工数量不能为空或者是0',
@@ -813,6 +827,7 @@
        ConfirmPasswordCannotBeEmpty:'确认密码不能为空',
        TheTwoPasswordsAreNotTheSame:'两次密码不相同',
        OldPasswordError:'旧密码错误',
        roleSelection:'角色选择',

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

 north-glass-erp/northglass-erp/src/stores/sd/companySet/½ð»ªÌì³É.js

File was renamed from north-glass-erp/northglass-erp/src/stores/sd/companySet/½ð»ªÀÖ¶¯.js
@@ -3,7 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        companyName: '金华市乐动智能科技有限公司',
        companyName: '金华福喜天成玻璃有限公司',
        address:'浙江省金华市金东区曹宅镇工业功能区鹤岩街28号2号',
        telephone:'189 3119 1362 èµ–厂长',
        fax:'',

 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/glassOptimize/GlassComputed.vue

New file
@@ -0,0 +1,47 @@
<script setup>
import ComputeCard from "@/views/pp/glassOptimize/page/ComputeCard.vue";
import ComputeDetail from "@/views/pp/glassOptimize/page/ComputeDetail.vue";
import Compute from "@/views/pp/glassOptimize/page/Compute.vue";

</script>

<template>
  <div style="width: 100%; height: 100%;">

    <div id="compute">
      <compute/>
    </div>

    <div id="computeCard">
      <compute-card/>
    </div>

    <div id="computeDetail">
      <compute-detail/>
    </div>

  </div>
</template>

<style scoped>
#compute{
  float: left;
  margin-top: -30px;
  margin-bottom: 2%;
  width: 100%;
  height: 40%;
}
#computeCard{
  margin-top: 90px;
  width: 64%;
  height: 40%;
  float: left;
}
#computeDetail{
  margin-top: 90px;
  margin-left: 1%;
  float: left;
  width: 35%;
  height: 40%;
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue

@@ -1,18 +1,16 @@
<script setup>
import GlassInventory from "@/views/pp/glassOptimize/page/GlassInventory.vue"
import ProjectDetail from "@/views/pp/glassOptimize/page/ProjectDetail.vue"
import ProjectCreate from "@/views/pp/glassOptimize/page/ProjectCreate.vue";
import ProjectCreate from "@/views/pp/glassOptimize/ProjectCreate.vue"
import GlassComputed from "@/views/pp/glassOptimize/GlassComputed.vue";
import ProjectMange from "@/views/pp/glassOptimize/ProjectMange.vue";

import {ref} from "vue";
let dialogVisible = ref(false)
let detailPage = ref(0)
const changeDialog = (value) => {
  switch (value) {
      case 1:
        dialogVisible.value = true
        break
      case 2:
        //dialogVisible.value = false
        break
  }
  detailPage.value = value
}
</script>

@@ -28,11 +26,13 @@

   <el-dialog
       v-model="dialogVisible"
       title="工程创建"
       :title="detailPage ===1? '创建工程' : detailPage ===2? '工程管理' : detailPage ===3? '模拟计算':''"
       destroy-on-close
       style="width: 90%;height:90%;margin-top: 3vh"
   >
     <project-create/>
     <project-create v-if="detailPage===1" />
     <project-mange  v-if="detailPage===2" />
     <glass-computed v-if="detailPage===3" />
   </el-dialog>

 </div>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectCreate.vue

New file
@@ -0,0 +1,50 @@
<script setup>
import ProcessCard from "@/views/pp/glassOptimize/page/ProcessCard.vue";
import ProcessCardDetail from "@/views/pp/glassOptimize/page/ProcessCardDetail.vue";
import ProjectList from "@/views/pp/glassOptimize/page/ProjectList.vue";

import {ref} from "vue";
import {useI18n} from "vue-i18n";



</script>

<template>
  <div style="width: 100%; height: 100%;">

    <div id="processCard">
      <process-card/>
    </div>

    <div id="processCard-detail">
      <process-card-detail/>
    </div>

    <div id="project-list">
      <project-list/>
    </div>

  </div>
</template>


<style scoped>
#processCard{
  width: 64%;
  height: 55%;
  float: left;
}
#processCard-detail{
  margin-left: 1%;
  float: left;
  width: 35%;
  height: 55%;
}
#project-list{
  float: left;
  margin-top: 2%;
  width: 100%;
  height: 30%;
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue

New file
@@ -0,0 +1,232 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
import {Search} from "@element-plus/icons-vue";
import {ElDatePicker} from "element-plus";
import useOrderInfoStore from "@/stores/sd/order/orderInfo";

const { t } = useI18n()

const xGrid = ref()
const gridOptions = reactive({
  height:'100%',
  loading: false,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ProjectMange',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {field: 'id', width: 100,title: '工程号',},
    {field: '',width: 50,title: '名称',},
    {field: 'id', width: 50,title: '膜系',},
    {field: 'id', width: 50,title: '厚度',},
    {field: 'id', width: 50,title: '类型',},
    {field: 'id', width: 50,title: '状态',},
    {field: 'id', width: 50,title: '数量',},
    {field: 'id', width: 50,title: '面积',},
    {field: 'id', width: 100,title: '流程卡数量',},
    {field: 'id', width: 100,title: '原片使用数',},
    {field: 'id', width: 70,title: '流程卡',},
    {field: 'id', width: 100,title: '钢化装载率',},
    {field: '',width: 100,title: '钢化炉数',},
    {field: '',width: 100,title: '平均切裁率',},
    {field: '',width: 100,title: '有效切裁率',},
    {field: '',width: 100,title: '尾片切裁率',},
    {field: '',width: 100,title: '原料使用数',},
    {field: '',width: 100,title: '平均切裁率',},
    {field: '',width: 50,title: '备注',},
    {field: '',width: 100,title: '创建人',},
    {field: '',width: 100,title: '创建时间',},
    {field: '',width: 100,title: '修改时间',},
  ],//表头参数
  data:null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
    },
  },

})
const oderInfo = useOrderInfoStore()

//定义工程状态
const optionVal = ref('0')
const options = [
  {
    value: '0',
    label: '全部',
  },
  {
    value: '1',
    label: '1',
  },
  {
    value: '2',
    label: '2',
  },
  {
    value: '3',
    label: '10',
  },
  {
    value: '4',
    label: '20',
  },
  {
    value: '5',
    label: '100',
  },
  {
    value: '6',
    label: '200',
  },
]


</script>

<template>
    <div id="mange">
      <div id="select">
        <span>优化日期</span>
        <el-date-picker
            style="margin-left:10px; margin-top: -5px; "
            v-model="oderInfo.mangeDate"
            type="daterange"
            format="YYYY/MM/DD"
            value-format="YYYY-MM-DD"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            :default-time="defaultTime"

        />
        <el-select
            style="margin-left:10px; margin-top: -5px; "
            :default-first-option="true"
            ref="getSelect"
            v-model="optionVal"
            class="m-2"
            @change="getWorkOrder"
              >

          <el-option
              v-for="item in options"
              :key="item.value"
              :label="item.label"
              :value="item.value"
          />
        </el-select>

        <el-button
            style="margin-left:10px;margin-top: -5px"
            @click="searchByDateRange"
            type="primary" :icon="Search">
          æŸ¥è¯¢
        </el-button>
      </div>

      <vxe-grid
          @filter-change="filterChanged"
          height="100%"
          class="mytable-scrollbar"
          ref="xGrid"
          v-bind="gridOptions"
          v-on="gridEvents"
      >
        <template #num2_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
                <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
                <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
              </vxe-select>
            </div>
          </div>
        </template>

        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input
                  type="type"
                  v-model="option.data"
                  @keyup.enter.native="$panel.confirmFilter()"
                  @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </template>
      </vxe-grid>
      <div id="last">
        <span>
          å°ç‰‡æ•°<vxe-input size="small" class="input"></vxe-input>
          å°ç‰‡é¢<vxe-input size="small" class="input"></vxe-input>
          åŽŸç‰‡æ•°<vxe-input size="small" class="input"></vxe-input>
          åŽŸç‰‡é¢<vxe-input size="small" class="input"></vxe-input>
        </span>
        <span style="float: right">
          <el-button type="primary" class="input">钢化版图</el-button>
          <el-button type="primary" class="input">模拟计算</el-button>
          <el-button type="primary" class="input">优化版图</el-button>
          <el-button type="primary" class="input">优化排版</el-button>
          <el-button type="primary" class="input">数据导出</el-button>
        </span>
      </div>
    </div>
</template>

<style scoped>
#mange{
  width: 100%;
  height: 85%;
}
#last {
  margin-top: 10px;
}
.input{
  width: 80px;
  margin-left: 15px;
}
</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue

New file
@@ -0,0 +1,216 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
import {Minus, Plus, Search} from "@element-plus/icons-vue";

const {t} = useI18n()

const xGrid = ref()

const gridOptions = reactive({
  height: '100%',
  loading: false,
  border: "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'Compute',
  scrollX: {enabled: true},
  scrollY: {enabled: true, gt: 0},//开启虚拟滚动
  showOverflow: true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns: [
    {field: 'id', width: 70, title: '序号', filters: [{data: ''}], slots: {default: 'state', filter: 'num2_filter'}},
    {field: '', width: 100, title: '版图数'},
    {field: '', width: 100, title: '装载率'},
    {field: '', width: 100, title: '流程卡数'},
    {field: '', width: 100, title: '模拟片数'},
    {
      field: 'processId',
      width: 150,
      title: t('processCard.processId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
  ],//表头参数
  data: null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots: {
      buttons: "toolbar_buttons"
    },
  },

})
let emit = defineEmits([
  'changeDialog'
])
let ProjectName = ref('')
const changeOrderType = async () => {
  await emit('changeDialog', ProjectName.value)
  ProjectName.value = null
}
// è¿›åº¦æ¡é¢œè‰²å’ŒæŒ‰é’®åŠ å‡
const percentage1 = ref(80)
const percentage2 = ref(50)
const customColors = [
  {color: '#f56c6c', percentage: 20},
  {color: '#e6a23c', percentage: 40},
  {color: '#5cb87a', percentage: 60},
  {color: '#1989fa', percentage: 80},
  {color: '#162ce5', percentage: 100},
]
const handleButtonClick = (progressIndex, isIncrease) => {
  let percentageRef;
  if (progressIndex === 1) {
    percentageRef = percentage1;
  } else if (progressIndex === 2) {
    percentageRef = percentage2;
  }
  if (isIncrease && percentageRef.value < 100) {
    percentageRef.value += 10;
  } else if (!isIncrease && percentageRef.value > 0) {
    percentageRef.value -= 10;
  }
};

</script>

<template>
  <div style="width: 100%;height: 100%">
    <!--模拟计算表头-->
    <div id="title" style="margin-top: -10px">
      <span>
        å·¥ç¨‹ç¼–号
      <vxe-select size="small" style="margin-left: 20px"></vxe-select>
      <el-button type="primary" :icon="Search" style="margin-left: 20px">查询</el-button>
      </span>
      <span style="float: right ; margin-right: 120px">
        å·¥ç¨‹æ··æŽ’等级
      <vxe-select size="small" style="margin-left: 20px">
        <vxe-option value="null" >不混排</vxe-option>
        <vxe-option value="null" >轻度混排</vxe-option>
        <vxe-option value="null" >中度混排</vxe-option>
        <vxe-option value="null" >高度混排</vxe-option>
      </vxe-select>
      <el-button type="primary" style="margin-left: 20px">模拟计算</el-button>
      <el-button type="primary" style="margin-left: 50px">保存</el-button>
      </span><br>
      <div class="demo-progress" style="margin-top: 5px">
        <div style="display: flex; align-items: center">
          <span>钢化最大装载</span>
          <!--进度条设置-->
          <el-progress style="max-width: 300px; flex: 1; margin-left: 10px" :percentage="percentage1"
                       :color="customColors"/>
          <el-button-group style="margin-left: 10px;">
            <el-button :icon="Minus" @click="handleButtonClick(1,false)"/>
            <el-button :icon="Plus" @click="handleButtonClick(1,true)"/>
          </el-button-group>
          <span style="float: right ; margin-left: 250px;">
                å·¥ç¨‹çŽ»ç’ƒç‰‡<vxe-input size="small" class="input" ></vxe-input>
                å®½è½´é—´éš”<vxe-input size="small" class="input"></vxe-input>
                ç‚‰å®½(mm)<vxe-input size="small" class="input"></vxe-input>
              </span>
        </div>
      </div>
      <br>
      <div class="demo-progress" style="margin-top: -10px">
        <div style="display: flex; align-items: center">
          <span>理片笼空闲度</span>
          <!--进度条设置-->
          <el-progress style="max-width: 300px; flex: 1; margin-left: 10px" :percentage="percentage2"
                       :color="customColors"/>
          <el-button-group style="margin-left: 10px;">
            <el-button :icon="Minus" @click="handleButtonClick(2,false)"/>
            <el-button :icon="Plus" @click="handleButtonClick(2,true)"/>
          </el-button-group>
          <span style="float: right ; margin-left: 242px;">
                  åŠ çƒ­æ—¶é—´(秒)<vxe-input size="small" class="input"></vxe-input>
                  é•¿è½´é—´éš”<vxe-input size="small" class="input"></vxe-input>
                  ç‚‰é•¿(mm)<vxe-input size="small" class="input"></vxe-input>
          </span>
        </div>
      </div>
    </div>

    <vxe-grid
        size="small"
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"
                        @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
          </div>
        </div>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input
                type="type"
                v-model="option.data"
                @keyup.enter.native="$panel.confirmFilter()"
                @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>
    </vxe-grid>
  </div>
</template>

<style scoped>

.input{
  width: 80px;
  margin-left: 10px;
}

</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeCard.vue

New file
@@ -0,0 +1,134 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
const { t } = useI18n()

const xGrid = ref()

const gridOptions = reactive({

  height:'100%',
  loading: false,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ComputeCard',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {field: 'checkbox', title: '允许横排', width: 100},
    {field: 'checkbox', title: '钢化', width: 70},
    {field: 'processId',width: 150, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 70,  title: '层',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'id',width: 150, title: '总层数',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 100, title: '规格',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'quantity',width: 150, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.productName',width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.computeGrossArea',width: 150, title: t('order.area'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: '',width: 70, title: 'merge'}

  ],//表头参数
  data:null,//表格数据

  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
    },
  },

})
let emit = defineEmits([
  'changeDialog'
])
let Membrane = ref('选择膜系')

const changeOrderType = async ()=>{
  await emit('changeDialog',Membrane.value)
  Membrane.value = null
}

</script>

<template>
  <div style="width: 100%;height: 100%">
    <span>流程卡</span>
    <vxe-grid
        size="small"
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
          </div>
        </div>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input

                type="type"
                v-model="option.data"
                @keyup.enter.native="$panel.confirmFilter()"
                @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>
    </vxe-grid>
  </div>
</template>

<style scoped>

</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ComputeDetail.vue

New file
@@ -0,0 +1,126 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
const { t } = useI18n()

const xGrid = ref()

const gridOptions = reactive({
  height:'100%',
  loading: false,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ComputeDetail',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns:[
    {field: 'id',width: 70,  title: '序号',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field:'state',width: 150,title: t('order.width'),filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {type: 'seq',width: 150,title: t('order.height')},
    {field: 'id',width: 150, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.buildingNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.shape'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.grossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('craft.TrademarkAttribute'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

  ],//表头参数
  data:null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
    },
  },

})
let emit = defineEmits([
  'changeDialog'
])
let ProjectName = ref('')
const changeOrderType = async ()=>{
  await emit('changeDialog',ProjectName.value)
  ProjectName.value = null
}
</script>

<template>
  <div style="width: 100%;height: 100%">
    <span>流程卡详情</span>
    <vxe-grid
        size="small"
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
          </div>
        </div>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input
                type="type"
                v-model="option.data"
                @keyup.enter.native="$panel.confirmFilter()"
                @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>
    </vxe-grid>
  </div>
</template>

<style scoped>

</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue

@@ -12,7 +12,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'SelectProduct1',
  id: 'GlassInventory',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue

New file
@@ -0,0 +1,149 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
import {Search} from "@element-plus/icons-vue";
const { t } = useI18n()

const xGrid = ref()

const gridOptions = reactive({

  height:'100%',
  loading: false,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ProcessCard',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
    {field: 'processId',width: 150, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 70,  title: '层',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'id',width: 150, title: '总层数',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 100, title: '规格',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'quantity',width: 150, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.shape'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'orderDetail.productName',width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'order.project', width:150, title: t('order.project'), showOverflow: "ellipsis"},
    {field: 'orderDetail.computeGrossArea',width: 150, title: t('order.area'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},


  ],//表头参数
  data:null,//表格数据

  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
    },
  },

})
let emit = defineEmits([
  'changeDialog'
])
let Membrane = ref('选择膜系')

const changeOrderType = async ()=>{
  await emit('changeDialog',Membrane.value)
  Membrane.value = null
}

</script>

<template>
  <div style="width: 100%;height: 100%">
    <h1>流程卡列表</h1>
    <vxe-grid
          size="small"
          @filter-change="filterChanged"
          height="100%"
          class="mytable-scrollbar"
          ref="xGrid"
          v-bind="gridOptions"
          v-on="gridEvents"
      >
        <template #num2_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
                <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
                <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
              </vxe-select>
            </div>
          </div>
        </template>

        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input

                  type="type"
                  v-model="option.data"
                  @keyup.enter.native="$panel.confirmFilter()"
                  @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </template>

        <template #toolbar_buttons>
          <h1>膜系筛选：</h1>
          <vxe-select @change="changeOrderType" v-model="Membrane">
            <vxe-option value="2" :label="$t('searchOrder.regularOrders')"></vxe-option>
            <vxe-option value="-2" :label="$t('searchOrder.cancelledOrders')"></vxe-option>
            <vxe-option value="0" :label="$t('searchOrder.allOrders')"></vxe-option>
          </vxe-select>
          <el-button type="primary" :icon="Search" style="margin-left: 20px">查询</el-button>
          <vxe-select style="margin-left: 40px"></vxe-select>
          <vxe-select style="margin-left: 20px"></vxe-select>
          <el-button type="primary" style="margin-left: 10px">筛选</el-button>
        </template>
    </vxe-grid>
  </div>
</template>

<style scoped>

</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCardDetail.vue

New file
@@ -0,0 +1,133 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
const { t } = useI18n()

const xGrid = ref()

const gridOptions = reactive({
  height:'100%',
  loading: false,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ProcessCardDetail',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns:[
    {field: 'id',width: 70,  title: '序号',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field:'state',width: 150,title: t('order.width'),filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {type: 'seq',width: 150,title: t('order.height')},
    {field: 'id',width: 150, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.buildingNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.shape'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.grossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('craft.TrademarkAttribute'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

  ],//表头参数
  data:null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
    },
  },

})
let emit = defineEmits([
  'changeDialog'
])
let ProjectName = ref('工程名称')
const changeOrderType = async ()=>{
  await emit('changeDialog',ProjectName.value)
  ProjectName.value = null
}

</script>

<template>
  <div style="width: 100%;height: 100%">
    <h1>流程卡详情</h1>
    <vxe-grid
        size="small"
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
          </div>
        </div>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input
                type="type"
                v-model="option.data"
                @keyup.enter.native="$panel.confirmFilter()"
                @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>

      <template #toolbar_buttons>
        <vxe-input @change="changeOrderType" v-model="ProjectName"></vxe-input>
        <el-button type="primary" style="margin-left: 20px">创建</el-button>
      </template>

    </vxe-grid>
  </div>
</template>

<style scoped>

</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectCreate.vue

File was deleted

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue

@@ -1,6 +1,19 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
import {
  Folder,
  Plus,
  Setting,
  Operation,
  Tickets,
  DocumentCopy,
  Grid,
  Edit,
  Printer,
  DocumentAdd, Minus, Menu,  Checked, Upload, Suitcase, Refresh, CircleCloseFilled, Sort, Link ,
} from "@element-plus/icons-vue";

const { t } = useI18n()

const xGrid = ref()
@@ -12,7 +25,7 @@
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'SelectProduct1',
  id: 'ProjectDetail',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
@@ -54,30 +67,100 @@
  },*/
  columns:[
    {title: '订序', width: 70},
    {field:'state',width: 150,title: t('order.width'),filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'state', width: 150, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num2_filter'}},
    {type: 'seq',width: 150,title: t('order.height')},
    {field: 'id',width: 150, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {
      field: 'id',
      width: 150,
      title: t('order.quantity'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {field: 'id',width: 150, title: '长磨1',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '长磨2',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '短磨1',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '短磨1',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.shape'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {
      field: 'id',
      width: 150,
      title: t('order.shape'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {field: 'id',width: 150, title: '流程卡号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.buildingNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('basicData.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.grossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {
      field: 'id',
      width: 150,
      title: t('order.product'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('order.buildingNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('basicData.remarks'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('order.perimeter'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('order.grossArea'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },

    {field: 'id',width: 150, title: t('craft.glassChild'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('craft.glassAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('craft.TrademarkAttribute'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {
      field: 'id',
      width: 150,
      title: t('craft.glassChild'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('craft.glassAddress'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
    {
      field: 'id',
      width: 150,
      title: t('craft.TrademarkAttribute'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      sortable: true
    },
  ],//表头参数
  data:null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
      buttons: "toolbar"
    },
  },

@@ -85,11 +168,10 @@
let emit = defineEmits([
  'changeDialog'
])
let DialogValue = ref(null)
const changeOrderType = async ()=>{
  await emit('changeDialog',DialogValue.value)
  DialogValue.value = null
const handleCommand = async (command) => {
  await emit('changeDialog', command)
}

</script>

<template>
@@ -103,11 +185,11 @@
        v-on="gridEvents"
    >


      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"
                        @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
@@ -127,18 +209,98 @@
        </div>
      </template>

      <template #toolbar_buttons>
        <vxe-select @change="changeOrderType" v-model="DialogValue" >
          <vxe-option :value="1" :label="'创建工程'"></vxe-option>
          <vxe-option :value="2" :label="'工程管理'"></vxe-option>
        </vxe-select>
      <template #toolbar>
        <div id="title">
          <el-button id="checkinventory" type="primary">查询库存</el-button>
          <el-button id="checkremnant" type="primary">查询余料</el-button>
          <el-button id="selectml" type="primary">设置磨量</el-button>
          <el-button id="selectxb" type="primary">设置修边</el-button>
          <el-button id="safe" type="primary">保存</el-button>
          <el-button id="optimize" type="primary">优化</el-button>
        </div>
        <!--工程文件菜单-->
        <el-dropdown @command="handleCommand">
          <el-button  type="primary" :icon="Folder">
            å·¥ç¨‹æ–‡ä»¶
          </el-button>
          <template #dropdown>
            <el-dropdown-menu>
              <el-dropdown-item :command="1" :icon="Plus">创建工程</el-dropdown-item>
              <el-dropdown-item :command="2" :icon="Setting">工程管理</el-dropdown-item>
              <el-dropdown-item :command="3" :icon="Operation">模拟计算</el-dropdown-item>
              <!--              <el-dropdown-item command="4">文件导出</el-dropdown-item>
                            <el-dropdown-item command="5">文件导入</el-dropdown-item>-->
            </el-dropdown-menu>
      </template>

        </el-dropdown>
        <!--打印菜单-->
        <el-dropdown @command="handleCommand">
          <el-button class="buttons" type="primary" :icon="Printer">
            æ‰“印
          </el-button>
          <template #dropdown>
            <el-dropdown-menu>
              <el-dropdown-item :command="null" :icon="Printer">打印优化版图</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Tickets">打印优化报告</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="DocumentCopy">合并打印</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Grid">缩略图</el-dropdown-item>
            </el-dropdown-menu>
          </template>
        </el-dropdown>
        <!--调整-->
        <el-dropdown @command="handleCommand">
          <el-button class="buttons" type="primary" :icon="Operation">
            è°ƒæ•´
          </el-button>
          <template #dropdown>
            <el-dropdown-menu>
              <el-dropdown-item :command="null" :icon="Edit">全部重排</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="DocumentAdd">新增版面</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Plus">增加加工次数</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Minus">删除版面</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Menu">镜像当前版面</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Grid">镜像所以版面</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Checked">保存修改</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Upload">导出剩余小片</el-dropdown-item>
            </el-dropdown-menu>
          </template>
        </el-dropdown>
        <!--数控-->
        <el-dropdown @command="handleCommand">
          <el-button class="buttons" type="primary" :icon="Suitcase">
            æ•°æŽ§
          </el-button>
          <template #dropdown>
            <el-dropdown-menu>
              <el-dropdown-item :command="null" :icon="Refresh">刷新刀路</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Link">截断连续线</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="CircleCloseFilled">删除刀路</el-dropdown-item>
              <el-dropdown-item :command="null" :icon="Sort">当前刀路反向</el-dropdown-item>
            </el-dropdown-menu>
          </template>
        </el-dropdown>
        <!--设置-->
        <el-button class="buttons" type="primary" :icon="Setting">
          è®¾ç½®
        </el-button>
        <!--报告-->
        <el-button class="buttons" type="primary" :icon="Tickets">
          æŠ¥å‘Š
        </el-button>
      </template>
    </vxe-grid>
  </div>
</template>

<style scoped>

#title {
  position: absolute;
  right: 10px;
}

.buttons {
  margin-left: 10px;
}

</style>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectList.vue

New file
@@ -0,0 +1,124 @@
<script setup>
import {reactive, ref} from "vue";
import {useI18n} from "vue-i18n";
const { t } = useI18n()

const xGrid = ref()

const gridOptions = reactive({
  height:'100%',
  loading: false,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30, useKey: true},//鼠标移动或选择高亮
  id: 'ProjectList',
  scrollX:{enabled: true},
  scrollY:{ enabled: true ,gt:0},//开启虚拟滚动
  showOverflow:true,
  columnConfig: {
    resizable: true,
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
  },
  customConfig: {
    storage: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
    showStatus: true
  },
  /*formConfig: {
    data: {
      width: '',
      height: '',
      quantity: ''
    },
    items: [
      { field: 'width', title: t('order.width')+':', itemRender: { name: 'VxeInput' } },
      { field: 'height', title: t('order.height')+':', itemRender: { name: 'VxeInput' } },
      { field: 'quantity', title: t('order.quantity')+':', itemRender: { name: 'VxeInput' } },
      {
        itemRender: {
          name: 'VxeButtonGroup',
          options: [
            { type: 'submit', content: t('craft.sure'), status: 'primary' },
            { type: 'reset', content: t('product.msg.reset') }
          ]
        }
      }
    ]
  },*/
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {field: 'id',width: 70,  title: 'ID',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'id',width: 100, title:'工程号',filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'id',width: 150, title: '名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '膜系',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '厚度',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '类型',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '状态',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: t('order.grossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '流程数量',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id',width: 150, title: '流程卡号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

  ],//表头参数
  data:null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
    },
  },

})
</script>

<template>
  <div style="width: 100%;height: 100%">
    <h1>工程列表</h1>
    <vxe-grid
        size="small"
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >

      <template #num2_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
          </div>
        </div>
      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input

                type="type"
                v-model="option.data"
                @keyup.enter.native="$panel.confirmFilter()"
                @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>
    </vxe-grid>
  </div>
</template>

<style scoped>

</style>

 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

@@ -308,6 +308,9 @@
      filterMethod: filterChanged, width: 100
    },
    {field: 'quantity', title: t('order.quantity'), width: 90},
    {field: 'printQuantity', title: t('processCard.printQuantity'), width: 90,
      editRender: {name: 'input', attrs: {placeholder: ''}},
    },
    {field: 'total_area', title: t('order.area'), width: 90},
    {
      field: 'product_name', title: t('order.product'), width: 120,
@@ -338,16 +341,33 @@
      filterMethod: filterChanged, width: 120
    },
  ],//表头按钮

//表单验证
  editRules: {
    printQuantity: [
      {
        validator ({ row }) {
          const regex = /^[0-9]\d*$/
          const printQuantity =
              (row.printQuantity === undefined || row.printQuantity===null || row.printQuantity==='') ? 0 : row.printQuantity
           if(!regex.test(printQuantity)){
             return new Error(t('reportingWorks.enterIntegerGreaterThanEqualTo'))
          }
          else if(row.quantity<printQuantity){
            return new Error(t('processCard.printWarn1'))
          }
        }
      }
    ]
  },
  toolbarConfig: {
    buttons: [
      {code: 'print', name: t('processCard.print'), status: 'primary'},
      {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,
@@ -377,7 +397,7 @@
})

const gridEvents = {
  toolbarButtonClick({code}) {
  async toolbarButtonClick({code}) {
    const $grid = xGrid.value
    selectRecords = $grid.getCheckboxRecords()
    // selectRecords.forEach(obj => {
@@ -584,6 +604,11 @@
          break
        }
        case 'printTest': {
          const errMap = await $grid.validate(true)
          if (errMap) {
            ElMessage.error(t('basicData.msg.checkoutLose'))
            return
          }
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return

 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/report/WorkInProgress.vue

@@ -20,7 +20,7 @@
})

//工序
const value = ref(t('machine.edgeGrinding'))
const value = ref()

//根据以下字段汇总查询
const stateValue = ref('')
@@ -157,7 +157,7 @@
      total.dataTotal = res.data.total.total * 1
      total.pageTotal = res.data.total.pageTotal
      pageTotal.value = res.data.total
      xGrid.value.loadData(res.data.data)
      xGrid.value.reloadData(res.data.data)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
@@ -181,7 +181,7 @@
}

function filterChanged(column){
  //gridOptions.loading=true
  gridOptions.loading = true
  //筛选条件发生变化条件发生变化
  let value = column.datas[0]!=undefined?column.datas[0]:''
  value = value.trim()
@@ -194,28 +194,28 @@
  }else{
    filterData.value[column.property] = value
  }
  gridOptions.loading = true

  let startTime = form.date1[0]
  let endTime = form.date1[1]
  let optionVal=stateValue.value
  if (optionVal == '') {
    optionVal = null
  }
  request.post(`/report/workInProgress/1/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {

    if (res.code == 200) {
      total.dataTotal = res.data.total.total*1
      total.pageTotal=parseInt(res.data.total)
      pageNum.value=1
      produceList = deepClone(res.data.data)
      xGrid.value.reloadData(produceList)
      gridOptions.loading=false
    } else {
      ElMessage.warning(res.msg)
    }
    //handleUpdateData(produceList)
  })
  getWorkOrder()
  // let selectProcesses = value.value
  // let optionVal=stateValue.value
  // if (optionVal == '') {
  //   optionVal = null
  // }
  // request.post(`/report/workInProgress/1/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}`, filterData.value).then((res) => {
  //
  //   if (res.code == 200) {
  //     total.dataTotal = res.data.total.total*1
  //     total.pageTotal=parseInt(res.data.total)
  //     pageNum.value=1
  //     produceList = deepClone(res.data.data)
  //     console.log(res.data.data)
  //     xGrid.value.reloadData(produceList)
  //     gridOptions.loading=false
  //   } else {
  //     ElMessage.warning(res.msg)
  //   }
  //   //handleUpdateData(produceList)
  // })

}

@@ -436,7 +436,7 @@
          />
        </el-select>
        &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/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 = [];
@@ -356,7 +356,7 @@
          }else if((row.completedQuantity*1+brokenNum*1)>row.quantity*1){
            return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
          }else  if(row.quantity_card<row.completedQuantity){
            return new Error("完工数不能大于流程卡数量")
            return new Error(t('reportingWorks.pleaseNumber10'))
          }
          const completedNum =
              (row.completedQuantity === undefined || row.completedQuantity===null || row.completedQuantity==='') ? 0 : row.completedQuantity

 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"
    >

 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java

@@ -66,6 +66,9 @@
    private LocalDate updateTime;

    //查询用
    //标签打印数量
    @TableField(select = false,exist = false)
    private Integer printQuantity;
    //报工编号
    @TableField(select = false,exist = false)
    private String reportingWorkId;

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java

@@ -163,7 +163,7 @@

    List<Map<String, String>> selectPrintDetailsMp1(String orderId);

    List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
    List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber, Integer printQuantity);

    List<Map<String, Object>> getPrintCustomDataProjectNo(String projectNo);


 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -667,7 +667,7 @@
                        continue;
                    }
                    Map<String, Object> itemmap = new HashMap<>();
                    itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(),flowCard.getOrderNumber()));
                    itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(),flowCard.getOrderNumber(),flowCard.getPrintQuantity()));
                    list.add(itemmap);

                    // å°†è¯¥ processId åŠ å…¥å·²å¤„理集合

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -2018,6 +2018,7 @@
               /*ogd.technology_number,*/
               ogd.glass_address,
               (fc.quantity)                                                          as quantity,
               (fc.quantity)                                                          as printQuantity,
               round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
               od.product_name,
               ogd.glass_child,
@@ -2048,6 +2049,7 @@
               ogd.technology_number,
               ogd.glass_address,
               (fc.quantity)                                                          as quantity,
               (fc.quantity)                                                          as printQuantity,
               round((ogd.child_width * ogd.child_height * fc.quantity / 1000000), 2) as total_area,
               od.product_name,
               ogd.glass_child,
@@ -2089,7 +2091,7 @@
               od.processing_note                                    as processingNote,
               width,
               height,
               fc.quantity,
               #{printQuantity}                                      as quantity,
               od.order_number                                       as orderNumber,
               fc.technology_number                                  as technologyNumber,
               od.building_number                                    as buildingNumber,