diff --git a/src/api/mes/workScheduling/index.ts b/src/api/mes/workScheduling/index.ts
index f39ee19..0db5dc1 100644
--- a/src/api/mes/workScheduling/index.ts
+++ b/src/api/mes/workScheduling/index.ts
@@ -34,7 +34,7 @@ export function getWorkSchedulingPage(params) {
export function getWorkSchedulingDetail(number) {
//return http.get('/eam/item-apply-request-main/appGetByNumber?number=' + number)
- return http.get('/mes/work-scheduling/get?id=' + number)
+ return http.get('/mes/work-scheduling-detail/get-info?schedulingCode=' + number)
}
export function getBomInfo(params) {
diff --git a/src/pages.json b/src/pages.json
index ad903a3..2a933bf 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1909,6 +1909,12 @@
}
},{
"path": "pages/mes/workScheduling/workScheduling",
+ "style": {
+ "navigationBarTitleText": "生产任务查询",
+ "enablePullDownRefresh": true
+ }
+ },{
+ "path": "pages/mes/workScheduling/workSchedulingDetail",
"style": {
"navigationBarTitleText": "生产任务查询明细",
"enablePullDownRefresh": true
@@ -1937,6 +1943,12 @@
"navigationBarTitleText": "齐套检查——检查项",
"enablePullDownRefresh": true
}
+ },{
+ "path": "pages/mes/workScheduling/reportWorkQualityInspection",
+ "style": {
+ "navigationBarTitleText": "报工质检",
+ "enablePullDownRefresh": true
+ }
},{
"path": "pages/mes/workOrder/processReport",
"style": {
diff --git a/src/pages/mes/workScheduling/reportWorkQualityInspection.vue b/src/pages/mes/workScheduling/reportWorkQualityInspection.vue
new file mode 100644
index 0000000..d0cba79
--- /dev/null
+++ b/src/pages/mes/workScheduling/reportWorkQualityInspection.vue
@@ -0,0 +1,418 @@
+
+
+
+
+
+
+
+
+
+
+ 检验质检单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 检测信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 报工信息
+
+
+
+ 报工人员：
+ {{ data.schedulingCode }}
+
+
+ 报工数量：
+ {{ data.schedulingCode }}
+
+
+ 报工时间：
+ {{ data.schedulingCode }}
+
+
+
+
+
+ 任务信息
+
+
+
+ 任务编号：
+ {{ data.schedulingCode }}
+
+
+ 任务名称：
+ {{ data.schedulingCode }}
+
+
+ 站点名称：
+ {{ data.schedulingCode }}
+
+
+ 工艺路线：
+ {{ data.schedulingCode }}
+
+
+ 工序名称：
+ {{ data.schedulingCode }}
+
+
+ 工序编号：
+ {{ data.schedulingCode }}
+
+
+ 班组：
+ {{ data.schedulingCode }}
+
+
+ 任务负责人：
+ {{ data.schedulingCode }}
+
+
+
+
+
+ 工单信息
+
+
+
+ 工单编号：
+ {{ data.schedulingCode }}
+
+
+ 工单名称：
+ {{ data.schedulingCode }}
+
+
+ 产品名称：
+ {{ data.schedulingCode }}
+
+
+ 产品编号：
+ {{ data.schedulingCode }}
+
+
+ 规格型号：
+ {{ data.schedulingCode }}
+
+
+ 产品类型：
+ {{ data.schedulingCode }}
+
+
+ 单位：
+ {{ data.schedulingCode }}
+
+
+ BOM：
+ {{ data.schedulingCode }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue
index fed7e7b..1365021 100644
--- a/src/pages/mes/workScheduling/workScheduling.vue
+++ b/src/pages/mes/workScheduling/workScheduling.vue
@@ -206,7 +206,7 @@ onReachBottom(() => {
//打开明细
function openDetail(item, index) {
- proxy.$tab.navigateTo(`/pages/mes/workScheduling/detail?id=${item.id}`)
+ proxy.$tab.navigateTo(`/pages/mes/workScheduling/workSchedulingDetail?schedulingCode=${item.schedulingCode}`)
}
//打开Bom检查
@@ -225,6 +225,26 @@ function tabsChange(index) {
tabParams.value.pageNo = 1
if (index == '0') {
tabParams.value.status = ''
+ }else if(index == '1'){
+ tabParams.value.status = '-1'
+ }else if(index == '2'){
+ tabParams.value.status = '0'
+ }else if(index == '3'){
+ tabParams.value.status = '1'
+ }else if(index == '4'){
+ tabParams.value.status = '2'
+ }else if(index == '5'){
+ tabParams.value.status = '3'
+ }else if(index == '6'){
+ tabParams.value.status = '4'
+ }else if(index == '7'){
+ tabParams.value.status = '9'
+ }else if(index == '8'){
+ tabParams.value.status = '5'
+ }else if(index == '9'){
+ tabParams.value.status = '-3'
+ }else if(index == '10'){
+ tabParams.value.status = '-2'
} else {
tabParams.value.status = index
}
diff --git a/src/pages/mes/workScheduling/detail.vue b/src/pages/mes/workScheduling/workSchedulingDetail.vue
similarity index 60%
rename from src/pages/mes/workScheduling/detail.vue
rename to src/pages/mes/workScheduling/workSchedulingDetail.vue
index df9163e..479064f 100644
--- a/src/pages/mes/workScheduling/detail.vue
+++ b/src/pages/mes/workScheduling/workSchedulingDetail.vue
@@ -1,83 +1,93 @@
+
- 日计划明细
+ 生产工序任务明细
- 日计划单号：
- {{ data.planNoDay }}
-
-
- 产品批次码：
- {{ data.batchCode }}
-
-
- 月计划单号：
- {{ data.planNoMonth }}
+ 工单号：
+ {{ data.schedulingCode }}
状态：
{{ data.status }}
- 产品编号：
- {{ data.productCode }}
+ 工序编号：
+ {{ data.nodeCode }}
- 车间编码：
- {{ data.workroomCode }}
+ 工位验证编码组：
+ {{ data.workstationValidate }}
- 产线编码：
- {{ data.lineCode }}
+ 设备验证编码组：
+ {{ data.deviceValidate }}
+
+ 人员验证组：
+ {{ data.personValidate }}
+
+
+ 物料验证组：
+ {{ data.materialValidate }}
+
计划数量：
{{ data.planCount }}
+
+ 报工人编号：
+ {{ data.reportPerson }}
+
+
+ 领取人工号：
+ {{ data.receivePerson }}
+
- 工艺路线编码：
- {{ data.processrouteCode }}
-
-
- 允许临时工艺：
- {{ data.tempProcessroute }}
+ 报工数量：
+ {{ data.reportCount }}
- BOM版本：
- {{ data.standardBom }}
+ 报工类型：
+ {{ data.reportType }}
- 工单模式：
- {{ data.workMode }}
+ 合格数量：
+ {{ data.qualifiedCount }}
- 计划日期：
- {{ `${$time.formatDate(data.planDate)}` }}
+ 不合格数量：
+ {{ data.unqualifiedCount }}
+
+ 领取工位：
+ {{ data.receiveWorkstation }}
- 开始时间：
- {{ `${$time.formatDate(data.startTime)}` }}
+ 工作设备编码：
+ {{ data.receiveDevice }}
+
- 结束时间：
- {{ `${$time.formatDate(data.endTime)}` }}
+ 创建时间：
+ {{ `${$time.formatDate(data.createTime)}` }}
-
- 齐套检查-Bom：
- {{ data.bomInspect }}
-
-
-
-
@@ -92,7 +102,8 @@ import {
ref,
getCurrentInstance
} from 'vue'
-import * as orderDayPlanListApi from '@/api/mes/orderDay/index.ts'
+
+import * as workSchedulingListApi from '@/api/mes/workScheduling/index.ts'
const {proxy} = getCurrentInstance()
const number = ref('')
@@ -101,8 +112,13 @@ const loading = ref(false)
const from = ref()//1从我的进入3从审核进入
const type = ref()
-function getSparePartsApplicationDetail() {
- orderDayPlanListApi.getOrderDayPlanDetail(number.value).then((res) => {
+const tabsList = ref([{name:'工单明细'},{name:'工序任务'}])
+const current = ref(0)
+
+
+
+function getWorkSchedulingDetail() {
+ workSchedulingListApi.getWorkSchedulingDetail(number.value).then((res) => {
console.log(number.value)
data.value = res.data
}).catch(() => {
@@ -110,15 +126,20 @@ function getSparePartsApplicationDetail() {
}
+function openQualityInspect() {
+ proxy.$tab.navigateTo(`/pages/mes/workScheduling/reportWorkQualityInspection?obj=${JSON.stringify(data.value)}`)
+}
+
+
onLoad((option) => {
if (option.type) type.value = option.type
if (option.from) from.value = option.from
- if (option.id) {
- number.value = option.id
+ if (option.schedulingCode) {
+ number.value = option.schedulingCode
}
})
onShow(() => {
- getSparePartsApplicationDetail()
+ getWorkSchedulingDetail()
})