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/scgl/scdd.vue | 182 +++++++++++++++++++++++++--------------------
1 files changed, 102 insertions(+), 80 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 5cbf831..a744515 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -24,7 +24,7 @@
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.erporderstus"
filterable
@@ -49,29 +49,29 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</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.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</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.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="棰勮寮�宸ユ椂闂�" label-width="100px" style=" display: flex;font-size: 14px;margin-top: 3px">
+ <el-form-item v-show="isExpandForm" label="棰勮寮�宸ユ椂闂�" label-width="100px" style="display: flex;font-size: 14px;align-items: center">
<el-date-picker
v-model="form.paystartdate"
type="daterange"
range-separator="~"
class="timeMini"
size="mini"
- style="width: 250px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
+ style="width: 200px;display: flex;line-height: 34px;height: 34px;"
:clearable="false"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
/>
+ <!-- font-size: 14px!important;-->
<!-- :picker-options="expireTimeOption"-->
</el-form-item>
- <el-form-item label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;margin-top: 3px">
+ <el-form-item v-show="isExpandForm" label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;align-items: center">
<el-date-picker
v-model="form.payenddate"
type="daterange"
@@ -79,7 +79,7 @@
class="timeMini"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
- style="width: 250px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
+ style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"
end-placeholder="缁撴潫鏃ユ湡"
size="mini"
/>
@@ -95,50 +95,42 @@
<!-- />-->
</el-form-item>
</div>
- <div style="min-height: 100px">
- <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="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-refresh-right"-->
- <!-- @click="reset('update')"-->
- <!-- >鍚屾ERP-->
- <!-- </el-button>-->
- <!-- <el-button-->
- <!-- type="primary"-->
- <!-- icon="el-icon-switch-button"-->
- <!-- @click="orderClose"-->
- <!-- >鍏抽棴璁㈠崟-->
- <!-- </el-button>-->
- <!-- </div>-->
- <!-- <div v-if="isIpad" style="display: flex;flex-direction: column;align-items: end">-->
- <!-- <el-button-->
- <!-- type="primary"-->
- <!-- icon="el-icon-refresh-right"-->
- <!-- style="margin: 10px 0"-->
- <!-- @click="reset('update')"-->
- <!-- >鍚屾ERP-->
- <!-- </el-button>-->
- <!-- <el-button-->
- <!-- type="primary"-->
- <!-- icon="el-icon-switch-button"-->
- <!-- @click="orderClose"-->
- <!-- >鍏抽棴璁㈠崟-->
- <!-- </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="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
- :height="tableHeight+'px'"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:tableHeight+'px',}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -156,7 +148,7 @@
<el-radio
v-model="radioSelectedId"
:label="row.id"
- style="color: transparent;padding-left: 15px; margin-right: -25px;"
+ style="color: transparent;padding-left: 10px;"
@change.native="getCurrentRow(row.id)"
/>
</template>
@@ -197,11 +189,13 @@
label="浜у搧鍚嶇О"
sortable="custom"
min-width="150"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
sortable="custom"
+ show-tooltip-when-overflow
min-width="110"
>
<template slot-scope="{row}">
@@ -236,14 +230,24 @@
prop="planstartdate"
label="棰勮寮�宸ユ椂闂�"
sortable="custom"
- width="160"
- />
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.planstartdate">{{ row.planstartdate.substring(0,11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="planenddate"
label="棰勮瀹屽伐鏃堕棿"
sortable="custom"
- width="160"
- />
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.planenddate">{{ row.planenddate.substring(0,11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="createuser"
label="鍒涘缓浜哄憳"
@@ -258,9 +262,14 @@
<el-table-column
prop="createdate"
label="鍒涘缓鏃堕棿"
- width="160"
+ width="130"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.createdate">{{ row.createdate.substring(0,11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
label="鎿嶄綔"
fixed="right"
@@ -359,22 +368,16 @@
style="width: 200px"
/>
</el-form-item>
-
- <!-- <el-form-item label="浜や粯鏃堕棿" prop="">-->
- <!-- <el-date-picker-->
- <!-- v-model="dialogForm.markqty"-->
- <!-- type="date"-->
- <!-- style="width: 200px"-->
- <!-- placeholder="閫夋嫨鏃ユ湡"-->
- <!-- />-->
- <!-- <el-input v-model="dialogForm.OrgName" style="width: 200px" />-->
- <!-- </el-form-item>-->
-
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="dialogVisibleCancel">鍙� 娑�</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>
@@ -406,7 +409,8 @@
}
}
return {
- isIpad: false,
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -432,7 +436,6 @@
{ code: 'CLOSED', name: '宸插叧闂�' }
],
total: 10,
- radioSelected: '',
radioSelectedId: '',
tableData: [],
dialogVisible: false,
@@ -471,6 +474,7 @@
]
}
+
// expireTimeOption: {
// disabledDate(time) {
// return time.getTime() > Date.now() - 8.64e6 // 濡傛灉娌℃湁鍚庨潰鐨�-8.64e6灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
@@ -581,8 +585,6 @@
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
getCurrentRow(id) {
- // console.log(row, 2)
- // this.radioSelected = row.wo
this.radioSelectedId = id
},
// 璁㈠崟鍏抽棴
@@ -604,7 +606,6 @@
if (res.code === '200') {
this.$message.success('璁㈠崟鍏抽棴鎴愬姛!')
this.getErpOrderSearch()
- // this.radioSelected = ''
}
})
}).catch(() => {
@@ -658,6 +659,7 @@
this.dialogForm.markqty = ''
this.dialogForm.ordernum = ''
this.dialogForm.relse_qty = ''
+
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -666,15 +668,21 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
+ this.dialogForm.markqty = parseFloat(this.dialogForm.markqty)
+ this.dialogForm.erpqty = parseFloat(this.dialogForm.erpqty)
+ this.dialogForm.relse_qty = parseFloat(this.dialogForm.relse_qty)
+ this.dialogForm.ordernum = parseFloat(this.dialogForm.ordernum)
if (this.dialogForm.markqty < 1 || this.dialogForm.markqty > this.dialogForm.erpqty - this.dialogForm.relse_qty) {
return this.$message.info('涓嬪崟鏁伴噺瓒呭嚭鍙笅鍗曟暟鐨勮寖鍥达紒')
}
+
if (this.dialogForm.ordernum < 1 || this.dialogForm.ordernum > this.dialogForm.markqty) {
return this.$message.info('涓嬪崟鍗曟暟瓒呭嚭鍙笅鍗曞崟鏁扮殑鑼冨洿锛�')
}
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
'erporderid': this.dialogForm.erporderid,
// 'erporderstus': this.dialogForm.erporderstus,
@@ -687,12 +695,12 @@
'ordernum': this.dialogForm.ordernum,
'relse_qty': this.dialogForm.relse_qty
}
- console.log(data)
MarkSaveErpOrder(data).then(res => {
if (res.code === '200') {
- this.$message.success('涓嬭揪鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success('涓嬭揪鎴愬姛锛�')
this.getErpOrderSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error('涓嬭揪澶辫触锛�')
}
@@ -704,12 +712,9 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 260
- this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.tableHeight = this.mainHeight - 250
- if (this.isIpad) {
- this.tableHeight = this.tableHeight - 20
- }
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -723,7 +728,7 @@
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-range-input{
- font-size: 14px !important;
+ //font-size: 14px !important;
}
::v-deep .el-range__icon{
line-height: 28px !important;
@@ -732,7 +737,7 @@
line-height: 28px !important;
}
::v-deep .el-range-input{
- font-size: 14px ;
+ font-size: 14px;
}
::v-deep .el-range-separator{
display: flex;
@@ -826,15 +831,32 @@
margin-bottom: 0;
}
+.elTableDiv {
+ ::v-deep .el-radio__label {
+ display: none;
+ }
+}
+
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
+
</style>
<style>
.el-table .custom-row {
background: #f8f8fa;
}
-</style>
-<style>
.osloading{
- font-size: 40px;
+ font-size: 26px !important;
}
+.el-loading-text{
+ font-size: 26px !important;
+}
</style>
+
--
Gitblit v1.9.3