From 2ae96b796658f5507326c48e4b25bbbe80b38dfe Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 30 一月 2023 17:03:59 +0800
Subject: [PATCH] 1.优化导航栏
---
src/views/scgl/cngh.vue | 265 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 243 insertions(+), 22 deletions(-)
diff --git a/src/views/scgl/cngh.vue b/src/views/scgl/cngh.vue
index 0c464f3..790feb4 100644
--- a/src/views/scgl/cngh.vue
+++ b/src/views/scgl/cngh.vue
@@ -11,14 +11,15 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
- <div class="elForm" style="justify-content: flex-start">
- <el-form-item label-width="70px" label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <div class="elForm">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<el-select
v-model="form.workshop"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ @change="getWhkspIsEqpSearch"
>
<el-option
v-for="item in workshopArr"
@@ -33,12 +34,13 @@
v-model="form.devicetype"
style="width: 200px"
placeholder="璇烽�夋嫨"
+ :disabled="form.workshop===''"
>
<el-option
v-for="item in devicetypeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ :key="item.eqp_code"
+ :label="item.eqp_name"
+ :value="item.eqp_code"
/>
</el-select>
</el-form-item>
@@ -54,7 +56,7 @@
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'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>
@@ -89,16 +91,19 @@
label="鐢熶骇杞﹂棿"
sortable="custom"
width="160"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="CaptPlanDeviceType"
label="鐢熶骇鍗曞厓"
width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="CaptPlanWorkShift"
label="榛樿鏂规"
+ show-tooltip-when-overflow
sortable="custom"
width="240"
>
@@ -119,11 +124,14 @@
<el-table-column
prop="CaptPlanShopCalendarList"
label="宸ヤ綔鏃ュ巻"
+ show-tooltip-when-overflow
sortable="custom"
min-width="300"
>
<template slot-scope="{row}">
+ <el-input v-if="row.CaptPlanWorkShift===null" :disabled="row.CaptPlanWorkShift===null" />
<date-picker
+ v-else
v-model="row.CaptPlanShopCalendarList"
:row-data="row"
style="width: 100%;"
@@ -136,12 +144,14 @@
prop="CaptPlanUser"
label="鍒涘缓浜哄憳"
sortable="custom"
+ show-tooltip-when-overflow
width="120"
/>
<el-table-column
prop="CaptPlanDate"
width="160"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
sortable="custom"
/>
@@ -150,14 +160,15 @@
width="120"
label="鏈夋晥鐘舵��"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.CaptPlanStus==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
鏈夋晥
</div>
<div v-else-if="row.CaptPlanStus==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <i class="el-icon-info" style="margin-right: 2px" />
鏃犳晥
</div>
<div v-else>/</div>
@@ -178,6 +189,7 @@
</div>
<el-dialog
+ v-el-drag-dialog
:title="operation==='setting'?'璁剧疆':'榛樿鏂规'"
:visible.sync="dialogVisible"
width="1360px"
@@ -188,7 +200,9 @@
>
<el-button v-if="operation==='setting'" type="primary" @click="addRow">鏂板</el-button>
<div class="elTableDiv">
+ <!-- 閫夋嫨榛樿鏂规鐨勬椂鍊欐槸杩欎釜table-->
<el-table
+ v-if="operation!=='setting'"
ref="tableDataDialogRef"
class="tableFixedDialog"
:data="tableDataDialog"
@@ -199,9 +213,10 @@
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ @row-click="rowClick"
>
+
<el-table-column
- v-if="operation!=='setting'"
width="50"
fixed
>
@@ -210,15 +225,15 @@
v-model="radioSelectedCode"
:label="row.code"
style="padding-left: 10px;"
- @change.native="getCurrentRowSource(row.code)"
/>
+ <!-- @change.native="getCurrentRowSource(row.code)"-->
+
</template>
</el-table-column>
<el-table-column
prop="code"
label="鏂规缂栫爜"
width="100"
- fixed
show-tooltip-when-overflow
>
<template slot-scope="{row}">
@@ -384,6 +399,195 @@
</template>
</el-table-column>
</el-table>
+ <!-- 璁剧疆鐨勬椂鍊欐槸杩欎釜table-->
+ <el-table
+ v-else
+ ref="tableDataDialogRef"
+ class="tableFixedDialog"
+ :data="tableDataDialog"
+ :style="{width: 100+'%',height:(tableHeight-200)+'px'}"
+ border
+ :height="(tableHeight-200)+'px'"
+ :row-class-name="tableRowClassName"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ >
+ <el-table-column
+ prop="code"
+ label="鏂规缂栫爜"
+ width="100"
+ fixed
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.code }}</div>
+ <el-input v-else v-model="row.code" placeholder="璇疯緭鍏�" type="text" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鏂规鍚嶇О"
+ width="150"
+ fixed
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.name }}</div>
+ <el-input v-else v-model="row.name" placeholder="璇疯緭鍏�" type="text" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="duration"
+ label="宸ヤ綔鏃堕暱"
+ width="100"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.duration ? parseFloat(row.duration.toFixed(2)) : '0' }} 灏忔椂</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="wktme1_start"
+ label="宸ヤ綔鏃堕棿涓�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">
+ <div v-if="row.wktme1_start">{{ row.wktme1_start }}</div>
+ <div v-else>/</div>
+ </div>
+ <el-time-picker
+ v-else
+ v-model="row.wktme1_start"
+ is-range
+ :editable="false"
+ :clearable="false"
+ range-separator="~"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ format="HH:mm"
+ @blur="val=>getTime(val,row,'wktme1_start')"
+ @focus="val=>getTime(val,row,'wktme1_start')"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wktme2_start"
+ label="宸ヤ綔鏃堕棿浜�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">
+ <div v-if="row.wktme2_start">{{ row.wktme2_start }}</div>
+ <div v-else>/</div>
+ </div>
+ <el-time-picker
+ v-else-if="row.isVisible===1"
+ v-model="row.wktme2_start"
+ is-range
+ :disabled="row.wktme1_start.length===0"
+ :editable="false"
+ :clearable="false"
+ range-separator="~"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ format="HH:mm"
+ @blur="val=>getTime(val,row,'wktme2_start')"
+ @focus="val=>getTime(val,row,'wktme2_start')"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wktme3_start"
+ label="宸ヤ綔鏃堕棿涓�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">
+ <div v-if="row.wktme3_start">{{ row.wktme3_start }}</div>
+ <div v-else>/</div>
+ </div>
+ <el-time-picker
+ v-else-if="row.isVisible===1"
+ v-model="row.wktme3_start"
+ is-range
+ :disabled="row.wktme2_start.length===0"
+ :editable="false"
+ :clearable="false"
+ format="HH:mm"
+ range-separator="~"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ @blur="val=>getTime(val,row,'wktme3_start')"
+ @focus="val=>getTime(val,row,'wktme3_start')"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wktme4_start"
+ label="宸ヤ綔鏃堕棿鍥�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">
+ <div v-if="row.wktme4_start">{{ row.wktme4_start }}</div>
+ <div v-else>/</div>
+ </div>
+ <el-time-picker
+ v-else-if="row.isVisible===1"
+ v-model="row.wktme4_start"
+ is-range
+ :disabled="row.wktme3_start.length===0"
+ format="HH:mm"
+ :clearable="false"
+ :editable="false"
+ range-separator="~"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ @blur="val=>getTime(val,row,'wktme4_start')"
+ @focus="val=>getTime(val,row,'wktme4_start')"
+ />
+
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wktme5_start"
+ label="宸ヤ綔鏃堕棿浜�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">
+ <div v-if="row.wktme5_start">{{ row.wktme5_start }}</div>
+ <div v-else>/</div>
+ </div>
+ <el-time-picker
+ v-else-if="row.isVisible===1"
+ v-model="row.wktme5_start"
+ is-range
+ :disabled="row.wktme4_start.length===0"
+ :clearable="false"
+ :editable="false"
+ format="HH:mm"
+ range-separator="~"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ @blur="val=>getTime(val,row,'wktme5_start')"
+ @focus="val=>getTime(val,row,'wktme5_start')"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ v-if="operation==='setting'"
+ width="100"
+ fixed="right"
+ label="鎿嶄綔"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="row.isVisible===0" type="text" @click="delRow(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="saveRow(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="cancelRow(row)">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -412,12 +616,15 @@
} from '@/api/scgl'
import { DeviceTypeSelect, WorkShopSelect } from '@/api/sbgl'
import { handleDatetime3 } from '@/utils/global'
+import { WhkspIsEqpSearch } from '@/api/jcsz'
+import elDragDialog from '@/directive/el-drag-dialog'
export default {
name: 'Zzjg',
components: {
Pagination, DatePicker
},
+ directives: { elDragDialog },
data() {
return {
mouseHoverType: 'mouseout',
@@ -466,6 +673,10 @@
this.getHeight()
},
methods: {
+ // 琛岀偣鍑讳簨浠�
+ rowClick(row, event, column) {
+ this.radioSelectedCode = row.code
+ },
// 瀛愮粍浠跺け鐒︽椂鎵ц
over(val) {
if (val) {
@@ -634,7 +845,7 @@
this.getCapacityPlanningSearch().then(res => {
if (res.code === '200') {
this.getWorkShopSelect()
- this.getDeviceTypeSelect()
+ // this.getDeviceTypeSelect()
}
})
},
@@ -652,8 +863,13 @@
const { data: res } = await WorkShopSelect()
this.workshopArr = res
},
- async getDeviceTypeSelect() {
- const { data: res } = await DeviceTypeSelect()
+ // async getDeviceTypeSelect() {
+ // const { data: res } = await DeviceTypeSelect()
+ // this.devicetypeArr = res
+ // },
+ async getWhkspIsEqpSearch(val) {
+ this.form.devicetype = ''
+ const { data: res } = await WhkspIsEqpSearch({ wkshpcode: val })
this.devicetypeArr = res
},
mrfaSearch(row, operation) {
@@ -873,17 +1089,22 @@
}
}
</style>
-<style>
+<style lang="scss">
.el-table .custom-row {
background: #f8f8fa;
}
-
-/*涓轰簡璁╅潰鏉垮湪瓒呭嚭鍖哄煙鍙樉绀�*/
-.el-table__body-wrapper{
- overflow: visible !important
-}
.table_only{
-overflow: visible !important
+ overflow: visible !important;
+ .el-table__body-wrapper{
+ overflow: visible !important
+ }
}
+/*涓轰簡璁╅潰鏉垮湪瓒呭嚭鍖哄煙鍙樉绀�*/
+/*.el-table__body-wrapper{*/
+/* overflow: visible !important*/
+/*}*/
+/*.table_only{*/
+/*overflow: visible !important*/
+/*}*/
</style>
--
Gitblit v1.9.3