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/sbgl/djjl.vue | 76 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/src/views/sbgl/djjl.vue b/src/views/sbgl/djjl.vue
index 919da66..df129f1 100644
--- a/src/views/sbgl/djjl.vue
+++ b/src/views/sbgl/djjl.vue
@@ -2,9 +2,9 @@
<div>
<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 icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
- <el-button 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>-->
+ <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</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" style="justify-content: flex-start">
- <el-form-item label-width="70px" label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
@@ -35,7 +35,7 @@
<el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
<el-input v-model="form.stanedname" 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.checkuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鐐规鏃堕棿" style=" display: flex;font-size:14px;align-items: center">
@@ -62,9 +62,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>
<div
@@ -164,8 +164,17 @@
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.chk_result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />姝ｅ父</div>
- <div v-if="row.chk_result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />寮傚父</div>
+ <div v-if="row.chk_result==='OK'" style="display: flex;align-items: center">
+ <!-- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />-->
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+
+ 姝ｅ父
+ </div>
+ <div v-if="row.chk_result==='NG'" style="display: flex;align-items: center">
+ <!-- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />-->
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 寮傚父
+ </div>
</template>
</el-table-column>
<el-table-column
@@ -191,7 +200,8 @@
<!-- </div>-->
<i
class="el-icon-tickets"
- style="cursor: pointer;color: #42b983;margin-right: 15px"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-right: 15px"
@click="edit('edit',row)"
/>
</template>
@@ -211,6 +221,7 @@
</div>
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'鐐规鏄庣粏'"
:visible.sync="dialogVisible"
width="800px"
@@ -251,8 +262,16 @@
label="鐐规缁撴灉"
>
<template slot-scope="{row}">
- <div v-if="row.result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />姝ｅ父</div>
- <div v-if="row.result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />寮傚父</div>
+ <div v-if="row.result==='OK'" style="display: flex;align-items: center">
+ <!-- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />-->
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 姝ｅ父
+ </div>
+ <div v-if="row.result==='NG'" style="display: flex;align-items: center">
+ <!-- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />-->
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 寮傚父
+ </div>
</template>
</el-table-column>
<el-table-column
@@ -269,9 +288,9 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisible = false">杩� 鍥�</el-button>
- <!-- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
- <!-- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="dialogVisible = false">杩� 鍥�</el-button>
+ <!-- <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
+ <!-- <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
@@ -297,12 +316,15 @@
import { handleDatetime, validateCode } from '@/utils/global'
import { DeviceCheckSubTakeSearch, DeviceCheckTakeOutExcel, DeviceCheckTakeSearch } from '@/api/sbgl'
import { ShopSearch } from '@/api/dzkb'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'Zzjg',
components: {
Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
data() {
return {
mouseHoverType: 'mouseout',
@@ -435,7 +457,7 @@
this.dialogVisible = true
},
// 淇敼鎸夐挳
- async edit(operation, row) {
+ async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
@@ -539,16 +561,19 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-range__icon{
+::v-deep .el-range__icon {
line-height: 28px !important;
}
-::v-deep .el-range-separator{
+
+::v-deep .el-range-separator {
line-height: 28px !important;
}
-::v-deep .el-range-input{
+
+::v-deep .el-range-input {
font-size: 14px;
}
-::v-deep .el-range-separator{
+
+::v-deep .el-range-separator {
display: flex;
justify-content: center;
align-items: center;
@@ -656,11 +681,12 @@
justify-content: center;
}
-.tableFixed{
- ::v-deep .el-table__fixed-right{
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
height: 100% !important;
}
- ::v-deep .el-table__fixed{
+
+ ::v-deep .el-table__fixed {
height: 100% !important;
}
}
--
Gitblit v1.9.3