From f8422586229fe338bf04b22cad5f2bb3a8e167f7 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 17 六月 2024 17:16:09 +0800
Subject: [PATCH] 1.报工审核 新增弃审 功能
---
src/api/WorkOrder.js | 14 ++++++
src/views/produce/reportCorrect.vue | 11 ++++-
src/views/produce/reportVerify.vue | 46 ++++++++++++++++++++--
3 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/src/api/WorkOrder.js b/src/api/WorkOrder.js
index 36c1a99..955d2a6 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,13 @@
data
})
}
+
+// 鐢熶骇鎵ц,鎶ュ伐寮冨鏁版嵁鎻愪氦
+export function MesOrderStepReportNotVerifySeave(data) {
+ return request({
+ url: 'WorkOrder/MesOrderStepReportNotVerifySeave',
+ method: 'post',
+ params: data
+ })
+}
+
diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index 7df5531..906eb7c 100644
--- a/src/views/produce/reportCorrect.vue
+++ b/src/views/produce/reportCorrect.vue
@@ -320,9 +320,14 @@
</div>
</el-form-item>
<el-form-item label="宸ュ簭鍗曚环" class="dialogFormItem">
- <div style="width: 200px;">
- {{ dialogForm.unprice ? dialogForm.unprice : '/' }}
- </div>
+ <!-- <div style="width: 200px;">-->
+ <!-- {{ dialogForm.unprice ? dialogForm.unprice : '/' }}-->
+ <!-- </div>-->
+ <el-input
+ v-model="dialogForm.unprice"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item v-if="dialogForm.flw_type==='Z'" label="鎶ュ伐鐝粍" class="dialogFormItem">
<div style="width: 200px;" class="ellipsis">
diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index 2ccbeb3..20a414d 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -133,7 +133,7 @@
/>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
@@ -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
},
--
Gitblit v1.9.3