From e713b378b01d189f972cfb5b9eae749ee95a8b51 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 29 十月 2022 13:48:00 +0800
Subject: [PATCH] 1.解决两个账号登录，是否被挤掉的问题
---
src/views/zzmx/jpgj.vue | 128 ++++++++++++++++++++++++++----------------
1 files changed, 80 insertions(+), 48 deletions(-)
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 1f7c250..a506c91 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -2,21 +2,21 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
</div>
<div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item label-width="70px" label="浜у搧鍚嶇О" style=" display: flex;">
<el-select
v-model="form.partcode"
filterable
@@ -88,15 +88,20 @@
</el-select>
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ />
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight"
border
@@ -134,7 +139,13 @@
label="浜у搧瑙勬牸"
min-width="110"
sortable="custom"
- />
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="wksp_name"
label="鐢熶骇杞﹂棿"
@@ -146,6 +157,7 @@
label="宸ヨ壓璺嚎"
sortable="custom"
min-width="120"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="stepname"
@@ -164,13 +176,23 @@
label="璁惧鑺傛媿"
width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.eqp_value">{{ row.eqp_value }} <span style="margin-left: 2px">绉�</span></div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="stand_value"
label="鐢熶骇鑺傛媿"
width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.stand_value">{{ row.stand_value }} <span style="margin-left: 2px">绉�</span></div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="cavity_qty"
label="鍨嬭厰鏁�"
@@ -194,7 +216,7 @@
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
<i class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
- <el-tooltip v-del-tab-index class="item" effect="dark" content="缂栬緫" placement="top">
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
<i class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
@@ -204,12 +226,11 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
:total="total"
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getBeatRateSearch"
/>
@@ -303,6 +324,8 @@
</div>
<el-table
+ ref="eqpDialogArrRef"
+ class="tableFixed"
:data="eqpDialogArr"
:height="tableHeight"
:style="{width: 100+'%',height:tableHeight-50+'px',}"
@@ -424,7 +447,7 @@
:limit.sync="eqpTable.rows"
align="right"
style="padding-top: 20px;"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getEqpTable"
/>
@@ -439,6 +462,16 @@
</div>
</span>
</el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker
+ ref="importPickerFunc"
+ class="importPickerClass"
+ :shows.sync="shows"
+ :title="title_value"
+ :colos="colos"
+ :code="code"
+ />
</div>
</template>
@@ -452,32 +485,14 @@
StepSelectEqp,
StepSelectEqpList
} from '@/api/zzmx'
+import ImportPicker from '@/components/ImportPicker'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'JPGJ',
components: {
- Pagination
+ Pagination, ImportPicker
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
isIpad: false,
mainHeight: 0,
@@ -529,21 +544,18 @@
editRouteName: '', // 缂栬緫鏃跺伐鑹鸿矾绾垮悕绉�
editStepName: '', // 缂栬緫鏃跺姞宸ュ伐搴忓悕绉�
operation: '',
- dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- ],
- OrgCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
- ],
- OrgName: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- ],
- SupUnit: [
- { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
- ]
- }
+ dialogFormRules: {},
+ title_value: '鏁版嵁瀵煎叆 / 鑺傛媿宸ヤ环',
+ code: '24',
+ shows: false
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getBeatRateSearch()
+ }
}
},
created() {
@@ -669,6 +681,7 @@
this.eqpDialogArr.forEach(item => {
item.isVisible = 0
})
+ this.$refs.tableDataRef.doLayout()
},
// 淇濆瓨琛�
async saveRow(row) {
@@ -795,6 +808,9 @@
DeleteBeatRate(data).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getBeatRateSearch()
}
})
@@ -846,15 +862,24 @@
// }
// })
// },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ },
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 195
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
}
}
@@ -953,7 +978,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
--
Gitblit v1.9.3