From 1240318c14c896cf5a779780b18b292784d54dd9 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期六, 22 六月 2024 10:26:52 +0800
Subject: [PATCH] 1.滚动条粗细修改2.下单单数禁用
---
src/views/produce/reportVerify.vue | 80 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 10 deletions(-)
diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index 2f0b3fc..20a414d 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -16,6 +16,22 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="瀹℃牳鐘舵��" style=" display: flex;">
+ <el-select
+ v-model="form.reviewstatus"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in reviewstatusArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
<el-select
v-model="form.wkshopcode"
@@ -38,12 +54,12 @@
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partnumber" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">-->
+ <!-- <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
@@ -117,7 +133,7 @@
/>
<el-table-column
prop="rowNum"
- width="50"
+ width="80"
fixed
label="搴忓彿"
/>
@@ -279,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>
@@ -310,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 {
@@ -336,6 +365,8 @@
reportuser: '', // 鎶ュ伐浜哄憳
reportdate: '', // 鎶ュ伐鏃堕棿
+ reviewstatus: '', // 瀹℃牳鐘舵��
+
prop: 'report_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -345,7 +376,11 @@
tableData: [],
wkshopcodeArr: [],
- multipleSelection: []
+ multipleSelection: [],
+ reviewstatusArr: [
+ { code: 'Y', name: '宸插鏍�' },
+ { code: 'N', name: '鏈鏍�' }
+ ]
}
},
@@ -372,6 +407,7 @@
const data = {
wkshopcode: this.form.wkshopcode,
wo_code: this.form.wo_code,
+ reviewstatus: this.form.reviewstatus,
partnumber: this.form.partnumber,
partname: this.form.partname,
partspec: this.form.partspec,
@@ -411,14 +447,15 @@
this.form.stepname = ''
this.form.reportuser = ''
this.form.reportdate = ''
+ this.form.reviewstatus = ''
this.getMesOrderStepReportVerifySearch()
},
// 鎶ュ伐瀹℃牳
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: '鍙栨秷',
@@ -448,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