修改bug

src/api/pages/pdm/collect.js

@@ -27,8 +27,10 @@ export default {
     scrap:'/scrap',
     //产品报损撤销验证条码
     checkBarCodeScrapUndo:'/check_bar_code_scrap_undo',
-    //工序撤销(产品报损撤销、工序撤销)
+    //产品报损撤销
     scrapUndo:'/scrap_undo',
+    //工序撤销
+    nodeUndo:'/node_undo',
     //验证标签
     checkLabel:'/check_label',
   }

src/locale/lang/zh-CN.js

@@ -48,17 +48,17 @@ export const button = {
   add: '新建(N)',
   addType: '新建分类(N)',
   edit: '编辑(E)',
-  editPrinter:'编辑(E)',
+  editPrinter: '编辑(E)',
   delete: '删除(D)',
   confirm: '确定(O)',
-  publish:'发布(O)',
+  publish: '发布(O)',
   enable: '启用(O)',
   copyEdit: '复制(O)',
   revert: '冲正(R)',
   import: '导入(I)',
   export: '导出(B)',
   sync: '同步(H)',
-  leave:'下班打卡(L)',
+  leave: '下班打卡(L)',
   searchSet: '设置(T)',
   print: '打印(P)',
   disable: '停用(W)',
@@ -73,7 +73,7 @@ export const button = {
   syncResume: '同步履历(L)',
   index: '列表(L)',
   logReasonBtn: '变更原因(R)',
-  setLogoColour:'更改(R)',
+  setLogoColour: '更改(R)',
   position: '定位(Q)',
   toExamine: '审核(M)',
   approve: '审批(P)',
@@ -115,22 +115,22 @@ export const button = {
   dimission: '离职(D)',
   install: '上模(I)',
   uninstall: '卸模(U)',
-  chooseMoldline:'选择成型线(M)',
-  clearDetail:'清空明细(C)',
-  change:'条码变更(E)',
-  chooseBarCode:'选择条码(G)',
+  chooseMoldline: '选择成型线(M)',
+  clearDetail: '清空明细(C)',
+  change: '条码变更(E)',
+  chooseBarCode: '选择条码(G)',
   moldDamage: '开模报损(S)',
-  moldingUserReplace:'工号变更(E)',
-  bindBarcode:'绑定条码(B)',
-  clearBindBarcode:'清空条码(C)',
-  carryover:'结转(D)',
-  reverseCarryover:'反结(U)',
-  prodCheck:'盘点(P)',
-  allNoCheck:'盘点选择数据(N)',
-  climbKiln:'装载具(L)',
-  uninstallKiln:'卸载具(U)',
-  modelMouldChange:'变更模具型号(M)',
-  decreaseAllNoCheck:'报损未盘点模具(D)',
+  moldingUserReplace: '工号变更(E)',
+  bindBarcode: '绑定条码(B)',
+  clearBindBarcode: '清空条码(C)',
+  carryover: '结转(D)',
+  reverseCarryover: '反结(U)',
+  prodCheck: '盘点(P)',
+  allNoCheck: '盘点选择数据(N)',
+  climbKiln: '装载具(L)',
+  uninstallKiln: '卸载具(U)',
+  modelMouldChange: '变更模具型号(M)',
+  decreaseAllNoCheck: '报损未盘点模具(D)',
 }
 
 /**
@@ -234,16 +234,16 @@ export const formTitle = {
   'product-damage': '损坯原因',
   'mold-damage': '开模报损',
   'prodSuspend': '产品挂起',
-  'register':'计件',
-  'workStationPrinter':'工位打印机',
-  'workStationUser':'工位工号',
+  'register': '计件',
+  'workStationPrinter': '工位打印机',
+  'workStationUser': '工位工号',
   'prod-carryover-item': '结转明细',
-  'prod-carryover':'在产结转',
+  'prod-carryover': '在产结转',
   'mould-carryover-item': '结转明细',
-  'mould-carryover':'模具结转',
-  'mould-change-std-num':'变更标准次数',
-  'model—mould-change':'变更模具型号',
-  'label':'验证标签',
+  'mould-carryover': '模具结转',
+  'mould-change-std-num': '变更标准次数',
+  'model—mould-change': '变更模具型号',
+  'label': '验证标签',
 }
 
 /**
@@ -259,9 +259,9 @@ export const columns = {
   essentialInformation: '基本信息',
   staffRelation: '绑定员工',
   goodsInformation: '商品信息',
-  conditionInformation:'查询条件设置',
-  sqlInformation:'SQL设置',
-  tableInformation:'表格设置',
+  conditionInformation: '查询条件设置',
+  sqlInformation: 'SQL设置',
+  tableInformation: '表格设置',
   files: '附件',
   filesUpload: '文件上传',
   clickFilesUpload: '点击或拖拽进行上传',
@@ -528,7 +528,7 @@ export const columns = {
   packNodeIds: '组装工序',
   labelKindName: '标签类型',
   printType: '模板分类',
-  printTypeName:'模板分类',
+  printTypeName: '模板分类',
 //   *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
 
   //工艺流程相关
@@ -536,7 +536,7 @@ export const columns = {
   nodeName: '节点名称',
   nodeKind: '节点类型',
   nodeKindName: '节点类型',
-  currentNode:'当前工序',
+  currentNode: '当前工序',
   nodeId: '工序',
   flowNodeName: '工序节点',
   collectType: '采集方式',
@@ -574,12 +574,12 @@ export const columns = {
   scrapFlg: '报损标识',
   carModelCode: '载具型号',
   carModelName: '载具名称',
-  flgNoJobDefect :'无工种缺陷',
-  workShopName:'生产车间',
-  nodeDesc :'工序描述',
-  nodeTypes :'工序类别',
-  techType :'工艺类别',
-  workShop :'生产车间',
+  flgNoJobDefect: '无工种缺陷',
+  workShopName: '生产车间',
+  nodeDesc: '工序描述',
+  nodeTypes: '工序类别',
+  techType: '工艺类别',
+  workShop: '生产车间',
 
   fty: '工厂',
   ftyCode: '工厂编码',
@@ -685,29 +685,29 @@ export const columns = {
   suspendName: '挂起单名',
   suspendNode: '挂起工序',
   makeTime: '制单时间',
-  suspendNodeId:'挂起工序',
+  suspendNodeId: '挂起工序',
 
   //条码变更
-  productBarCode:'条码变更',
-  moldLineName:'成型线名称',
-  moldingType:'成型线类型',
-  changeDate:'变更日期',
-  changeDateTime:'变更时间',
-  productUniqueCode:'产品编码',
-  moldingUser:'成型工号',
-  moldingTime:'注浆日期',
-  moldLineCode:'成型线编码',
-  oldPdtCode:'原产品条码',
-  pdtCodeNew:'新产品条码',
-  changeUser:'变更者',
-  moldLineSysTags:'成型线标签',
-  bindUserCode:'绑定工号',
+  productBarCode: '条码变更',
+  moldLineName: '成型线名称',
+  moldingType: '成型线类型',
+  changeDate: '变更日期',
+  changeDateTime: '变更时间',
+  productUniqueCode: '产品编码',
+  moldingUser: '成型工号',
+  moldingTime: '注浆日期',
+  moldLineCode: '成型线编码',
+  oldPdtCode: '原产品条码',
+  pdtCodeNew: '新产品条码',
+  changeUser: '变更者',
+  moldLineSysTags: '成型线标签',
+  bindUserCode: '绑定工号',
   userBindKindIdName: '工号绑定类型',
-  pdtBarcode:'产品条码',
-  hisPdtCodes:'历史条码',
-  moldedNum:'成型次数',
-  renderMTime:'交坯时间',
-  finishTime:'完成时间',
+  pdtBarcode: '产品条码',
+  hisPdtCodes: '历史条码',
+  moldedNum: '成型次数',
+  renderMTime: '交坯时间',
+  finishTime: '完成时间',
 
   bindUserId: '绑定工号',
   moldingInfo: '成型信息',
@@ -716,192 +716,192 @@ export const columns = {
   moldlineItemKindName: '成型线状态',
 
   //商标釉色设定
-  oldLogoName:'原商标',
-  setLogo:'商标设定',
-  setColour:'釉色设定',
-  oldColourName:'原釉色',
-  defJobId:'默认工种',
-  defJobName:'默认工种',
-  newPdtLogo:'新商标',
-  newPdtColour:'新釉色',
-  hisTime:'变更时间',
+  oldLogoName: '原商标',
+  setLogo: '商标设定',
+  setColour: '釉色设定',
+  oldColourName: '原釉色',
+  defJobId: '默认工种',
+  defJobName: '默认工种',
+  newPdtLogo: '新商标',
+  newPdtColour: '新釉色',
+  hisTime: '变更时间',
 
   //工号变更
-  unMoldedReasonId:'未成型原因',
-  opCreateTime:'创建时间',
-  opCreateUserName:'创建者',
-  moldingUserChange:'工号变更',
-  moldLineUniqueCode:'成型线编码',
+  unMoldedReasonId: '未成型原因',
+  opCreateTime: '创建时间',
+  opCreateUserName: '创建者',
+  moldingUserChange: '工号变更',
+  moldLineUniqueCode: '成型线编码',
 
   //产品等级
-  flgDefault:'默认等级',
+  flgDefault: '默认等级',
 
   //生产
-  prodUserCode:'生产工号',
-  opCreateUser:'创建者',
-  slipCastingNum:'注浆次数',
-  kilnCarCode:'窑车编码',
-  kilnUsedNum:'烧成批次',
-  dutyUser:'责任员工',
-  leakCheckDutyUser:'漏检责任员工',
-  defectFile:'缺陷图片',
-  produceModelCode:'模具编码',
-  bindCarModel:'批量设置载具型号',
-  KilnCarNumber:'窑炉车号',
-  produceBarCode:'起始条码',
-  productRemarks:'备注',
-  barCode:'产品条码',
-  modelMouldCode:'模具编码',
-  flgRecycled:'回收标识',
-  fineId:'缺陷扣罚',
-  createUserName:'创建用户',
-  opnTime:'创建时间',
-  KilnCarCode:'窑车编码',
-  blameNodeId:'责任工序',
-  blameWsJobId:'责任工种',
-  blameUserId:'责任工号',
-  blameStaffId:'责任员工',
-  dftFineId:'缺陷扣罚',
-  pdtPlaceId:'缺陷位置',
-  dressKilnCar:'装载具',
-  unloadKilnCar:'卸载具',
-  KilnCar:'载具',
-  oldCarCode:'原载具',
-  newCarCode:'新载具',
-  vehicleCode:'载具码',
-  dftFineName:'缺陷扣罚',
-  vehicleBarcode:'载具条码',
-  blameUserCode:'工号编码',
-  blameUserName:'工号名称',
-  blameJobCode:'工种编码',
-  blameJobName:'工种名称',
+  prodUserCode: '生产工号',
+  opCreateUser: '创建者',
+  slipCastingNum: '注浆次数',
+  kilnCarCode: '窑车编码',
+  kilnUsedNum: '烧成批次',
+  dutyUser: '责任员工',
+  leakCheckDutyUser: '漏检责任员工',
+  defectFile: '缺陷图片',
+  produceModelCode: '模具编码',
+  bindCarModel: '批量设置载具型号',
+  KilnCarNumber: '窑炉车号',
+  produceBarCode: '起始条码',
+  productRemarks: '备注',
+  barCode: '产品条码',
+  modelMouldCode: '模具编码',
+  flgRecycled: '回收标识',
+  fineId: '缺陷扣罚',
+  createUserName: '创建用户',
+  opnTime: '创建时间',
+  KilnCarCode: '窑车编码',
+  blameNodeId: '责任工序',
+  blameWsJobId: '责任工种',
+  blameUserId: '责任工号',
+  blameStaffId: '责任员工',
+  dftFineId: '缺陷扣罚',
+  pdtPlaceId: '缺陷位置',
+  dressKilnCar: '装载具',
+  unloadKilnCar: '卸载具',
+  KilnCar: '载具',
+  oldCarCode: '原载具',
+  newCarCode: '新载具',
+  vehicleCode: '载具码',
+  dftFineName: '缺陷扣罚',
+  vehicleBarcode: '载具条码',
+  blameUserCode: '工号编码',
+  blameUserName: '工号名称',
+  blameJobCode: '工种编码',
+  blameJobName: '工种名称',
   //撤销
-  reasonPdtFlowNodeName:'完成工序',
-  reasonCarrierCode:'所在载具',
-  undoReason:'撤销原因',
+  reasonPdtFlowNodeName: '完成工序',
+  reasonCarrierCode: '所在载具',
+  undoReason: '撤销原因',
   //产品报损
-  damageReason:'损柸原因',
-  gradeClassification:'产品分级',
-  scrapAgoNodeName:'报损工序',
-  pdtDefectName:'损坯原因',
-  pdtDefectData:'损坯日期',
+  damageReason: '损柸原因',
+  gradeClassification: '产品分级',
+  scrapAgoNodeName: '报损工序',
+  pdtDefectName: '损坯原因',
+  pdtDefectData: '损坯日期',
   //在产盘点
-  checkName:'盘点名称',
-  checkCode:'盘点单号',
-  checkUserCodeList:'用户编码',
-  checkUserNameList:'用户名称',
-  notCounted:'未盘点',
-  counted:'已盘点',
-  inventoryProfit:'盘盈',
-  finishTimeStart:'完成时间',
-  finishTimeEnd:'结束时间',
-  makeTimeStart:'生产时间',
-  makeTimeEnd:'结束时间',
-  flowNodeIdList:'盘点工序',
-  checkModelCategory:'产品类别',
-  productCodeList:'产品编码',
-  prodCheckUser:'盘点工号',
-  prodCheckTitle:'盘点',
-  checkTime:'盘点时间',
-  decrease:'盘亏报损',
+  checkName: '盘点名称',
+  checkCode: '盘点单号',
+  checkUserCodeList: '用户编码',
+  checkUserNameList: '用户名称',
+  notCounted: '未盘点',
+  counted: '已盘点',
+  inventoryProfit: '盘盈',
+  finishTimeStart: '完成时间',
+  finishTimeEnd: '结束时间',
+  makeTimeStart: '生产时间',
+  makeTimeEnd: '结束时间',
+  flowNodeIdList: '盘点工序',
+  checkModelCategory: '产品类别',
+  productCodeList: '产品编码',
+  prodCheckUser: '盘点工号',
+  prodCheckTitle: '盘点',
+  checkTime: '盘点时间',
+  decrease: '盘亏报损',
 
   //载具产品
-  carrierBatch:'使用批次',
-  curLoadQty:'装载数量',
-  carrierFlowCode:'载具条码',
-  opnBatch:'集采批次',
-  nowNodeName:'当前工序',
-  mouldCheckMouldKind:'模具类别',
+  carrierBatch: '使用批次',
+  curLoadQty: '装载数量',
+  carrierFlowCode: '载具条码',
+  opnBatch: '集采批次',
+  nowNodeName: '当前工序',
+  mouldCheckMouldKind: '模具类别',
 
   //模具盘点
-  fabricationName:'制作工号',
-  LossReportingTime:'报损时间',
-  LossReportingUserName:'报损工号',
-  mouldkindName:'模具状态',
+  fabricationName: '制作工号',
+  LossReportingTime: '报损时间',
+  LossReportingUserName: '报损工号',
+  mouldkindName: '模具状态',
 
   //湿温度计记录
-  recordTime:'记录时间',
-  temperature:'温度(℃)',
-  humidity:'湿度(%RH)',
-  thmeterRecord:'湿温度计',
+  recordTime: '记录时间',
+  temperature: '温度(℃)',
+  humidity: '湿度(%RH)',
+  thmeterRecord: '湿温度计',
 
   //工位打卡
-  replaceStaffName:'替班员工',
-  saveOffWork:'下班(F)',
-  saveWork:'上班(S)',
-  relief:'替班员工',
-  currentStaffName:'当前员工',
+  replaceStaffName: '替班员工',
+  saveOffWork: '下班(F)',
+  saveWork: '上班(S)',
+  relief: '替班员工',
+  currentStaffName: '当前员工',
 
   //在产品明细表
-  opnUserCode:'生产工号',
-  moldingUserCode:'成型工号',
-  carrierUniqueCode:'载具编码',
-  inProductReport:'在产品明细表',
-  carrierRangeName:'载具区域',
-  flgRenderM:'交坯标识',
-  manageUserCode:'成型班长',
-  manageUserNameB:'成型班长名称',
-  opCreateUserCode:'操作工号',
-  opCreateUserNameB:'操作用户',
+  opnUserCode: '生产工号',
+  moldingUserCode: '成型工号',
+  carrierUniqueCode: '载具编码',
+  inProductReport: '在产品明细表',
+  carrierRangeName: '载具区域',
+  flgRenderM: '交坯标识',
+  manageUserCode: '成型班长',
+  manageUserNameB: '成型班长名称',
+  opCreateUserCode: '操作工号',
+  opCreateUserNameB: '操作用户',
   operationTime: '操作时间',
   //生产工位
-  stationUsers:'工位工号',
-  printerId:'打印机',
-  printLayoutId:'打印模板',
-  printLayoutName:'打印模板',
-  stationInformation:'生产工位',
-  userInformation:'工位工号',
-  printerInformation:'工位打印机',
-  logoColour:'商品釉色',
-  opnFlowNodeId:'操作工序',
-  missFlowNodeId:'漏扫工序',
-  opnFlowNodeName:'操作工序',
-  missFlowNodeName:'漏扫工序',
-  pdtFlowNodeName:'产品所在工序',
-  opnStationName:'操作工位',
-  opnUserName:'操作者',
-  changeNodeName:'变更工序',
-  modelEquipment:'设备型号',
-  moldlineGroupNo:'分组序号',
-  productCategoryName:'产品类别',
+  stationUsers: '工位工号',
+  printerId: '打印机',
+  printLayoutId: '打印模板',
+  printLayoutName: '打印模板',
+  stationInformation: '生产工位',
+  userInformation: '工位工号',
+  printerInformation: '工位打印机',
+  logoColour: '商品釉色',
+  opnFlowNodeId: '操作工序',
+  missFlowNodeId: '漏扫工序',
+  opnFlowNodeName: '操作工序',
+  missFlowNodeName: '漏扫工序',
+  pdtFlowNodeName: '产品所在工序',
+  opnStationName: '操作工位',
+  opnUserName: '操作者',
+  changeNodeName: '变更工序',
+  modelEquipment: '设备型号',
+  moldlineGroupNo: '分组序号',
+  productCategoryName: '产品类别',
   productionUserCode: '生产工号',
   productionProcess: '生产工序',
-  crovMonth:'结转月份',
-  crovCode:'结转单号',
-  dateBegin:'开始日期',
-  dateEnd:'结束日期',
-  makeUserCode:'制单工号',
-  opnMakeUserName:'制单员',
-  pdtProdQty:'生产数量',
-  pdtGradeName:'产品分级',
-  pdtGradekindName:'产品等级',
-  crovMonthDateRange:'日期范围',
-  flgDefaultStaff:'默认员工',
-  mouldQty:'模具数量',
-  unusedNum:'剩余成型次数',
+  crovMonth: '结转月份',
+  crovCode: '结转单号',
+  dateBegin: '开始日期',
+  dateEnd: '结束日期',
+  makeUserCode: '制单工号',
+  opnMakeUserName: '制单员',
+  pdtProdQty: '生产数量',
+  pdtGradeName: '产品分级',
+  pdtGradekindName: '产品等级',
+  crovMonthDateRange: '日期范围',
+  flgDefaultStaff: '默认员工',
+  mouldQty: '模具数量',
+  unusedNum: '剩余成型次数',
 
   // 自定义报表
-  reportName:'报表名称',
-  code:'编码',
-  name:'名称',
-  type:'类型',
-  flgRequired:'必输',
+  reportName: '报表名称',
+  code: '编码',
+  name: '名称',
+  type: '类型',
+  flgRequired: '必输',
   sqlScript: 'SQL信息',
-  width:'列宽',
-  align:'对齐方式',
-  flgThousandth:'千分位',
-  dataType:'数据类型',
-  flgPage:'分页',
-  userNames:'用户',
+  width: '列宽',
+  align: '对齐方式',
+  flgThousandth: '千分位',
+  dataType: '数据类型',
+  flgPage: '分页',
+  userNames: '用户',
   reportKind: '条件类型',
-  settingNumberType:'设置数值格式',
-  sqlSetting:'设置SQL',
-  sqlLabel:'页签标题',
-  sqlName:'页签名称',
-  flgSum:'合计',
-  reportStatusName:'报表状态',
-  describe:'描述',
-  sqlErr:'SQL中包括不合法的关键字',
+  settingNumberType: '设置数值格式',
+  sqlSetting: '设置SQL',
+  sqlLabel: '页签标题',
+  sqlName: '页签名称',
+  flgSum: '合计',
+  reportStatusName: '报表状态',
+  describe: '描述',
+  sqlErr: 'SQL中包括不合法的关键字',
 }
 
 /**
@@ -1012,6 +1012,8 @@ export const messages = {
   W_129: '只能在PDA设备上运行',
   W_130: '当前暂无可保存，请输入后重新操作',
   W_131: '当前暂无改判权限',
+  W_132: '当前存在未添加的数据',
+  W_133: '请选择至少一条责任员工',
   E_001: '系统出现异常，请联系管理员。',
   Q_001: '当前页面的数据有过更改，请确认需要保存吗？',
   Q_002: '确定要进行{param}操作吗？',
@@ -1116,8 +1118,8 @@ export const others = {
   exceptFilter: '除外过滤',
   freeze: '冻结',
   clearFreeze: '清除冻结',
-  exportAll:'导出所有',
-  exportOne:'导出当前页',
+  exportAll: '导出所有',
+  exportOne: '导出当前页',
   adaption: '自适应列宽',
   selfAdaptionOne: '当前列自适应',
   selfAdaption: '全部列自适应',
@@ -1187,7 +1189,7 @@ export const others = {
   modelMouldOutput: '模具产出型号',
   searchAll: '查找全部',
   equalCell: '单元格匹配',
-  doubleSeq:'双击行号选择数据',
+  doubleSeq: '双击行号选择数据',
 }
 
 /**
@@ -1204,10 +1206,10 @@ export const loginAppTitle = {
   appftyCode: '工厂编码',
   appUserCode: '用户名',
   appUserPw: '密码',
-  appChangeUser:'切换用户',
-  appAbout:'关于',
-  appCurrentFontDes:'当前字体大小',
-  appVersion:'版本',
+  appChangeUser: '切换用户',
+  appAbout: '关于',
+  appCurrentFontDes: '当前字体大小',
+  appVersion: '版本',
   appIpPort: '域名地址',
 }
 
@@ -1383,21 +1385,21 @@ export const appColumns = {
   appFormingLine: '成型线',
   appCompleteTheProcess: '完成工序',
   appReasonsForLossReporting: '报损原因',
-  appOldLogoName:'原商标',
-  appNewLogoName:'新商标',
-  appRawGlaze:'原釉料',
-  appNewGlaze:'新釉料',
-  appStation:'工位',
-  appServerPrinter:'服务器打印机',
-  appOuterBoxCodePrinter1:'外箱码打印机1',
-  appOuterBoxCodePrinter2:'外箱码打印机2',
-  appFlgBindUnique:'绑码标识',
-  appVehicleCode:'载具码',
+  appOldLogoName: '原商标',
+  appNewLogoName: '新商标',
+  appRawGlaze: '原釉料',
+  appNewGlaze: '新釉料',
+  appStation: '工位',
+  appServerPrinter: '服务器打印机',
+  appOuterBoxCodePrinter1: '外箱码打印机1',
+  appOuterBoxCodePrinter2: '外箱码打印机2',
+  appFlgBindUnique: '绑码标识',
+  appVehicleCode: '载具码',
   appMouldScrapDate: '报废日期',
   appScrapUserName: '报废工号',
-  appBindBarcode:'绑定条码',
-  appHisPdtCodes:'历史条码',
-  appDefectCode:'缺陷编码',
+  appBindBarcode: '绑定条码',
+  appHisPdtCodes: '历史条码',
+  appDefectCode: '缺陷编码',
   appModelCategory: '型号分类',
   appFinishTime: '完成日期',
   appProductionUserIds: '生产工号',
@@ -1406,14 +1408,14 @@ export const appColumns = {
   appSaveOffWork: '下班',
   appStaffInput: '请输入第{param}条员工',
   appDataInput: '第{param}条数据未输入',
-  appModelCodeB:'型号编码',
-  appReasonCarrierCode:'所在载具',
-  appProductUniqueCode:'产品编码',
-  appProductDamage:'损坯原因',
-  appPrinter:'打印机',
-  appTemplateClassification:'模板分类',
-  appPrintTemplate:'打印模板',
-  appOpnTime:'操作日期',
+  appModelCodeB: '型号编码',
+  appReasonCarrierCode: '所在载具',
+  appProductUniqueCode: '产品编码',
+  appProductDamage: '损坯原因',
+  appPrinter: '打印机',
+  appTemplateClassification: '模板分类',
+  appPrintTemplate: '打印模板',
+  appOpnTime: '操作日期',
   appLableInput: '请输入{param}',
 }
 /**
@@ -1503,24 +1505,24 @@ export const appOthers = {
   appIsLossReportingTitle: '是否报损全部未盘点模具?',
   appMoldingUserChangeTitle: '工号变更',
   appChooseBarcodeTitle: '选择条码',
-  appSeeMore:'查看更多',
-  appSemiInspection:'半检',
-  appInspection:'成检',
-  appDuplicateData:'重复数据',
-  appNewProductBarcodeTitle:'新产品条码重复,请重新输入',
+  appSeeMore: '查看更多',
+  appSemiInspection: '半检',
+  appInspection: '成检',
+  appDuplicateData: '重复数据',
+  appNewProductBarcodeTitle: '新产品条码重复,请重新输入',
   appDefectIsTrue: '请回车验证缺陷位置',
   appDefectNoIsTrue: '请回车验证缺陷编码',
-  appExcellent:'优',
-  appGood:'良',
-  appDataDuplication:'数据重复,已存在相同位置编码和缺陷编码',
-  appNodePieceworkSingleItem:'节点计件-单品',
-  appAddProdCheckTitle:'新建在产盘点',
-  appProductLossReportingTitle:'产品报损',
-  appStaionSettingsActiveTitle:'同一个工位，同一个打印机只能放置一个',
-  appDefectNameWei:'请输入缺陷位置编码',
-  appUnableCountOperation:'当前登录工号不包括在此盘点单盘点工号内,无法盘点操作',
-  appDefectsOperation:'当前操作有未记录的缺陷',
-  appProductionKilnWrong:'当前窑炉车号不存在'
+  appExcellent: '优',
+  appGood: '良',
+  appDataDuplication: '数据重复,已存在相同位置编码和缺陷编码',
+  appNodePieceworkSingleItem: '节点计件-单品',
+  appAddProdCheckTitle: '新建在产盘点',
+  appProductLossReportingTitle: '产品报损',
+  appStaionSettingsActiveTitle: '同一个工位，同一个打印机只能放置一个',
+  appDefectNameWei: '请输入缺陷位置编码',
+  appUnableCountOperation: '当前登录工号不包括在此盘点单盘点工号内,无法盘点操作',
+  appDefectsOperation: '当前操作有未记录的缺陷',
+  appProductionKilnWrong: '当前窑炉车号不存在'
 }
 
 

src/view/mst/mould-check/index.vue

@@ -300,6 +300,7 @@
        */
       decreaseAllNoCheck() {
         let list = this.$refs['not-counted-select'].$refs.notCountedTable.getCheckboxRecords().map(map => map.itemId)
+        let mouldIdList = this.$refs['not-counted-select'].$refs.notCountedTable.getCheckboxRecords().map(map => map.mouldId)
         if (list && list.length > 0) {
           this.$IBMessage({
               content: this.$t('Q_017'),
@@ -307,7 +308,7 @@
             },
             {
               ok: () => {
-                this.saveAllNoCheck(list)
+                this.saveAllNoCheck(list,mouldIdList)
               },
               cancel: () => {
               }
@@ -321,17 +322,16 @@
        *   @date   : 2023/3/23 16:39
        *   @author : 寇珊珊
        */
-      saveAllNoCheck(list) {
+      saveAllNoCheck(list,mouldIdList) {
         let params = {
           checkId: this.checkId,
           idList: list,
+          mouldIdList: mouldIdList,
         }
         this.excute(this.$service.mouldCheckItmService, this.$service.mouldCheckItmService.check.url, params).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
             this.$Message.success(res.message)
             this.getDetail(1)
-          } else {
-            this.$Message.error(res.message)
           }
         })
       },

src/view/pdm/process-node-reverse/add.vue

@@ -9,13 +9,13 @@
       <DkPanel prop="essentialInformation">
         <!--添加行按钮-->
         <DkButton slot="content" type="success" @click="addRow" size="small"
-                  style="float: left;position: absolute; top: 9px;left: 120px;">{{ $v('add') }}
+                  style="float: left;position: absolute; top: 9px;left: 120px;">{{ $v('saveDetail') }}
         </DkButton>
         <div style="clear:both"></div>
         <!--  下拉区域  -->
         <DkForm slot="content" ref="formInline" v-model="formData" style="width: 95%">
           <!--产品条码-->
-          <DkFormItem :required="true" prop="barCode">
+          <DkFormItem  prop="barCode">
             <InputPop ref="barCode" v-model="formData.barCode" @on-enter="onBarCode"
                       @on-blur="onBarCode"/>
           </DkFormItem>
@@ -179,7 +179,7 @@
       addRow() {
         if(this.formData.barCode){
           //校验名称是否重复
-          if (!this.validData()) {
+          if (!this.validDataRow()) {
             return
           }
           this.barCodeList.push(this.formData.barCode)
@@ -202,27 +202,42 @@
         }
       },
       /**
+       *   @desc   : 校验重复数据
+       *   @date   : 2023/3/8 8:45
+       *   @author : 寇珊珊
+       */
+      validDataRow() {
+        if (this.detailList.length > 0) {
+          if (this.detailList.filter(it => it.barCode == this.formData.barCode).length > 0) {
+            this.$Message.error(this.$t('W_120'))
+            return false
+          }
+        }
+        return true
+      },
+      /**
        *   @desc   : 设置传参
        *   @date   : 2023/2/28 11:29
        *   @author : 寇珊珊
        */
       setParams() {
+        if (!this.validData()) {
+          return
+        }
         this.params = {
           barCodeList: this.barCodeList,
           undoReason: this.formData.undoReason,
         }
       },
       /**
-       *   @desc   : 校验重复数据
-       *   @date   : 2023/3/8 8:45
+       *   @desc   : 保存校验
+       *   @date   : 2023/4/6 10:33
        *   @author : 寇珊珊
        */
-      validData() {
-        if (this.detailList.length > 0) {
-          if (this.detailList.filter(it => it.barCode == this.formData.barCode).length > 0) {
-            this.$Message.error(this.$t('W_120'))
-            return false
-          }
+      validData(){
+        if(this.formData.barCode){
+          this.$Message.error(this.$t('W_132'))
+          return false
         }
         return true
       },
@@ -232,7 +247,7 @@
        *   @author : 寇珊珊
        */
       saveData() {
-        return this.excute(this.$service.collectService, this.$service.collectService.scrapUndo, this.params)
+        return this.excute(this.$service.collectService, this.$service.collectService.nodeUndo, this.params)
       },
       /**
        *   @desc   : 清空

src/view/pdm/process-node-reverse/index.vue

@@ -120,19 +120,28 @@
             itemCode: 'undoReason',
           },
         ],
-        flowNodeId: self.$config.reverseNodeId.id,
         ftyId: self.$store.state.user.ftyId,
         flgUndo: self.$config.reverseFlgUndo.flg
       }
     },
     methods: {
       /**
+       * @desc   : 调用同一路由，需要使用这个方法去设置created的方法
+       * @author : 周兴
+       * @date   : 2023/2/27 13:03
+       */
+      createdInit() {
+        // this.primaryKey = 'dataId'     // 设置主键
+        // console.log('formType',this.formType)
+        // 导出额外的条件
+        this.exportCondition = { flgUndo: true }
+      },
+      /**
        *   @desc   : 获取数据
        *   @date   : 2023/2/27 14:11
        *   @author : 寇珊珊
        */
       getData(params) {
-        params.flowNodeId = this.flowNodeId
         params.flgUndo = this.flgUndo
         return this.excute(this.$service.produceService, this.$service.produceService.search.url, params)
       },

src/view/pdm/prod-defect/add.vue

@@ -10,7 +10,7 @@
       <DkPanel prop="essentialInformation">
         <!--添加行按钮-->
         <DkButton slot="content" type="success" @click="addRow" size="small"
-                  style="float: left;position: absolute; top: 9px;left: 120px;">{{ $v('add') }}
+                  style="float: left;position: absolute; top: 9px;left: 120px;">{{ $v('saveDetail') }}
         </DkButton>
         <div style="clear:both"></div>
         <!--  下拉区域  -->
@@ -308,7 +308,7 @@
       addRow() {
         if(this.formData.barCode) {
           //校验名称是否重复
-          if (!this.validData()) {
+          if (!this.validDataRow()) {
             return
           }
           this.barCodeList.push(this.formData.barCode)
@@ -332,11 +332,28 @@
         }
       },
       /**
+       *   @desc   : 校验重复数据
+       *   @date   : 2023/3/8 8:45
+       *   @author : 寇珊珊
+       */
+      validDataRow() {
+        if (this.detailList.length > 0) {
+          if (this.detailList.filter(it => it.barCode == this.formData.barCode).length > 0) {
+            this.$Message.error(this.$t('W_120'))
+            return false
+          }
+        }
+        return true
+      },
+      /**
        *   @desc   : 设置传参
        *   @date   : 2023/2/28 11:29
        *   @author : 寇珊珊
        */
       setParams() {
+        if (!this.validData()) {
+          return
+        }
         let productionDefect = {
           pdtDefectId: this.LossReportingFormData.pdtDefectId,
           blameUserId: this.LossReportingFormData.blameUserId,
@@ -350,16 +367,18 @@
         }
       },
       /**
-       *   @desc   : 校验重复数据
-       *   @date   : 2023/3/8 8:45
+       *   @desc   : 保存校验
+       *   @date   : 2023/4/6 10:33
        *   @author : 寇珊珊
        */
-      validData() {
-        if (this.detailList.length > 0) {
-          if (this.detailList.filter(it => it.barCode == this.formData.barCode).length > 0) {
-            this.$Message.error(this.$t('W_120'))
-            return false
-          }
+      validData(){
+        if(this.formData.barCode){
+          this.$Message.error(this.$t('W_132'))
+          return false
+        }
+        if(this.$refs['staff-table-select'].$refs.table.getCheckboxRecords().length==0){
+          this.$Message.error(this.$t('W_133'))
+          return false
         }
         return true
       },

src/view/pdm/prod-defect/index.vue

@@ -41,21 +41,21 @@
         <!--产品名称-->
         <DkTableColumn field="modelName"></DkTableColumn>
         <!--产品型号-->
-        <DkTableColumn field="modelCode"></DkTableColumn>
+        <DkTableColumn field="modelMouldCode"></DkTableColumn>
         <!--成型线-->
         <DkTableColumn field="moldlineName"></DkTableColumn>
         <!--成型日期-->
         <DkTableColumn field="moldingDate"></DkTableColumn>
         <!--完成时间-->
         <DkTableColumn field="finishTime"></DkTableColumn>
-        <!--完成工序-->
-        <DkTableColumn field="pdtFlowNodeName" :title="$t('moldingUser')"></DkTableColumn>
+        <!--成型工号-->
+        <DkTableColumn field="moldingUserCode" :title="$t('moldingUser')"></DkTableColumn>
         <!--所在载具-->
-        <DkTableColumn field="carrierCode"></DkTableColumn>
+        <DkTableColumn field="carrierCode" :title="$t('reasonCarrierCode')"></DkTableColumn>
         <!--产品分级-->
-        <DkTableColumn field="opnGradeKindName" :title="$t('gradeClassification')"></DkTableColumn>
+        <DkTableColumn field="opnGradeName" :title="$t('gradeClassification')"></DkTableColumn>
         <!--报损工序-->
-        <DkTableColumn field="scrapAgoNodeName"></DkTableColumn>
+        <DkTableColumn field="blameNodeName" :title="$t('scrapAgoNodeName')"></DkTableColumn>
         <!--损柸原因-->
         <DkTableColumn field="pdtDefectName"></DkTableColumn>
         <!--责任工号-->
@@ -80,47 +80,15 @@
       let self = this
       return {
         searchContent: [
-          //todo  暂留
-          // {
-          //   //成型线编码
-          //   itemCode: 'moldlineCode',
-          //   valueFormat: {code: 'uniqueCode'},
-          // },
-          // {
-          //   //成型线名称
-          //   itemCode: 'moldlineName',
-          // },
           {
             //产品条码
             itemCode: 'uniqueCode',
             itemName: 'barCode',
           },
           {
-            //产品编码
-            itemCode: 'modelCode',
-            itemName: 'productCode',
-          },
-          {
-            //产品名称
-            itemCode: 'modelName',
-            itemName: 'productName',
-          },
-          {
             //产品型号
             itemCode: 'mouldCode',
           },
-          //todo  暂留
-          // {
-          //   //损柸日期
-          //   itemCode: 'opnTime',
-          //   itemName: 'pdtDefectData',
-          //   valueFormat: {code: 'opnTime', default: [new Date().toDateStr(), new Date().toDateStr()]},
-          //   valueKind: 'DATE_RANGE'
-          // },
-          // {
-          //   //损柸原因
-          //   itemCode: 'pdtDefectName',
-          // },
           {
             //责任工号
             itemCode: 'blameUserCode',
@@ -136,7 +104,17 @@
       }
     },
     methods: {
-
+      /**
+       * @desc   : 调用同一路由，需要使用这个方法去设置created的方法
+       * @author : 周兴
+       * @date   : 2023/2/27 13:03
+       */
+      createdInit() {
+        // this.primaryKey = 'dataId'     // 设置主键
+        // console.log('formType',this.formType)
+        // 导出额外的条件
+        this.exportCondition = { flowNodeId: this.$config.reverseNodeId.id }
+      },
       /**
        *   @desc   : 获取数据
        *   @date   : 2023/2/27 14:11
@@ -144,7 +122,18 @@
        */
       getData(params) {
         params.flowNodeId = this.flowNodeId
-        return this.excute(this.$service.produceService, this.$service.produceService.search.url, params)
+        this.excute(this.$service.produceService, this.$service.produceService.search.url, params).then((res) => {
+          console.log(res)
+          for (let i  of  res.data.list) {
+            if (i.productionDefectList && i.productionDefectList.length > 0) {
+              i.blameUserCode = i.productionDefectList[0].blameUserCode
+              i.blameStaffName = i.productionDefectList[0].blameStaffName
+              i.pdtDefectName = i.productionDefectList[0].pdtDefectName
+              i.blameNodeName = i.productionDefectList[0].blameNodeName
+            }
+          }
+          this.tableData = res.data.list
+        })
       },
 
     },

src/view/pdm/prod-defect/reverse.vue

@@ -9,13 +9,13 @@
       <DkPanel prop="essentialInformation">
         <!--添加行按钮-->
         <DkButton slot="content" type="success" @click="addRow" size="small"
-                  style="float: left;position: absolute; top: 9px;left: 120px;">{{ $v('add') }}
+                  style="float: left;position: absolute; top: 9px;left: 120px;">{{ $v('saveDetail') }}
         </DkButton>
         <div style="clear:both"></div>
         <!--  下拉区域  -->
         <DkForm slot="content" ref="formInline" v-model="formData" style="width: 95%">
           <!--产品条码-->
-          <DkFormItem :required="true" prop="barCode">
+          <DkFormItem prop="barCode">
             <InputPop ref="barCode" v-model="formData.barCode" @on-enter="onBarCode"
                       @on-blur="onBarCode"/>
           </DkFormItem>
@@ -171,7 +171,7 @@
       addRow() {
         if(this.formData.barCode) {
           //校验名称是否重复
-          if (!this.validData()) {
+          if (!this.validDataRow()) {
             return
           }
           this.barCodeList.push(this.formData.barCode)
@@ -193,27 +193,42 @@
         }
       },
       /**
+       *   @desc   : 校验重复数据
+       *   @date   : 2023/3/8 8:45
+       *   @author : 寇珊珊
+       */
+      validDataRow() {
+        if (this.detailList.length > 0) {
+          if (this.detailList.filter(it => it.barCode == this.formData.barCode).length > 0) {
+            this.$Message.error(this.$t('W_120'))
+            return false
+          }
+        }
+        return true
+      },
+      /**
        *   @desc   : 设置传参
        *   @date   : 2023/2/28 11:29
        *   @author : 寇珊珊
        */
       setParams() {
+        if (!this.validData()) {
+          return
+        }
         this.params = {
           barCodeList: this.barCodeList,
           undoReason: this.formData.undoReason,
         }
       },
       /**
-       *   @desc   : 校验重复数据
-       *   @date   : 2023/3/8 8:45
+       *   @desc   : 保存校验
+       *   @date   : 2023/4/6 10:33
        *   @author : 寇珊珊
        */
-      validData() {
-        if (this.detailList.length > 0) {
-          if (this.detailList.filter(it => it.barCode == this.formData.barCode).length > 0) {
-            this.$Message.error(this.$t('W_120'))
-            return false
-          }
+      validData(){
+        if(this.formData.barCode){
+          this.$Message.error(this.$t('W_132'))
+          return false
         }
         return true
       },