Merge remote-tracking branch 'origin/master'

wu

2024-12-23 b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af

 UI-Project/src/lang/zh.js

@@ -87,6 +87,20 @@
          layoutSequence:'序号',
      },
      sorter:{
          inPlace:'到位',
          ninPlace:'未到位',
          emptymissions:'空任务',
          advancetask:'进片任务',
          outputtasks:'出片任务',
          straighttasks:'直通任务',
          endingtask:'结束',
          another:'其他',
          id:'磨边前理片笼表ID',
          remainWidth:'剩余',
          taskRunning:'任务请求',
          updateTime:'更新时间',
          place:'是否到位',
          layernow:'当前层号',
          gridnumber:'栅格号',
          glassnumber:'玻璃编号',
          width:'宽',
@@ -107,15 +121,18 @@
          projectnumber:'请输入工程号',
          dilapidation:'破损',
          takeaway:'人工拿走',
          takeawaya:'是否人工拿走该条信息？',
          takeon:'摆片完成',
      },
      searchOrder:{
          breakagn:'未破损',
          lacknumber:'缺片数量',
          processcard:'指定流程卡',
          filminformation:'人工下片信息',
          currentglassinformation:'扫码枪当前玻璃信息',
          printlabels:'打印标签',
          deleteTask:'删除工程',
          pdeleteTask:'是否删除工程？',
          deleteTask:'结束工程',
          pdeleteTask:'是否结束工程？',
          searchlayout:'非钢化流程卡查询',
          fullfurnaces:'满炉数量',
          specifiedproject:'当前指定工程',
@@ -239,7 +256,6 @@
          team:'班组',
          basic:'设备',
          makesure:'确认保存',
          cancel:'取消',
          temperingtotal:'钢化炉数：',
          glasstotal:'玻璃总数：',
          Labelprinting:'标签打印',
@@ -340,7 +356,6 @@
          width:'宽度',
          height:'高度',
      },
   
      productStock:{
          addusers:'添加用户',
          username:'用户名',
@@ -411,14 +426,11 @@
      },
      replenish:{
          patchManagement:'补片管理',
   
      },
      rework:{
          reworkManagement:'返工管理',
          addRework:"返工新增 ",
      },
   
   
      role:{
          id:'ID',
          characterHomepage:'角色首页',
@@ -512,9 +524,9 @@
          productiontime :'生产时间',
          starttime :'开始时间',
          endtime :'结束时间',
          ctype :'清选择类型',
          cstate :'清选择状态',
          cprocess :'清选择工序',
          ctype :'请选择类型',
          cstate :'请选择状态',
          cprocess :'请选择工序',
          all :'全部',
          completed :'完工',
          broke :'破损',
@@ -677,6 +689,7 @@
        totalnumber: '总片数',
        pairsnumber: '已配对数量',
        missingnumber: '缺片数量',
        damagenumber: '破损数量',
        operate: '操作',
        claimquest: '领取任务',
        pclaimquest: '是否领取任务？',