From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/scgl/cngh.vue | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/src/views/scgl/cngh.vue b/src/views/scgl/cngh.vue
index 8e49ea7..e54c9b0 100644
--- a/src/views/scgl/cngh.vue
+++ b/src/views/scgl/cngh.vue
@@ -2,7 +2,7 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup" style="justify-content: space-between">
- <el-button type="primary" icon="el-icon-setting" @click="setting('setting')">璁剧疆</el-button>
+ <el-button v-waves type="primary" icon="el-icon-setting" @click="setting('setting')">璁剧疆</el-button>
</div>
<div class="bodyTopFormGroup">
@@ -11,10 +11,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-select
v-model="form.workshop"
style="width: 200px"
@@ -56,9 +56,9 @@
</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>
<div
@@ -91,11 +91,13 @@
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
@@ -111,6 +113,7 @@
readonly
/>
<el-button
+
type="primary"
style="padding: 0 10px;margin-left: 5px"
class="el-icon-search"
@@ -140,12 +143,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"
/>
@@ -154,14 +159,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>
@@ -182,6 +188,7 @@
</div>
<el-dialog
+ v-el-drag-dialog
:title="operation==='setting'?'璁剧疆':'榛樿鏂规'"
:visible.sync="dialogVisible"
width="1360px"
@@ -190,7 +197,7 @@
@closed="handleClose"
@close="handleClose"
>
- <el-button v-if="operation==='setting'" type="primary" @click="addRow">鏂板</el-button>
+ <el-button v-if="operation==='setting'" v-waves type="primary" @click="addRow">鏂板</el-button>
<div class="elTableDiv">
<!-- 閫夋嫨榛樿鏂规鐨勬椂鍊欐槸杩欎釜table-->
<el-table
@@ -384,9 +391,9 @@
>
<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>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="delRow(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveRow(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelRow(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
@@ -573,9 +580,9 @@
>
<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>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="delRow(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveRow(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelRow(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
@@ -583,9 +590,10 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">杩� 鍥�</el-button>
+ <el-button v-waves @click="dialogVisibleCancel">杩� 鍥�</el-button>
<el-button
v-if="operation!=='setting'"
+ v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
@@ -609,12 +617,15 @@
import { DeviceTypeSelect, WorkShopSelect } from '@/api/sbgl'
import { handleDatetime3 } from '@/utils/global'
import { WhkspIsEqpSearch } from '@/api/jcsz'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'Zzjg',
components: {
Pagination, DatePicker
},
+ directives: { elDragDialog, waves },
data() {
return {
mouseHoverType: 'mouseout',
--
Gitblit v1.9.3