diff --git a/api/workorder/index.js b/api/workorder/index.js index c4a0f25..55d0165 100644 --- a/api/workorder/index.js +++ b/api/workorder/index.js @@ -85,4 +85,49 @@ export function BoxLabelAndProductLabel(params) { method: 'get', params }) +} + +// 校验箱子标签(TODO 2025-04-09 新报工接口) +export function CheckBoxInspectionLabel(params) { + return request({ + url: '/mes/Mobile/PrintAndReportWork2/CheckBoxInspectionLabel', + method: 'get', + params + }) +} + +// 获取首件检验标签(TODO 2025-04-09 新报工接口) +export function GetFirstInspectionLabel(params) { + return request({ + url: '/mes/Mobile/PrintAndReportWork2/firstInspectionLabel', + method: 'get', + params + }) +} + +// 校验首标签(TODO 2025-04-09 新报工接口) +export function CheckFirstInspectionLabel(params) { + return request({ + url: '/mes/Mobile/PrintAndReportWork2/CheckfirstInspectionLabel', + method: 'get', + params + }) +} + +// 获取末件检验标签(TODO 2025-04-09 新报工接口) +export function GetEndInspectionLabel(params) { + return request({ + url: '/mes/Mobile/PrintAndReportWork2/getendinspectionlabel', + method: 'get', + params + }) +} + +// 校验末件标签(TODO 2025-04-09 新报工接口) +export function CheckEndInspectionLabel(params) { + return request({ + url: '/mes/Mobile/PrintAndReportWork2/CheckEndInspectionLabel', + method: 'get', + params + }) } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 4a92cb4..e04c368 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "DOAN总装车间PDA", "appid" : "__UNI__EFA389B", "description" : "DOAN总装车间PDA", - "versionName" : "1.4.0", - "versionCode" : 140, + "versionName" : "1.5.0", + "versionCode" : 150, "transformPx" : false, "app-plus" : { "usingComponents" : true, diff --git a/pages.json b/pages.json index ee04e09..3f0c90b 100644 --- a/pages.json +++ b/pages.json @@ -168,6 +168,13 @@ { "navigationBarTitleText" : "标签扫码报工" } + }, + { + "path" : "pages/produceManagement/checkLabel/checkLabel", + "style" : + { + "navigationBarTitleText" : "校验标签" + } } ], "tabBar": { diff --git a/pages/produceManagement/andon/alarm.vue b/pages/produceManagement/andon/alarm.vue index 3cb8612..6d5089f 100644 --- a/pages/produceManagement/andon/alarm.vue +++ b/pages/produceManagement/andon/alarm.vue @@ -17,9 +17,9 @@ - + diff --git a/pages/produceManagement/checkLabel/checkLabel.vue b/pages/produceManagement/checkLabel/checkLabel.vue new file mode 100644 index 0000000..8dfbb3d --- /dev/null +++ b/pages/produceManagement/checkLabel/checkLabel.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/pages/produceManagement/checkLabel/step1.vue b/pages/produceManagement/checkLabel/step1.vue new file mode 100644 index 0000000..257b70b --- /dev/null +++ b/pages/produceManagement/checkLabel/step1.vue @@ -0,0 +1,335 @@ + + + + + diff --git a/pages/produceManagement/checkLabel/step2.vue b/pages/produceManagement/checkLabel/step2.vue new file mode 100644 index 0000000..ed6f014 --- /dev/null +++ b/pages/produceManagement/checkLabel/step2.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/pages/produceManagement/scanLabelReport/scanLabelReport.vue b/pages/produceManagement/scanLabelReport/scanLabelReport.vue index 394ab8c..720cde0 100644 --- a/pages/produceManagement/scanLabelReport/scanLabelReport.vue +++ b/pages/produceManagement/scanLabelReport/scanLabelReport.vue @@ -102,7 +102,7 @@ export default { dialog: { title: '操作提醒', content: '', - type: 'warning' + type: 'warn' }, deleteIndex: null, deleteDialogRef: null, diff --git a/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue b/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue index 28b2395..980edbe 100644 --- a/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue +++ b/pages/produceManagement/scanWorkOrder/scanWorkOrder.vue @@ -71,7 +71,7 @@ ref="inputClose2" title="操作提醒" content="工单已完成报工,是否继续报工!" - type="warning" + type="warn" cancelText="关闭" confirmText="继续" @confirm="dialogConfirm2" @close="dialogClose2" diff --git a/pages/produceManagement/workorder/workorder.vue b/pages/produceManagement/workorder/workorder.vue index 17f4472..346ca46 100644 --- a/pages/produceManagement/workorder/workorder.vue +++ b/pages/produceManagement/workorder/workorder.vue @@ -186,7 +186,7 @@ export default { onListItemClick(item) { const params = item.workOrderInfo; uni.navigateTo({ - url: '/pages/produceManagement/scanLabelReport/scanLabelReport?' + tansParams(params) + url: '/pages/produceManagement/checkLabel/checkLabel?' + tansParams(params) }); }, // 扫码报工