提交

廖井涛

2024-06-28 d78b7a9e834f5c688c351c2a6e3cd2e584872b75

提交

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

@@ -75,7 +75,7 @@
            reviewFail:'Audit failure',
            noProductDataInTheTable:'There is no product data in the table',
            tableDataExceedsMaximumLimit:'The table data exceeds the maximum limit',
            range9999Dec: "请输入四位整数",
            range9999Dec: "Please enter a four digit integer",
        }
    },
    product:{
@@ -92,7 +92,7 @@
        query:'Quick query',
        creator:'Creator',

        usingAbbreviations:'使用简称',
        usingAbbreviations:'Using abbreviations',
        msg:{
            productLength:'Please add product details',
            lastGlass:' The last item of product details is not glass, please complete',
@@ -142,7 +142,7 @@
            cancelReview:'Review',
            theProductHasBeenReviewedAndCannotBeDeleted:'The product has been reviewed and cannot be removed',

            productAbbreviation:'产品简称',
            productAbbreviation:'Product abbreviation',
        }
    },
    order:{
@@ -207,7 +207,7 @@
        orderDetailsReport:'Order detail report',
        orderDetailsSummaryReport:'Order details summary report',
        buildingNumber:'Floor number',
        saveHeader:'保存表头',
        saveHeader:'Save header',
        msg:{
            productCheck:'Please select a product',
            tableLengthNot:'No table data',
@@ -229,7 +229,7 @@
            calculationAreaPrompt3:'Whether according to',
            calculationAreaPrompt4:'Calculate',
            warning:'Tips',
            calculationAreaPrompt5:'订单重复是否继续创建',
            calculationAreaPrompt5:'Do you want to continue creating duplicate orders',
        }

    },
@@ -373,17 +373,18 @@
        deleteNoProcedure:'Delete failed Check whether the next operation has been reported',
        pleaseCheckTheRequiredData:'Please check the required data',

        labelStyle:'标签样式',
        customLabelPrinting:'自定义标签打印',
        sortingSuccessful:'排序成功',
        sorting:'排序',
        pleaseSelect:'请选择',
        processCardDetails:'流程卡明细',
        thisIsTheIndoorSurface:'此面为室内面',
        thisSideIsOutsideTheRoom:'此面为室外面',
        finishedProductLabel:'成品标签',
        halfProductLabel:'半品标签',
        pleaseSelectCustomPrintLabelStyle:'请选择自定义打印标签样式',
        labelStyle:'Label Style',
        customLabelPrinting:'Custom label printing',
        sortingSuccessful:'Sorting successful',
        sorting:'Sorting',
        pleaseSelect:'Please select',
        processCardDetails:'Process Card Details',
        thisIsTheIndoorSurface:'This is the indoor surface',
        thisSideIsOutsideTheRoom:'This side is outside the room',
        finishedProductLabel:'Finished product label',
        halfProductLabel:'Half product label',
        pleaseSelectCustomPrintLabelStyle:'Please select a custom print label style',
        mergePrinting:'Merge printing',
    },
    reportingWorks:{
        glassNumber:'number',
@@ -601,8 +602,8 @@
        customerOrders:'Customer order',
        orderAmount:'Order amount',

        customerAbbreviation:'客户简称',
        pleaseEnterTheCustomerAbbreviation:'请输入客户简称',
        customerAbbreviation:'Customer abbreviation',
        pleaseEnterTheCustomerAbbreviation:'Please enter the customers abbreviation',
    },
    delivery:{
        delivery:'Delivery',
@@ -634,8 +635,8 @@
        deliveryNoteId:'Delivery Note Id',
        deliveryNoteNumber:'Delivery Note Number',
        deliveryDate:"Delivery Date ",
        shipmentDetailsReport:"发货明细报表 ",
        shipmentProductClassificationReport:"发货产品分类报表 ",
        shipmentDetailsReport:"Delivery detail report ",
        shipmentProductClassificationReport:"Category report of shipped products ",
        contacts:'Contact person',
        contactNumber:'Contact number',
        salesman:'Salesman',
@@ -729,7 +730,7 @@
        level:'Class level',
        firstLevel:'Primary class',
        towLevel:'Secondary class',
        alias:'别名',
        alias:'alias',
    },
    machine:{
        basicId:'Equipment number',

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

@@ -384,6 +384,7 @@
        finishedProductLabel:'成品标签',
        halfProductLabel:'半品标签',
        pleaseSelectCustomPrintLabelStyle:'请选择自定义打印标签样式',
        mergePrinting:'合并打印',
    },
    reportingWorks:{
        glassNumber:'编号',

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

@@ -254,12 +254,12 @@
    {field: 'glass_address', title: t('processCard.glassAddress'),},
    {field: 'patch_num', title:  t('order.quantity'),},
    {field: 'patch_area', title:  t('order.area'),},
    {field: 'responsible_team', title:  '责任班组',},
    {field: 'responsible_equipment', title:  '责任设备',},
    {field: 'responsible_personnel', title:  '责任人员',},
    {field: 'patch_type', title:  '次破类型',},
    {field: 'patch_reason', title:  '次破原因',},
    {field: 'patch_processes', title:  '责任工序',},
    {field: 'responsible_team', title:  t('reportingWorks.responsibleTeam'),},
    {field: 'responsible_equipment', title:  t('reportingWorks.responsibleEquipment'),},
    {field: 'responsible_personnel', title:  t('reportingWorks.responsiblePersonnel'),},
    {field: 'patch_type', title:  t('reportingWorks.breakageType'),},
    {field: 'patch_reason', title:  t('reportingWorks.breakageReason'),},
    {field: 'patch_processes', title:  t('reportingWorks.responsibleProcess'),},
    {field: 'product_name', title: t('order.product'),},
    {field: 'glass_child', title: t('reportingWorks.glassChild'),},
  ],//表头按钮
@@ -551,7 +551,7 @@

    </el-button>
    &nbsp;&nbsp;
    <el-input clearable placeholder="合并打印" v-model="printMerge" style="width: 90px"></el-input>
    <el-input clearable :placeholder="$t('processCard.mergePrinting')" v-model="printMerge" style="width: 90px"></el-input>
    &nbsp;
    <label>{{$t('processCard.labelStyle')}}：</label>
    <el-select v-model="printType" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">

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

@@ -218,4 +218,46 @@

}

.printFlowCard_finished1 {
  flex-wrap: wrap;
  font-size: 8pt;
  display: flex;
  flex-direction: column;
}


/*成*/
.entirety_finished1 {
  display: flex;
  text-align: center;
  flex-direction: column;
  margin-left: 10px;
  width: 337px;
  height: 120px;

}

.contentRow1 {
  font-weight: bolder;
  display: flex;
  text-align: center;
  width: 100%;
}

.contentRow1 .row1 {
  width: 30%;
  font-weight: bolder;
}

.entirety_finished1 .row4 {
  font-weight: bolder;
  text-align: right;
  margin-right: 10px;
}

.contentRow1 .row1, .contentRow1 .row2 {
  text-align: left;
  font-weight: bolder;
}

</style>