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/sbqd.vue | 703 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 437 insertions(+), 266 deletions(-)
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 5532429..26ed24b 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -1,15 +1,28 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <div style="display: flex">
+ <el-button v-waves icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
+ <el-button v-waves icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
+ <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+
+ </div>
+
+ <!-- <el-button v-waves type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ </div>
+
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
- <div class="elForm">
+ <div class="elForm" style="justify-content: flex-start">
<el-form-item label="璁惧缂栫爜" style=" display: flex;">
<el-input v-model="form.DeviceCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -17,7 +30,13 @@
<el-input v-model="form.DeviceName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" style=" display: flex;">
- <el-select v-model="form.Status" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.Status"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -27,7 +46,14 @@
</el-select>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" style=" display: flex;">
- <el-select v-model="form.WorkShop" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.WorkShop"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <!-- @focus="getWorkShopSelect"-->
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -36,8 +62,16 @@
/>
</el-select>
</el-form-item>
- <el-form-item filterable label="璁惧绫诲瀷" style="display: flex;">
- <el-select v-model="form.DeviceType" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨" @change="deviceTypeChange">
+ <el-form-item v-show="isExpandForm" filterable label="璁惧绫诲瀷" style="display: flex;">
+ <el-select
+ v-model="form.DeviceType"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ filterable
+ placeholder="璇烽�夋嫨"
+ @change="deviceTypeChange"
+ >
+ <!-- @focus="getDeviceTypeSelect"-->
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -46,9 +80,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="璁惧缁�" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="璁惧缁�" style=" display: flex;">
<el-select
v-model="form.DeviceGroup"
+ filterable
:popper-append-to-body="false"
:disabled="form.DeviceType===''"
style="width: 200px"
@@ -63,28 +98,43 @@
</el-select>
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;">
- <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
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
- <el-divider />
- <div style="margin-left: 10px;display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
- <el-button type="primary" icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
- </div>
- <el-divider />
- <div class="elTableDiv">
+
+ <div class="elTableDiv" style="margin-top: 0;">
<el-table
+ ref="tableDataRef"
:data="tableData"
border
- :height="tableHeight"
- stripe
+ class="tableFixed"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
highlight-current-row
- :style="{width: 100+'%',height:(tableHeight-50)+'px'}"
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
@@ -97,41 +147,58 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="code"
label="璁惧缂栫爜"
+ min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="name"
label="璁惧鍚嶇О"
+ min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="eqptype_name"
label="璁惧绫诲瀷"
+ min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="eqpgroup_name"
label="璁惧缁�"
+ show-tooltip-when-overflow
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="enable"
label="浣跨敤鐘舵��"
sortable="custom"
+ show-tooltip-when-overflow
width="120"
>
<template slot-scope="{row}">
- <div v-if="row.enable==='Y'">鏄�</div>
- <div v-if="row.enable==='N'">鍚�</div>
+ <div v-if="row.enable==='Y'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row.enable==='N'">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 鍚�
+ </div>
</template>
</el-table-column>
<el-table-column
prop="input_date"
label="鎶曞叆鏃ユ湡"
+ show-tooltip-when-overflow
sortable="custom"
width="120"
>
@@ -143,20 +210,24 @@
prop="wksp_name"
label="鐢熶骇杞﹂棿"
sortable="custom"
+ show-tooltip-when-overflow
+ min-width="120"
/>
- <el-table-column
- prop="Line_name"
- label="鎵�灞炰骇绾�"
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="Line_name"-->
+ <!-- label="鎵�灞炰骇绾�"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="operation_ration"
label="绋煎姩鐜�"
+ show-tooltip-when-overflow
sortable="custom"
width="100"
>
<template slot-scope="{row}">
- <div>{{ row.operation_ration }}%</div>
+ <div v-if=" parseFloat(row.operation_ration)===0">/</div>
+ <div v-else>{{ row.operation_ration }}%</div>
</template>
</el-table-column>
<el-table-column
@@ -164,20 +235,28 @@
label="鍒涘缓浜哄憳"
sortable="custom"
width="120"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="lm_date"
+ width="160"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
label="鎿嶄綔"
- width="100"
+ fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <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 :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -185,35 +264,42 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
:total="total"
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceMangerSearch"
/>
</div>
<!--璁惧娓呭崟鏂板缂栬緫-->
<el-dialog
+ v-el-drag-dialog
:close-on-click-modal="false"
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
top="15vh"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<el-form-item label="璁惧缂栫爜" prop="devicecode">
- <el-input v-model="dialogForm.devicecode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.devicecode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="璁惧鍚嶇О" prop="devicename">
- <el-input v-model="dialogForm.devicename" style="width: 220px" />
+ <el-input v-model="dialogForm.devicename" style="width: 200px" />
</el-form-item>
<el-form-item label="璁惧绫诲瀷" prop="devicetypecode">
- <el-select v-model="dialogForm.devicetypecode" :popper-append-to-body="false" style="width: 220px" placeholder="璇烽�夋嫨" @change="devicetypecodeChange">
+ <el-select
+ v-model="dialogForm.devicetypecode"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="devicetypecodeChange"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -223,7 +309,14 @@
</el-select>
</el-form-item>
<el-form-item label="璁惧缁�" prop="devicegroupcode">
- <el-select v-model="dialogForm.devicegroupcode" :popper-append-to-body="false" :disabled="dialogForm.devicetypecode===''" style="width: 220px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="dialogForm.devicegroupcode"
+ :popper-append-to-body="false"
+ :disabled="dialogForm.devicetypecode===''"
+ style="width: 200px"
+ filterable
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in DeviceGroupDialogArr"
:key="item.code"
@@ -235,14 +328,23 @@
<el-form-item label="鎶曞叆鏃ユ湡" prop="importdate">
<el-date-picker
v-model="dialogForm.importdate"
- style="width: 220px"
+ style="width: 200px"
type="date"
placeholder="閫夋嫨鏃ユ湡"
popper-class="dateStyle"
/>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" prop="workshopcode">
- <el-select v-model="dialogForm.workshopcode" :popper-append-to-body="false" style="width: 220px" placeholder="璇烽�夋嫨" @change="workshopcodeChange">
+ <el-select
+ v-model="dialogForm.workshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="workshopcodeChange"
+ >
+ <!-- @focus="getWorkShopSelect"-->
+
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -251,18 +353,31 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鎵�灞炰骇绾�" prop="linecode">
- <el-select v-model="dialogForm.linecode" :popper-append-to-body="false" :disabled="dialogForm.workshopcode===''" style="width: 220px" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in WorkLineArr"
- :key="item.linecode"
- :label="item.linename"
- :value="item.linecode"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item label="鎵�灞炰骇绾�" prop="linecode">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.linecode"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- :disabled="dialogForm.workshopcode===''"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in WorkLineArr"-->
+ <!-- :key="item.linecode"-->
+ <!-- :label="item.linename"-->
+ <!-- :value="item.linecode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item label="浣跨敤鐘舵��" prop="status">
- <el-select v-model="dialogForm.status" :popper-append-to-body="false" style="width: 220px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="dialogForm.status"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -272,37 +387,47 @@
</el-select>
</el-form-item>
<el-form-item label="绋煎姩鐜�" prop="ratio">
- <el-input v-model="dialogForm.ratio" style="width: 195px" /><span style="margin-left: 10px">%</span>
+ <el-input v-model="dialogForm.ratio" style="width: 175px" />
+ <span style="margin-left: 10px">%</span>
</el-form-item>
</el-form>
<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"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
<!--璁惧绫诲瀷-->
<el-dialog
+ v-el-drag-dialog
title="璁惧绫诲瀷"
:visible.sync="DeviceTypeDialogVisible"
- width="50%"
+ width="800px"
top="15vh"
:close-on-click-modal="false"
class="DeviceTypeDialogVisible"
@close="handleCloseDeviceType"
>
<div style="margin-bottom: 20px;display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceType">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceType">鏂板</el-button>
+ <!-- <el-button v-waves type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
</div>
<el-table
+ ref="DeviceTypeArray"
:data="DeviceTypeArray"
border
- height="400"
+ height="300"
highlight-current-row
+ :row-class-name="tableRowClassName"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeOfDeviceType"
@@ -311,19 +436,27 @@
width="50"
label="搴忓彿"
prop="RowNum"
+ fixed
/>
<el-table-column
prop="code"
+ show-tooltip-when-overflow
label="绫诲瀷缂栫爜"
sortable="custom"
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="璇疯緭鍏�" />
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.code"
+ oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
<div v-else> {{ row.code }}</div>
</template>
</el-table-column>
<el-table-column
prop="name"
+ show-tooltip-when-overflow
label="绫诲瀷鍚嶇О"
sortable="custom"
>
@@ -336,6 +469,7 @@
prop="remark"
label="绫诲瀷鎻忚堪"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<el-input v-if="row.isVisible===1" v-model="row.remark" placeholder="璇疯緭鍏�" />
@@ -345,50 +479,54 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="DeviceTypeDel(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="DeviceTypeSave(row)">淇濆瓨</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="DeviceTypeCancel(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="DeviceTypeDel(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceTypeSave(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceTypeCancel(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
</el-table>
<!--鍒嗛〉-->
<pagination
- v-show="DeviceTypeTotal>0"
:total="DeviceTypeTotal"
:page.sync="formDeviceType.page"
:limit.sync="formDeviceType.rows"
align="right"
- layout="prev, pager, next,sizes"
+ style="margin-top: 10px"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceTypeSearchDialog"
/>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="DeviceTypeDialogVisibleCancel">杩斿洖</el-button>
- <!-- <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="DeviceTypeDialogVisibleCancel">杩斿洖</el-button>
+ <!-- <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
<!--璁惧缁�-->
<el-dialog
+ v-el-drag-dialog
title="璁惧缁�"
:visible.sync="DeviceGroupDialogVisible"
- width="70%"
+ width="800px"
:close-on-click-modal="false"
top="15vh"
+
class="DeviceTypeDialogVisible"
@close="handleCloseDeviceGroup"
>
<div style="margin-bottom: 20px;display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceGroup">鏂板</el-button>
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceGroup">鏂板</el-button>
</div>
<el-table
+ ref="DeviceGroupArray"
:data="DeviceGroupArray"
border
highlight-current-row
- height="400"
+ height="300"
+ :row-class-name="tableRowClassName"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeOfDeviceGroup"
@@ -396,20 +534,28 @@
<el-table-column
width="50"
label="搴忓彿"
+ fixed
prop="RowNum"
/>
<el-table-column
prop="code"
label="鍒嗙粍缂栫爜"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="璇疯緭鍏�" />
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.code"
+ oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
<div v-else> {{ row.code }}</div>
</template>
</el-table-column>
<el-table-column
prop="name"
+ show-tooltip-when-overflow
label="鍒嗙粍鍚嶇О"
sortable="custom"
>
@@ -422,9 +568,16 @@
prop="eqptype_name"
label="鎵�灞炶澶囩被鍨�"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
- <el-select v-if="row.isVisible===1" v-model="row.eqptype_code" :popper-append-to-body="false" placeholder="璇烽�夋嫨">
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.eqptype_code"
+ filterable
+ :popper-append-to-body="false"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -437,8 +590,8 @@
</el-table-column>
<el-table-column
prop="remark"
+ show-tooltip-when-overflow
label="鍒嗙粍鎻忚堪"
- show-overflow-tooltip
sortable="custom"
>
<template slot-scope="{row}">
@@ -449,43 +602,50 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="DeviceGroupDel(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="DeviceGroupSave(row)">淇濆瓨</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="DeviceGroupCancel(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="DeviceGroupDel(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceGroupSave(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="DeviceGroupCancel(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
</el-table>
<!--鍒嗛〉-->
<pagination
- v-show="DeviceGroupTotal>0"
:total="DeviceGroupTotal"
:page.sync="formDeviceGroup.page"
:limit.sync="formDeviceGroup.rows"
align="right"
- layout="prev, pager, next,sizes"
+ style="margin-top: 10px"
+ layout="total, prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceGroupSearchDialog"
/>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="DeviceGroupDialogVisibleCancel">杩斿洖</el-button>
- <!-- <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="DeviceGroupDialogVisibleCancel">杩斿洖</el-button>
+ <!-- <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
<!--瀵煎叆-->
+ <import-picker
+ ref="importPickerFunc"
+ class="importPickerClass"
+ :shows.sync="shows"
+ :title="title_value"
+ :colos="colos"
+ :code="code"
+ />
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
-import { getCookie } from '@/utils/auth'
import {
AddUpdateDeviceGroup, AddUpdateDeviceManger,
- AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
+ AddUpdateDeviceType, DeleteDeviceGroup, DeleteDeviceManger, DeleteDeviceType,
DeviceGroupSearch,
DeviceMangerSearch,
DeviceTypeSearch,
@@ -493,27 +653,21 @@
DeviceTypeSelectGroup,
WorkShopSelect, WorkShopSelectLine
} from '@/api/sbgl'
-import { handleDatatime } from '@/utils/global'
+import { handleDatetime, validateCode } from '@/utils/global'
+import ImportPicker from '@/components/ImportPicker'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SBQD',
components: {
- Pagination
+ Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -544,10 +698,10 @@
devicename: '',
devicetypecode: '',
devicegroupcode: '',
- importdate: '',
+ importdate: handleDatetime(new Date()),
workshopcode: '',
linecode: '',
- status: '',
+ status: 'Y',
ratio: ''
},
DeviceGroupDialogArr: [], // 璁惧缁勬暟缁�
@@ -555,7 +709,7 @@
operation: '',
dialogFormRules: {
devicecode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
devicename: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -572,9 +726,9 @@
workshopcode: [
{ required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
],
- linecode: [
- { required: true, message: '璇烽�夋嫨鎵�灞炰骇绾�', trigger: ['blur', 'change'] }
- ],
+ // linecode: [
+ // { required: true, message: '璇烽�夋嫨鎵�灞炰骇绾�', trigger: ['blur', 'change'] }
+ // ],
status: [
{ required: true, message: '璇烽�夋嫨浣跨敤鐘舵��', trigger: ['blur', 'change'] }
]
@@ -596,27 +750,53 @@
prop: 'code',
order: 'desc'
},
- DeviceGroupTotal: 0
+ DeviceGroupTotal: 0,
+
+ title_value: '鏁版嵁瀵煎叆 / 璁惧娓呭崟',
+ code: '9',
+ shows: false
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getDeviceMangerSearch()
+ }
}
},
created() {
- // 鑾峰彇璁惧娓呭崟鍒楄〃
- this.getDeviceMangerSearch()
- // 鑾峰彇璁惧绫诲瀷涓嬫媺
- this.getDeviceTypeSelect()
- // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
- this.getWorkShopSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ // 璁惧娓呭崟瀵煎叆
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ },
+ handleRequest() {
+ // 鑾峰彇璁惧娓呭崟鍒楄〃
+ this.getDeviceMangerSearch().then(res => {
+ if (res.code === '200') {
+ // 鑾峰彇璁惧绫诲瀷涓嬫媺
+ this.getDeviceTypeSelect()
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ this.getWorkShopSelect()
+ }
+ })
+ },
// 鑾峰彇璁惧娓呭崟鍒楄〃
async getDeviceMangerSearch() {
const res = await DeviceMangerSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
// 鑾峰彇鎵�灞炶溅闂翠笅鎷�
async getWorkShopSelect() {
@@ -652,11 +832,6 @@
search() {
this.getDeviceMangerSearch()
},
- // 瀵煎叆
- upload() {
-
- },
-
// 閲嶇疆
reset() {
this.form.DeviceCode = ''
@@ -687,7 +862,7 @@
this.dialogForm.devicegroupcode = row.eqpgroup_code
this.dialogForm.importdate = row.input_date
this.dialogForm.workshopcode = row.wksp_code
- this.dialogForm.linecode = row.Line_code
+ // this.dialogForm.linecode = row.Line_code
this.dialogForm.status = row.enable
this.dialogForm.ratio = row.operation_ration
})
@@ -702,6 +877,9 @@
DeleteDeviceManger({ devicecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDeviceMangerSearch()
}
})
@@ -716,18 +894,18 @@
this.dialogForm.devicename = ''
this.dialogForm.devicetypecode = ''
this.dialogForm.devicegroupcode = ''
- this.dialogForm.importdate = ''
+ this.dialogForm.importdate = handleDatetime(new Date())
this.dialogForm.workshopcode = ''
- this.dialogForm.linecode = ''
- this.dialogForm.status = ''
+ // this.dialogForm.linecode = ''
+ this.dialogForm.status = 'Y'
this.dialogForm.ratio = ''
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗘墍灞炶溅闂翠笅鎷夐�夋嫨鏀瑰彉鏃�
- async workshopcodeChange(val) {
+ async workshopcodeChange(val) {
const { data: res } = await WorkShopSelectLine({ workshopcode: val })
this.WorkLineArr = res
- this.dialogForm.linecode = ''
+ // this.dialogForm.linecode = ''
},
// 瀵硅瘽妗嗚澶囩被鍨嬩笅鎷夐�夋嫨鏀瑰彉鏃�
async devicetypecodeChange(val) {
@@ -743,24 +921,27 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
id: this.dialogForm.id,
devicecode: this.dialogForm.devicecode,
devicename: this.dialogForm.devicename,
devicetypecode: this.dialogForm.devicetypecode,
devicegroupcode: this.dialogForm.devicegroupcode,
- importdate: handleDatatime(this.dialogForm.importdate),
+ importdate: handleDatetime(this.dialogForm.importdate),
workshopcode: this.dialogForm.workshopcode,
- linecode: this.dialogForm.linecode,
+ // linecode: this.dialogForm.linecode,
+ linecode: '',
status: this.dialogForm.status,
ratio: this.dialogForm.ratio,
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
AddUpdateDeviceManger(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getDeviceMangerSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
@@ -771,8 +952,12 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 245
+ this.$refs.tableDataRef.doLayout()
+ // if (window.innerHeight < 769) {
+ // this.tableHeight = this.tableHeight - 50
+ // }
})
},
@@ -781,6 +966,9 @@
deviceTypeButton() {
this.DeviceTypeDialogVisible = true
this.getDeviceTypeSearchDialog()
+ this.$nextTick(() => {
+ this.$refs.DeviceTypeArray.doLayout()
+ })
},
async getDeviceTypeSearchDialog() {
const res = await DeviceTypeSearch(this.formDeviceType)
@@ -814,7 +1002,12 @@
},
// 鏂板鎸夐挳
addDeviceType() {
- const number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ if (this.DeviceTypeArray.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨涓婁竴鏉¤褰曪紒')
+ }
+
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
this.DeviceTypeArray.unshift({ code: '', name: '', group: '', remark: '', isVisible: 1, number: number })
},
// 鍒犻櫎
@@ -827,6 +1020,9 @@
DeleteDeviceType({ devicetypecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formDeviceType.page > 1 && this.DeviceTypeArray.length === 1) {
+ this.formDeviceType.page--
+ }
this.getDeviceTypeSearchDialog()
}
})
@@ -842,9 +1038,9 @@
if (row.name.trim().length < 1) {
return this.$message.info('绫诲瀷鍚嶇О涓嶈兘涓虹┖锛�')
}
- if (row.remark.trim().length < 1) {
- return this.$message.info('绫诲瀷鎻忚堪涓嶈兘涓虹┖锛�')
- }
+ // if (row.remark.trim().length < 1) {
+ // return this.$message.info('绫诲瀷鎻忚堪涓嶈兘涓虹┖锛�')
+ // }
const data = {
'code': row.code,
'name': row.name,
@@ -875,6 +1071,9 @@
deviceGroupButton() {
this.DeviceGroupDialogVisible = true
this.getDeviceGroupSearchDialog()
+ this.$nextTick(() => {
+ this.$refs.DeviceGroupArray.doLayout()
+ })
},
// 璁惧缁勫璇濇鍏抽棴浜嬩欢
handleCloseDeviceGroup() {
@@ -890,8 +1089,20 @@
},
// 鏂板
addDeviceGroup() {
- const number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
- this.DeviceGroupArray.unshift({ code: '', name: '', eqptype_code: '', eqptype_name: '', remark: '', isVisible: 1, number: number })
+ if (this.DeviceGroupArray.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨涓婁竴鏉¤褰曪紒')
+ }
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ this.DeviceGroupArray.unshift({
+ code: '',
+ name: '',
+ eqptype_code: '',
+ eqptype_name: '',
+ remark: '',
+ isVisible: 1,
+ number: number
+ })
},
// 鎺掑簭
sortChangeOfDeviceGroup({ column, prop, order }) {
@@ -929,6 +1140,9 @@
DeleteDeviceGroup({ devicegroupcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formDeviceGroup.page > 1 && this.DeviceGroupArray.length === 1) {
+ this.formDeviceGroup.page--
+ }
this.getDeviceGroupSearchDialog()
}
})
@@ -947,9 +1161,9 @@
if (row.eqptype_code.trim().length < 1) {
return this.$message.info('鎵�灞炶澶囩被鍨嬩笉鑳戒负绌猴紒')
}
- if (row.remark.trim().length < 1) {
- return this.$message.info('鍒嗙粍鎻忚堪涓嶈兘涓虹┖锛�')
- }
+ // if (row.remark.trim().length < 1) {
+ // return this.$message.info('鍒嗙粍鎻忚堪涓嶈兘涓虹┖锛�')
+ // }
const data = {
'code': row.code,
'name': row.name,
@@ -969,35 +1183,68 @@
this.DeviceGroupArray.splice(index, 1)
}
})
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
}
}
}
</script>
+<style lang="scss" scoped>
+::v-deep .DeviceTypeDialogVisible .el-dialog__body {
+ padding: 20px 20px !important;
+}
+</style>
+<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
-}
-::v-deep .el-button--primary:hover {
- border: none;
-}
-::v-deep .el-button--info {
- //background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
}
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-icon-edit-outline {
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
}
::v-deep .el-dialog__footer {
@@ -1005,141 +1252,65 @@
justify-content: flex-end;
}
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-.DeviceTypeDialogVisible {
- ::v-deep .el-dialog__body {
- padding: 20px 20px !important;
- }
-
- ::v-deep .el-select .el-input .el-select__caret {
- display: flex;
- align-items: center;
- }
-
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
::v-deep .el-table .caret-wrapper {
- //float: right;
transform: scale(0.8);
}
::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
display: flex;
- justify-content: space-between;
align-items: center;
+ justify-content: space-between;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
+::v-deep .el-table::before {
+ height: 0;
}
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
-
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-.body ::v-deep .el-divider{
+.body ::v-deep .el-divider {
border: 1px solid #eee;
width: 99%;
margin: 10px auto;
}
-.body ::v-deep .el-form-item{
+
+.body ::v-deep .el-form-item {
margin-bottom: 0;
}
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
}
-::v-deep .el-select .el-input__inner:focus{
- border-color: $main_color;
+::v-deep .el-select__caret {
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
-::v-deep .el-select-dropdown__item.selected{
- color: $main_color;
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
}
</style>
-<style lang="scss">
-.dateStyle{
- .el-date-table td.today span{
- color: #42b983;
- }
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
}
</style>
--
Gitblit v1.9.3