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/wxjl.vue | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/views/sbgl/wxjl.vue b/src/views/sbgl/wxjl.vue
index bbdf244..2d549ea 100644
--- a/src/views/sbgl/wxjl.vue
+++ b/src/views/sbgl/wxjl.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-download" @click="download">瀵煎嚭</el-button>
+ <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</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="鐢熶骇杞﹂棿" label-width="70px" 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"
@@ -33,7 +33,7 @@
<el-form-item label="鎶ヤ慨浜哄憳" style=" display: flex;">
<el-input v-model="form.reportuser" 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.repairuser" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="楠岃瘉浜哄憳" style=" display: flex;">
@@ -67,7 +67,6 @@
</el-form-item>
<el-form-item
v-show="isExpandForm"
- label-width="70px"
label="楠岃瘉鏃堕棿"
style=" display: flex;align-items: center"
>
@@ -84,9 +83,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
@@ -256,6 +255,7 @@
</div>
<el-dialog
+ v-el-drag-dialog
title="缁翠慨鏄庣粏"
:visible.sync="dialogVisible"
width="800px"
@@ -317,7 +317,12 @@
<div style="display: flex;flex-direction: column;margin-left: 40px">
<div style="margin-bottom: 10px;display: flex;">楠岃瘉缁撴灉锛�
- <i v-if="isResult==='閫氳繃'" class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ <i
+ v-if="isResult==='閫氳繃'"
+ class="el-icon-success"
+ :style="{color:$store.state.settings.theme}"
+ style="margin-right: 2px"
+ />
<i v-if="isResult==='涓嶉�氳繃'" class="el-icon-info" style="margin-right: 2px" />
{{ isResult }}
@@ -334,7 +339,7 @@
@close="pictureHandleClose"
>
<div style="font-size: 16px;margin-bottom: 10px">
- <i class="el-icon-s-comment" style="color:#42b983;" /> {{ pictureName }}
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> {{ pictureName }}
</div>
<img :key="new Date()" width="100%" :src="pictureUrl" alt="">
@@ -344,7 +349,8 @@
v-if="pictureUrlAll.findIndex(item => item.url === pictureUrl)!==0"
style="position: absolute;top: 48%;left: 3.5%;"
><i
- style="color:#fff;cursor: pointer;font-size: 20px"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;font-size: 20px"
class="el-icon-d-arrow-left"
@click="arrowLeftClick(pictureUrl,pictureName)"
/></div>
@@ -355,22 +361,23 @@
style="position: absolute;top: 48%;right: 3.5%;"
>
<i
- style="color:#fff;cursor: pointer;font-size: 20px"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;font-size: 20px"
class="el-icon-d-arrow-right"
@click="arrowRightClick(pictureUrl,pictureName)"
/></div>
</el-tooltip>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="pictureVisible=false">杩� 鍥�</el-button>
+ <el-button v-waves @click="pictureVisible=false">杩� 鍥�</el-button>
</div>
</span>
</el-dialog>
<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 v-waves @click="dialogVisibleCancel">杩� 鍥�</el-button>
+ <!-- <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
@@ -394,12 +401,15 @@
import { handleDatetime } from '@/utils/global'
import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch } 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',
@@ -430,7 +440,7 @@
isResult: '', // 楠岃瘉缁撴灉
operation: '',
- baseUrl: 'http://121.196.36.24:8001/', // 鍥剧墖棰勮鍦板潃鍓嶇紑
+ baseUrl: '', // 鍥剧墖棰勮鍦板潃鍓嶇紑
pictureVisible: false, // 鍥剧墖棰勮瀵硅瘽妗�
pictureUrl: '', // 鍥剧墖棰勮Url
@@ -456,6 +466,8 @@
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
+
+ this.baseUrl = process.env.VUE_APP_BASE_API_FILE
},
methods: {
handleRequest() {
--
Gitblit v1.9.3