From ecaf70a4e7d72ecc1c18302fef31b3baab8e6513 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 13 十月 2022 11:01:23 +0800
Subject: [PATCH] 1.看板新增自动刷新2小时一次
---
src/views/scgl/gd.vue | 130 +++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 60 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 5e90e95..3cfd626 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -15,12 +15,12 @@
<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.mesorderstus"
:popper-append-to-body="false"
@@ -59,7 +59,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label-width="70px" label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
@@ -71,7 +71,7 @@
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鍒涘缓鏃堕棿" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓鏃堕棿" style=" display: flex;">
<!-- <el-date-picker-->
<!-- v-model="form.createdate"-->
<!-- type="daterange"-->
@@ -92,46 +92,41 @@
/>
</el-form-item>
</div>
- <div>
- <div class="bodySearchReset">
- <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>
- <!-- <div v-if="!isIpad" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
- <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-switch-button">璁㈠崟鍏抽棴</el-button>-->
- <!-- </div>-->
- <!-- <div v-if="isIpad" style="display: flex;flex-direction: column;align-items: end">-->
- <!-- <div style="display: flex;margin: 10px 0">-->
- <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>-->
- <!-- </div>-->
- <!-- <el-button type="primary" icon="el-icon-switch-button">璁㈠崟鍏抽棴</el-button>-->
- <!-- </div>-->
+ <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"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
- <div
- class="bodyTopFormExpand"
- @click="isExpandForm=!isExpandForm"
- >
- <i
- :class="!isExpandForm?'el-icon-arrow-down':'el-icon-arrow-up'"
- :style="{color:'#42B983'}"
- /></div>
-
- <div class="elTableDiv" style="margin-top: 0">
+ <div class="elTableDiv">
<el-table
ref="tableDataRef"
class="tableFixed"
:data="tableData"
- :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+ :height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px'}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px'}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -210,6 +205,7 @@
prop="partname"
min-width="150"
label="浜у搧鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -685,7 +681,12 @@
<div class="footerButton">
<el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
<!-- <el-button v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -783,12 +784,12 @@
title="婧愬崟鍗曞彿"
:visible.sync="dialogVisibleSource"
width="1200px"
- top="5vh"
+ top="10vh"
class="dialogVisibleSearch"
:close-on-click-modal="false"
@close="dialogVisibleSourceClose"
>
- <div class="bodyTopFormGroup" style="animation: move 1s linear">
+ <div class="bodyTopFormGroup">
<el-form
ref="sourceForm"
:model="sourceForm"
@@ -796,10 +797,8 @@
inline
style="display: flex;justify-content: space-between"
>
- <div class="elForm">
-
+ <div class="elForm" style="justify-content: flex-start">
<el-form-item
-
label="棰勮寮�宸ユ椂闂�"
label-width="100px"
style=" display: flex;font-size: 14px;margin-top: 3px"
@@ -869,32 +868,39 @@
</el-form-item>
</div>
- <div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2;justify-content: end">
- <el-button type="primary" icon="el-icon-search" @click="sourceSearch">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="sourceReset">閲嶇疆</el-button>
- </div>
+
+ <div style="display: flex;align-items: start;margin-top: 3px;z-index: 2;justify-content: end">
+ <el-button type="primary" icon="el-icon-search" @click="sourceSearch">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="sourceReset">閲嶇疆</el-button>
</div>
+
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverTypeDialog==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandDialog?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverTypeDialog=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverTypeDialog==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandDialog?'doubleDown':'doubleUp'"
+ @click="isExpandDialog=!isExpandDialog"
+ @mouseout="mouseHoverTypeDialog=$event.type"
+ />
+ </div>
</div>
- <!-- <el-tooltip :content="!isExpandDialog?'鐐瑰嚮灞曠ず鏇村':'鏀惰捣'" placement="bottom">-->
- <div
- style="display:flex;justify-content: center;
- align-items:center;background-color:#eee;cursor: pointer"
- @click="isExpandDialog=!isExpandDialog"
- >
- <i
- :class="!isExpandDialog?'el-icon-arrow-down':'el-icon-arrow-up'"
- :style="{color:'#42B983'}"
- /></div>
- <!-- </el-tooltip>-->
+
<div class="elTableDiv">
<el-table
:data="sourceTableData"
- :height="(tableHeight-100)+'px'"
+ :height="isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:(tableHeight-100)+'px',}"
+ :style="{width: 100+'%',height:isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -1571,6 +1577,9 @@
},
data() {
return {
+ mouseHoverType: 'mouseout',
+ mouseHoverTypeDialog: 'mouseout',
+ isExpandForm: false,
isIpad: false,
mainHeight: 0,
tableHeight: 0,
@@ -1768,7 +1777,6 @@
defaultroute_code: '', // 榛樿宸ヨ壓璺嚎閫変腑鍊�
defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
projectTableData: [], // 璁惧鍒楄〃
- isExpandForm: false, // 琛ㄥ崟鏄惁灞曞紑锛岄粯璁や笉灞曞紑
tableDataDetail: [], // 鐐瑰嚮宸ュ崟琛ㄧ殑琛� 鏄剧ず璇︾粏淇℃伅
printSize: 1,
printSizeSelectArr: [// 瀹�*楂�
@@ -2083,6 +2091,7 @@
if (this.dialogForm.ordertype === 'FO' && this.dialogForm.sourceorder.toString().trim().length <= 0) {
return this.$message.info('婧愬崟鍗曞彿涓嶈兘涓虹┖锛�')
}
+
const data = {
// partname: this.dialogForm.partname, // 浜у搧鍚嶇О
// partspec: this.dialogForm.partspec, // 浜у搧瑙勬牸
@@ -2102,7 +2111,7 @@
orderlev: this.dialogForm.orderlev, // 宸ュ崟绛夌骇
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
-
+ this.$store.state.app.buttonIsDisabled = true
AddUpdateMesOrder(data).then(res => {
if (res.code === '200') {
this.dialogVisible = false
@@ -2112,6 +2121,7 @@
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '娲惧彂鎴愬姛锛�')
// this.dialogVisible = false
this.getMesOrderSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '娲惧彂澶辫触锛�')
}
@@ -2145,7 +2155,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
// this.tableHeight = this.mainHeight - 250
- this.tableHeight = this.mainHeight - 470
+ this.tableHeight = this.mainHeight - 515
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 20
}
--
Gitblit v1.9.3