From 45acf15aa5844863a7e3be51aa2a5262741ca26d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 13 九月 2022 13:11:22 +0800
Subject: [PATCH] 1.项目优化
---
src/views/sbgl/djjl.vue | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/views/sbgl/djjl.vue b/src/views/sbgl/djjl.vue
index bdba672..fe0976f 100644
--- a/src/views/sbgl/djjl.vue
+++ b/src/views/sbgl/djjl.vue
@@ -20,9 +20,9 @@
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
/>
</el-select>
</el-form-item>
@@ -41,6 +41,16 @@
<el-form-item v-show="isExpandForm" label="鐐规鏃堕棿" style=" display: flex;">
<el-input v-model="form.checkdate" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="鐐规缁撴灉" style=" display: flex;">-->
+ <!-- <el-select v-model="form.isOK" style="width: 200px" placeholder="璇烽�夋嫨">-->
+ <!-- <el-option-->
+ <!-- v-for="item in wkshopSelectArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
</div>
<div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
@@ -243,6 +253,7 @@
import ImportPicker from '@/components/ImportPicker'
import { validateCode } from '@/utils/global'
import { DeviceCheckSubTakeSearch, DeviceCheckTakeOutExcel, DeviceCheckTakeSearch } from '@/api/sbgl'
+import { ShopSearch } from '@/api/dzkb'
export default {
name: 'Zzjg',
@@ -295,13 +306,20 @@
}
},
created() {
- this.getDeviceCheckTakeSearch()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ handleRequest() {
+ this.getDeviceCheckTakeSearch().then(res => {
+ if (res.code === '200') {
+ this.getShopSearch()
+ }
+ })
+ },
async getDeviceCheckTakeSearch() {
const res = await DeviceCheckTakeSearch(this.form)
// this.tableData = res.data
@@ -309,6 +327,13 @@
{ RowNum: 1, djjg: 'N' }
]
this.total = res.count
+
+ return { code: res.code }
+ },
+ // 鑾峰彇鎵ц杞﹂棿涓嬫媺鏁扮粍
+ async getShopSearch() {
+ const { data: res } = await ShopSearch()
+ this.wkshopSelectArr = res
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
--
Gitblit v1.9.3