From 46528c3843ce67038ddb2e00dd3d3998c206a69e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 06 五月 2024 17:26:10 +0800
Subject: [PATCH] 1.递交
---
src/views/produce/reportVerify.vue | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index 97831a9..2ccbeb3 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -16,18 +16,50 @@
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"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟缂栫爜" style=" display: flex;">
<el-input v-model="form.wo_code" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<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 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" />
@@ -134,6 +166,13 @@
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
+ sortable="custom"
+ show-overflow-tooltip
+ min-width="110"
+ />
+ <el-table-column
+ prop="wkshp_name"
+ label="杞﹂棿鍚嶇О"
sortable="custom"
show-overflow-tooltip
min-width="110"
@@ -288,6 +327,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { MesOrderDistribution, MesOrderStepReportVerifySearch, MesOrderStepReportVerifySeave } from '@/api/WorkOrder'
+import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
name: 'Zzjg',
@@ -302,6 +342,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: '',
wo_code: '', // 宸ュ崟缂栫爜
partnumber: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -311,6 +352,8 @@
reportuser: '', // 鎶ュ伐浜哄憳
reportdate: '', // 鎶ュ伐鏃堕棿
+ reviewstatus: '', // 瀹℃牳鐘舵��
+
prop: 'report_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -318,8 +361,13 @@
},
total: 10,
tableData: [],
+ wkshopcodeArr: [],
- multipleSelection: []
+ multipleSelection: [],
+ reviewstatusArr: [
+ { code: 'Y', name: '宸插鏍�' },
+ { code: 'N', name: '鏈鏍�' }
+ ]
}
},
@@ -330,9 +378,13 @@
this.getHeight()
this.getMesOrderStepReportVerifySearch()
+ this.getPrentOrganizationNoCompany()
},
methods: {
-
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
+ },
// 鎶ュ伐璋冩暣鍒楄〃鏌ヨ
async getMesOrderStepReportVerifySearch() {
let tempDate = this.form.reportdate
@@ -340,7 +392,9 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
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,
@@ -372,6 +426,7 @@
},
// 閲嶇疆
reset() {
+ this.form.wkshopcode = ''
this.form.wo_code = ''
this.form.partnumber = ''
this.form.partname = ''
@@ -379,6 +434,7 @@
this.form.stepname = ''
this.form.reportuser = ''
this.form.reportdate = ''
+ this.form.reviewstatus = ''
this.getMesOrderStepReportVerifySearch()
},
--
Gitblit v1.9.3