From 086765836d22b11cf42f7dc2e9843a64d3d7da1c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 16 三月 2023 08:57:21 +0800
Subject: [PATCH] 1.看板样式更新迭代
---
src/views/zlgl/gxjyjl.vue | 77 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/src/views/zlgl/gxjyjl.vue b/src/views/zlgl/gxjyjl.vue
index ae3dc1f..920b5b3 100644
--- a/src/views/zlgl/gxjyjl.vue
+++ b/src/views/zlgl/gxjyjl.vue
@@ -2,9 +2,9 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup">
- <el-button type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
- <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
- <!-- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+ <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+ <!-- <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+ <!-- <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
</div>
<div class="bodyTopFormGroup">
@@ -13,10 +13,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="宸ュ崟缂栧彿" style=" display: flex;">
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -28,7 +28,7 @@
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partapec" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="宸ュ簭鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鏍囧噯鍚嶇О" style=" display: flex;">
@@ -55,9 +55,9 @@
</el-select>
</el-form-item>
</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 class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
@@ -108,11 +108,13 @@
<el-table-column
prop="wo_code"
label="宸ュ崟缂栫爜"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
<el-table-column
prop="partcode"
+ show-tooltip-when-overflow
width="160"
label="浜у搧缂栫爜"
sortable="custom"
@@ -121,11 +123,13 @@
prop="partname"
label="浜у搧鍚嶇О"
width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
>
@@ -138,29 +142,34 @@
prop="step_code"
label="宸ュ簭缂栫爜"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="stepname"
label="宸ュ簭鍚嶇О"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="checkstaned_code"
label="鏍囧噯缂栫爜"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="checkstaned_name"
label="鏍囧噯鍚嶇О"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="check_type"
label="妫�楠岀被鍨�"
+ show-tooltip-when-overflow
sortable="custom"
width="120"
>
@@ -174,11 +183,17 @@
prop="check_result"
label="妫�楠岀粨鏋�"
sortable="custom"
+ show-tooltip-when-overflow
width="120"
>
<template slot-scope="{row}">
- <div v-if="row.check_result==='NG'"> <i class="el-icon-circle-close" style="color:red;" /> 涓嶈壇</div>
- <div v-if="row.check_result==='OK'"> <i class="el-icon-circle-check" style="color: #42b983" /> 鍚堟牸</div>
+ <div v-if="row.check_result==='NG'">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 涓嶈壇
+ </div>
+ <div v-if="row.check_result==='OK'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鍚堟牸</div>
</template>
</el-table-column>
<el-table-column
@@ -197,17 +212,20 @@
prop="check_qty"
label="妫�楠屾暟閲�"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="lm_user"
label="妫�楠屼汉鍛�"
+ show-tooltip-when-overflow
sortable="custom"
width="120"
/>
<el-table-column
prop="lm_date"
label="妫�楠屾椂闂�"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
@@ -218,13 +236,14 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <!-- <el-button type="text" @click="check(row)">鏌ョ湅</el-button>-->
- <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <!-- <el-button v-waves type="text" @click="check(row)">鏌ョ湅</el-button>-->
+ <!-- <el-button v-waves type="text" @click="del(row)">鍒犻櫎</el-button>-->
<el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
<i
class="el-icon-view"
- style="color: #42b983;cursor: pointer;margin-right: 15px;"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-right: 15px;"
@click="check(row)"
/>
</el-tooltip>
@@ -246,6 +265,7 @@
</div>
<el-dialog
+ v-el-drag-dialog
title="宸ュ簭妫�楠屾槑缁�"
:visible.sync="dialogVisible"
width="900px"
@@ -279,35 +299,47 @@
<el-table-column
prop="checkitem_code"
+ show-tooltip-when-overflow
label="妫�楠岄」鐩紪鍙�"
width="120"
/>
<el-table-column
prop="checkitem_name"
label="妫�楠岄」鐩悕绉�"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="checkitem_descr"
label="妫�楠岄」鐩弿杩�"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="check_result"
label="妫�楠岀粨鏋�"
+ show-tooltip-when-overflow
width="120"
>
<template slot-scope="{row}">
- <div v-if="row.check_result==='NG'"> <i class="el-icon-circle-close" style="color:red;" /> 涓嶈壇</div>
- <div v-if="row.check_result==='OK'"> <i class="el-icon-circle-check" style="color: #42b983" /> 鍚堟牸</div>
+ <div v-if="row.check_result==='NG'">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 涓嶈壇
+ </div>
+ <div v-if="row.check_result==='OK'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鍚堟牸
+ </div>
</template>
</el-table-column>
<el-table-column
prop="lm_user"
label="妫�楠屼汉鍛�"
+ show-tooltip-when-overflow
width="120"
/>
<el-table-column
prop="lm_date"
label="妫�楠屾椂闂�"
+ show-tooltip-when-overflow
width="160"
/>
<!-- <el-table-column-->
@@ -317,8 +349,8 @@
<!-- >-->
<!-- <template slot-scope="{row}">-->
<!-- <div class="operationClass">-->
- <!-- <el-button type="text" @click="check(row)">鏌ョ湅</el-button>-->
- <!-- <!– <el-button type="text" @click="del(row)">鍒犻櫎</el-button>–>-->
+ <!-- <el-button v-waves type="text" @click="check(row)">鏌ョ湅</el-button>-->
+ <!-- <!– <el-button v-waves type="text" @click="del(row)">鍒犻櫎</el-button>–>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
@@ -326,9 +358,9 @@
</div>
<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 @click="dialogVisibleBack">杩� 鍥�</el-button>
+ <!-- <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
+ <!-- <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="dialogVisibleBack">杩� 鍥�</el-button>
</div>
</span>
</el-dialog>
@@ -352,6 +384,8 @@
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { StepCheckTableOutExcel, StepCheckTableSearch, StepCheckTableSubSearch } from '@/api/zlgl'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -359,6 +393,7 @@
components: {
Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
data() {
return {
mouseHoverType: 'mouseout',
--
Gitblit v1.9.3