From b591dda5d9391d238f9e83c234a9f2d56fb8793c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 12 十二月 2024 15:58:07 +0800
Subject: [PATCH] 添加订单类型筛选
---
src/components/do/b1-report-preparation/order.vue | 18 ++++++++++++++++++
src/components/view/b1-inspection-order.vue | 26 ++++++++++++++++++++++----
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-report-preparation/order.vue b/src/components/do/b1-report-preparation/order.vue
index 68887e7..56024bb 100644
--- a/src/components/do/b1-report-preparation/order.vue
+++ b/src/components/do/b1-report-preparation/order.vue
@@ -21,6 +21,14 @@
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
+ <div class="search_thing">
+ <div class="search_label">璁㈠崟绫诲瀷锛�</div>
+ <div class="search_input">
+ <el-select v-model="componentData.entity.formType" size="small"style="width: 100%;" @change="refreshTable()">
+ <el-option v-for="(a,ai) in formType" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </div>
+ </div>
<div class="search_thing" style="margin-left: 20px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
@@ -140,6 +148,7 @@
name:null,
engineering:null,
production:null,
+ formType:null,
},
isIndex: true,
showSelect: false,
@@ -221,11 +230,13 @@
sampleList:[],
sampleId:null,
orderId0:null,
+ formType:[]
}
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
this.getPower()
+ this.selectEnumByCategoryForSampleForm()
},
methods:{
// 鏉冮檺鍒嗛厤
@@ -285,6 +296,13 @@
this.dialogVisible = true
})
},
+ selectEnumByCategoryForSampleForm() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "璁㈠崟绫诲瀷"
+ }).then(res => {
+ this.formType = res.data
+ })
+ },
// 鐢熸垚鎶ュ憡
handleCreate(){
let insReportDto1s = []
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 3c82c0d..6546205 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -188,9 +188,12 @@
v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;">
- <div class="search_label" style="width: 120px;">澶栭儴濮旀墭缂栧彿锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.outEntrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
+ <div class="search_label">璁㈠崟绫诲瀷锛�</div>
+ <div class="search_input">
+ <el-select v-model="componentData.entity.formType" size="small" style="width: 100%;" @change="refreshTable()">
+ <el-option v-for="(a,ai) in formType" :key="ai" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </div>
</div>
<div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
@@ -206,6 +209,11 @@
<div class="search_label">鏍峰搧缂栧彿锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing" style="width: 20%;" v-if="more">
+ <div class="search_label" style="width: 120px;">澶栭儴濮旀墭缂栧彿锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.outEntrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">涓嬪崟鏃堕棿锛�</div>
@@ -573,6 +581,7 @@
appointed:null,
issueTime:null,
motorNumber:null,
+ formType:null,
// orderBy: {
// field: '',
// order: ''
@@ -837,7 +846,8 @@
BZinfo:[],
BZDialogVisible:false,
downVisible:false,
- downList:[]
+ downList:[],
+ formType:[]
}
},
watch:{
@@ -876,6 +886,7 @@
this.getAuthorizedPerson()
this.getInsStateDicts()
this.selectEnumByCategoryForOrderType()
+ this.selectEnumByCategoryForSampleForm()
},
methods: {
selectMethod(val){
@@ -1304,6 +1315,13 @@
this.refreshTable('page')
this.upIndex++
},
+ selectEnumByCategoryForSampleForm() {
+ this.$axios.post(this.$api.enums.selectEnumByCategory, {
+ category: "璁㈠崟绫诲瀷"
+ }).then(res => {
+ this.formType = res.data
+ })
+ },
getUserMenu() {
this.$axios.get(this.$api.user.getUserMenu).then(res => {
let data = []
--
Gitblit v1.9.3