diff --git a/src/api/mes/workScheduling/index.ts b/src/api/mes/workScheduling/index.ts
index d8cbe4a9e..f6f118c7a 100644
--- a/src/api/mes/workScheduling/index.ts
+++ b/src/api/mes/workScheduling/index.ts
@@ -72,5 +72,9 @@ export const getCurrentWorkerList = async (params) => {
export const getProcessList = async (params) => {
return await request.get({ url: `/mes/workScheduling/getProcessList`, params })
}
+//工序质检
+export const processQualified = async (data) => {
+ return await request.post({ url: `/mes/work-scheduling-detail/processQualified`, data })
+}
diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 9f97f22cf..9ac9b269e 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -482,8 +482,9 @@ const publishPlan=()=>{
try{formLoading.value=true
doPublishPlan() }finally{
formLoading.value=false;
+ handleClose()
}
- handleClose()
+
}).catch(() => {
message.info("已取消发布")
})
diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
index 70bc08d5a..edcb14390 100644
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@@ -201,9 +201,7 @@ const buttonBaseClick = (val, item) => {
}
const publishClosed=()=>{
//console.log('orderday-publishClosed-200')
- nextTick(() => {
getList()
- })
}
// 根据状态返回该按钮是否显示
diff --git a/src/views/mes/workScheduling/components/Detail.vue b/src/views/mes/workScheduling/components/Detail.vue
index e3929c93c..086250138 100644
--- a/src/views/mes/workScheduling/components/Detail.vue
+++ b/src/views/mes/workScheduling/components/Detail.vue
@@ -181,7 +181,8 @@
-
+ \
+
{
- if (val == 'edit') {
- // 编辑
- if (props.isOpenSearchTable) {
- searchTableFormType.value = 'update'
- if (row?.id || row?.masterId) {
- searchTableFormModel.value = Object.assign(unref(searchTableFormModel), row)
- }
- const item = props.detailAllSchemas.formSchema[0]
- opensearchTable(
- item.field,
- item?.componentProps?.searchField,
- item?.componentProps?.searchTitle,
- item?.componentProps?.searchAllSchemas,
- item?.componentProps?.searchPage,
- item?.componentProps?.searchCondition,
- item?.componentProps?.multiple,
- undefined,
- undefined
- )
- } else {
- openForm('update', row)
- }
- } else if (val == 'delete') {
- // 删除
- handleDelete(row.id)
- } else {
- emit('tableFormButton', val, row)
- }
-}
+// const buttonTableClick = async (val, row) => {
+// if (val == 'edit') {
+// // 编辑
+// if (props.isOpenSearchTable) {
+// searchTableFormType.value = 'update'
+// if (row?.id || row?.masterId) {
+// searchTableFormModel.value = Object.assign(unref(searchTableFormModel), row)
+// }
+// const item = props.detailAllSchemas.formSchema[0]
+// opensearchTable(
+// item.field,
+// item?.componentProps?.searchField,
+// item?.componentProps?.searchTitle,
+// item?.componentProps?.searchAllSchemas,
+// item?.componentProps?.searchPage,
+// item?.componentProps?.searchCondition,
+// item?.componentProps?.multiple,
+// undefined,
+// undefined
+// )
+// } else {
+// openForm('update', row)
+// }
+// } else if (val == 'delete') {
+// // 删除
+// handleDelete(row.id)
+// } else {
+// emit('tableFormButton', val, row)
+// }
+// }
const buttonClick=(type,row)=>{
if (type == 'pfinished') {
WorkSchedulingDetailApi.processFinished(row.id)
getList()
}else if (type == 'reprotProcess') {
refreport.value.openDetail(row,"工序报工", planDayCode.value)
-
- //
}else if (type == 'checkProcess') {
- //WorkSchedulingDetailApi.processFinished(row.id)
+ qualifiedCheck.value.openDetail(row,"质检",planDayCode.value)
}
getList()
}
diff --git a/src/views/mes/workScheduling/components/qualifiedCheck.vue b/src/views/mes/workScheduling/components/qualifiedCheck.vue
new file mode 100644
index 000000000..bf2d7733e
--- /dev/null
+++ b/src/views/mes/workScheduling/components/qualifiedCheck.vue
@@ -0,0 +1,127 @@
+
+
+
+
diff --git a/src/views/mes/workScheduling/components/report.vue b/src/views/mes/workScheduling/components/report.vue
index 52b1de841..3f4acfec5 100644
--- a/src/views/mes/workScheduling/components/report.vue
+++ b/src/views/mes/workScheduling/components/report.vue
@@ -11,21 +11,21 @@
-
-
+
+
-
-
+
+
-
+
-
+
{
}
//提交报工
const saveReport = async() => {
-
+ if(form.reportCount<1){
+ message.alert('报工数量不能小于1!')
+ return
+ }
+ if(form.personSelected.length<1){
+ message.alert('必须选择一个报工人')
+ return
+ }
+ if(form.workTerm<0){
+ message.alert('工时数量不能小于0!')
+ return
+ }
let listSub=[];
form.personSelected.forEach((item) => {
let data={
@@ -141,7 +152,7 @@ const saveReport = async() => {
processCode: form.processCode,
list: listSub
}
- console.log("report-saveReport-137",data)
+ //console.log("report-saveReport-137",data)
saveFlag.value = true
try {
await workschedulingApi.reportWorkByProcess(data)
diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue
index 2427223e9..915c52ea2 100644
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@@ -70,6 +70,8 @@
/>
+
+
@@ -87,6 +89,7 @@ import ReportAll from './components/reportAll.vue'
import Finish from './components/finish.vue'
+
defineOptions({ name: 'MesWorkScheduling' })
const message = useMessage() // 消息弹窗
@@ -182,13 +185,14 @@ const butttondata=(row) =>{ return [
defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}),
defaultButtons.mainListHandleBtn({label:"开工",name:'start',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}),
// defaultButtons.mainListHandleBtn({label:"报工",name:'report',hide: isShowMainButton(row,['3','1'] ),hasPermi:'mes:workScheduling:update'}),
- // defaultButtons.mainListHandleBtn({label:"质检",name:'check',hide: isShowMainButton(row,['5'] ),hasPermi:'mes:workScheduling:update'}),
+ //defaultButtons.mainListHandleBtn({label:"质检",name:'check',hide: isShowMainButton(row,['5'] ),hasPermi:'mes:workScheduling:update'}),
defaultButtons.mainListHandleBtn({label:"完工",name:'finish',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
//defaultButtons.mainListHandleBtn({label:"叫料",name:'callMaterial',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
]}
const reportRef=ref()
const reportFinishRef=ref()
+const qualifiedCheck=ref()
// 列表-操作按钮事件
const buttonTableClick = async (val, row) => {
if (val == 'edit') { // 编辑
@@ -204,7 +208,7 @@ const buttonTableClick = async (val, row) => {
}else if(val=='report'){
reportRef.value.openDetail(row,"报工")
}else if(val=='check'){
- //reportRef.value.openDetail(row,"报工")
+ //qualifiedCheck.value.openDetail(row,"质检")
}else if(val=='finish'){
finishReport(row)
} else if(val=='callMaterial'){