From 213f348eb0e68df4b575a51c570b98f4cf773963 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 10 四月 2024 12:00:43 +0800
Subject: [PATCH] 1.报工审核 新增弃审功能
---
src/api/WorkOrder.js | 13 ++++++
src/views/workOrder/produceOrderList.vue | 18 ++++----
src/views/kanbanManager/cj.vue | 2
src/views/produce/reportVerify.vue | 44 ++++++++++++++++++++--
4 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/src/api/WorkOrder.js b/src/api/WorkOrder.js
index 36c1a99..ac81081 100644
--- a/src/api/WorkOrder.js
+++ b/src/api/WorkOrder.js
@@ -248,7 +248,9 @@
method: 'get',
params: data
})
-}// 鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛
+}
+
+// 鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛
export function MesOrderStepReportVerifySeave(data) {
return request({
url: 'WorkOrder/MesOrderStepReportVerifySeave',
@@ -256,3 +258,12 @@
data
})
}
+
+// 鐢熶骇鎵ц,鎶ュ伐寮冨鏁版嵁鎻愪氦
+export function MesOrderStepReportNotVerifySeave(data) {
+ return request({
+ url: 'WorkOrder/MesOrderStepReportNotVerifySeave',
+ method: 'post',
+ params: data
+ })
+}
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/cj.vue
index 50eca06..eafa9fb 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/cj.vue
@@ -266,7 +266,7 @@
})
}, 1000 * 60)
- this.getWorkShopProduceTopData()
+ await this.getWorkShopProduceTopData()
},
// 鑾峰彇褰撳墠鏃堕棿
diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index 2ccbeb3..5fec7b8 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -295,10 +295,18 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-button
+ v-if="row.verify!=='Y'"
type="text"
style="cursor: pointer;font-size: 14px"
@click="reportAdjust(row)"
>鎶ュ伐瀹℃牳
+ </el-button>
+ <el-button
+ v-if="row.verify==='Y'"
+ type="text"
+ style="cursor: pointer;font-size: 14px;color: rgba(255,0,0,0.8)"
+ @click="reportGiveUp(row)"
+ >寮冨
</el-button>
</div>
@@ -326,7 +334,12 @@
import { handleDatetime } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
-import { MesOrderDistribution, MesOrderStepReportVerifySearch, MesOrderStepReportVerifySeave } from '@/api/WorkOrder'
+import {
+ MesOrderDistribution,
+ MesOrderStepReportNotVerifySeave,
+ MesOrderStepReportVerifySearch,
+ MesOrderStepReportVerifySeave
+} from '@/api/WorkOrder'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
@@ -440,9 +453,9 @@
// 鎶ュ伐瀹℃牳
async reportAdjust(row) {
- if (row && row.verify === 'Y') {
- return this.$message.info('姝ゅ伐鍗曞凡瀹℃牳锛�')
- }
+ // if (row && row.verify === 'Y') {
+ // return this.$message.info('姝ゅ伐鍗曞凡瀹℃牳锛�')
+ // }
this.$confirm('鏄惁纭瀹℃牳?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -472,6 +485,29 @@
this.$notify.info('宸插彇娑堝鏍革紒')
})
},
+ // 寮冨
+ reportGiveUp(row) {
+ this.$confirm('鏄惁纭寮冨?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ const data = {
+ id: row.id,
+ steptype: row.steptype
+ }
+
+ MesOrderStepReportNotVerifySeave(data).then(res => {
+ if (res.code === '200') {
+ this.$notify.success('寮冨鎴愬姛锛�')
+ this.getMesOrderStepReportVerifySearch()
+ }
+ })
+ }).catch(() => {
+ this.$notify.info('宸插彇娑堝純瀹★紒')
+ })
+ },
+
handleSelectionChange(val) {
this.multipleSelection = val
},
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index d0340cd..6ac4df5 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -9,15 +9,15 @@
@click="syncERP"
>鍚屾ERP
</el-button>
- <div style="display: flex">
- <el-button
- v-waves
- type="primary"
- icon="el-icon-bottom"
- @click="batchHandle"
- >鎵归噺涓嬭揪
- </el-button>
- </div>
+ <!-- <div style="display: flex">-->
+ <!-- <el-button-->
+ <!-- v-waves-->
+ <!-- type="primary"-->
+ <!-- icon="el-icon-bottom"-->
+ <!-- @click="batchHandle"-->
+ <!-- >鎵归噺涓嬭揪-->
+ <!-- </el-button>-->
+ <!-- </div>-->
</div>
--
Gitblit v1.9.3