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/zzmx/gxdy.vue | 101 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 70 insertions(+), 31 deletions(-)
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index edc9fc6..f4d01a2 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -3,8 +3,8 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <!-- <el-button v-waves type="primary" icon="el-icon-upload2" @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.stepcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="宸ュ簭鍚嶇О" style=" display: flex;">
@@ -54,13 +54,13 @@
/>
</el-select>
</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.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</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
@@ -108,6 +108,7 @@
/>
<el-table-column
prop="stepcode"
+ show-tooltip-when-overflow
label="宸ュ簭缂栫爜"
min-width="150"
sortable="custom"
@@ -115,12 +116,14 @@
<el-table-column
prop="stepname"
min-width="150"
+ show-tooltip-when-overflow
label="宸ュ簭鍚嶇О"
sortable="custom"
/>
<el-table-column
prop="flwtype"
min-width="150"
+ show-tooltip-when-overflow
label="宸ュ簭绫诲瀷"
sortable="custom"
>
@@ -132,6 +135,7 @@
</el-table-column>
<el-table-column
prop="descr"
+ show-tooltip-when-overflow
label="宸ュ簭鎻忚堪"
min-width="180"
sortable="custom"
@@ -144,16 +148,17 @@
<el-table-column
prop="enable"
label="鍚敤鐘舵��"
+ show-tooltip-when-overflow
sortable="custom"
width="110"
>
<template slot-scope="{row}">
<div v-if="row.enable==='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-if="row.enable==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <i class="el-icon-info" style="margin-right: 2px" />
鍚�
</div>
</template>
@@ -161,23 +166,26 @@
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
<el-table-column
label="鍏宠仈宸ヤ綔绔�"
prop="is_eqp"
+ show-tooltip-when-overflow
width="110"
>
<template slot-scope="{row}">
<div class="operationClass">
- <i v-if="row.is_eqp==='Y'" class="el-icon-share" @click="workClick(row)" />
+ <i v-if="row.is_eqp==='Y'" :style="{color:$store.state.settings.theme}" class="el-icon-share" @click="workClick(row)" />
<i
v-if="row.is_eqp==='N'"
class="el-icon-share"
@@ -190,11 +198,12 @@
<el-table-column
label="鍏宠仈缂洪櫡"
prop="is_defect"
+ show-tooltip-when-overflow
width="110"
>
<template slot-scope="{row}">
<div class="operationClass">
- <i v-if="row.is_defect==='Y'" class="el-icon-share" @click="defectClick(row)" />
+ <i v-if="row.is_defect==='Y'" :style="{color:$store.state.settings.theme}" class="el-icon-share" @click="defectClick(row)" />
<i
v-if="row.is_defect==='N'"
class="el-icon-share"
@@ -212,10 +221,10 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
</template>
@@ -236,6 +245,7 @@
<!--鏂板淇敼瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
width="800px"
@@ -301,8 +311,9 @@
</el-form>
<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-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
@@ -314,6 +325,7 @@
<!-- 鍏宠仈宸ヤ綔绔欏璇濇-->
<el-dialog
+ v-el-drag-dialog
title="鍏宠仈宸ヤ綔绔�"
:visible.sync="workDialogVisible"
width="50%"
@@ -326,38 +338,50 @@
<!-- @opened="handleOpenedRoles"-->
<div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 宸ュ簭鍚嶇О锛歿{ workDialogForm.stepname }}
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 宸ュ簭鍚嶇О锛歿{ workDialogForm.stepname }}
</div>
<el-divider />
<div>
<div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ヤ綔绔欓泦鍚堬細
+ <i class="el-icon-s-operation":style="{color:$store.state.settings.theme}" /> 宸ヤ綔绔欓泦鍚堬細
</div>
<div class="myCheckboxGroup">
<div
v-for="item in workDialogForm.workGatherArr"
:key="item.code"
- :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ :style="{border:item.isSelected1?'1px solid '+$store.state.settings.theme :'1px solid #eee'}"
class="myCheckbox"
@click="myCheckboxClick(item)"
>
- <input
- class="myCheckboxInput"
- type="checkbox"
- :value="item.code"
- name="gather"
- :style="{color:item.isSelected2?'#42b983':'#fff'}"
- @click="myCheckboxInputClick(item)"
- >{{ item.name }}
+ <!-- <input-->
+ <!-- class="myCheckboxInput"-->
+ <!-- type="checkbox"-->
+ <!-- :value="item.code"-->
+ <!-- name="gather"-->
+ <!-- :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+ <!-- @click="myCheckboxInputClick(item)"-->
+ <!-- >{{ item.name }}-->
<!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
<!-- onClick="event.cancelBubble = true"-->
+ <el-checkbox
+ :key="item.code"
+ v-model="item.isSelected2"
+ class="myCheckboxInput"
+ :value="item.code"
+ :name="item.name"
+ :label="item.name"
+ :checked="item.isSelected2"
+ @change="myCheckboxInputClick(item)"
+ />
+ <div class="myCheckboxInputLabel">{{ item.name }}</div>
+
</div>
</div>
</div>
<el-divider />
<div>
<div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ヤ綔绔欙細
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 宸ヤ綔绔欙細
</div>
<el-tree
ref="workTree"
@@ -374,8 +398,9 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="workDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves @click="workDialogVisibleCancel">鍙� 娑�</el-button>
<el-button
+ v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
@@ -387,6 +412,7 @@
<!-- 鍏宠仈缂洪櫡瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
title="宸ュ簭鍏宠仈缂洪櫡"
:visible.sync="defectDialogVisible"
width="50%"
@@ -399,7 +425,7 @@
<!-- @opened="handleOpenedRoles"-->
<div style="margin-bottom: 20px">
- <i class="el-icon-s-comment" style="color:#42b983;" /> 宸ュ簭鍚嶇О锛歿{ defectTreeName }}
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 宸ュ簭鍚嶇О锛歿{ defectTreeName }}
</div>
<div>
@@ -421,8 +447,9 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="defectDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves @click="defectDialogVisibleCancel">鍙� 娑�</el-button>
<el-button
+ v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
@@ -447,12 +474,15 @@
} from '@/api/zzmx'
import $ from 'jquery'
import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'GXDY',
components: {
Pagination
},
+ directives: { elDragDialog, waves },
data() {
return {
mouseHoverType: 'mouseout',
@@ -753,7 +783,7 @@
},
// 灏忕洅瀛愮偣鍑讳簨浠�
myCheckboxInputClick(val) {
- val.isSelected2 = !val.isSelected2
+ val.isSelected2 = !!val.isSelected2
console.log(val.code, 1)
this.workDialogForm.workCodeSelectedGatherArr = [...new Set(this.workDialogForm.workCodeSelectedGatherArr)]
// 1.绗竴绉嶆儏鍐� 灏忕洅瀛愪粠娌￠�変腑鍒伴�変腑
@@ -1056,12 +1086,21 @@
margin: 10px 30px 0 0;
border-radius: 5px;
cursor: default;
+ position: relative;
.myCheckboxInput {
margin: 1px 5px 0 0;
cursor: pointer;
}
+ .myCheckboxInputLabel {
+ position: absolute;
+ left: 29px;
+ padding: 5px;
+ top: 6px;
+ color: transparent;
+ }
+
}
input[type=checkbox] {
--
Gitblit v1.9.3