From e713b378b01d189f972cfb5b9eae749ee95a8b51 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 29 十月 2022 13:48:00 +0800
Subject: [PATCH] 1.解决两个账号登录，是否被挤掉的问题
---
src/views/zzmx/jpgj.vue | 421 ++++++++++++++++++++++++++-------------------------
1 files changed, 214 insertions(+), 207 deletions(-)
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 736c146..a506c91 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -1,23 +1,32 @@
<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 type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button icon="el-icon-download" @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"
>
<div class="elForm">
- <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item label-width="70px" label="浜у搧鍚嶇О" style=" display: flex;">
<el-select
v-model="form.partcode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+
@change="partChange"
>
+ <!-- @focus="getPartSelect"-->
<el-option
v-for="item in partArr"
:key="item.partcode"
@@ -29,6 +38,7 @@
<el-form-item label="宸ヨ壓璺嚎" style=" display: flex;">
<el-select
v-model="form.routecode"
+ filterable
:disabled="form.partcode===''"
:popper-append-to-body="false"
style="width: 200px"
@@ -63,6 +73,7 @@
<el-form-item label="鍏宠仈璁惧" style=" display: flex;">
<el-select
v-model="form.eqpcode"
+ filterable
:disabled="form.stepcode===''"
:popper-append-to-body="false"
style="width: 200px"
@@ -77,24 +88,24 @@
</el-select>
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <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>
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ />
</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-upload2" @click="upload">瀵煎叆</el-button>-->
- </div>
- <el-divider />
+
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -109,41 +120,55 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="partcode"
+ min-width="160"
label="浜у搧缂栫爜"
sortable="custom"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
+ min-width="160"
sortable="custom"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
- width="110"
+ min-width="110"
sortable="custom"
- />
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="wksp_name"
label="鐢熶骇杞﹂棿"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="route_name"
label="宸ヨ壓璺嚎"
sortable="custom"
+ min-width="120"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="stepname"
label="鍔犲伐宸ュ簭"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="eqp_name"
label="鍔犲伐璁惧"
+ min-width="110"
sortable="custom"
/>
<el-table-column
@@ -151,13 +176,23 @@
label="璁惧鑺傛媿"
width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.eqp_value">{{ row.eqp_value }} <span style="margin-left: 2px">绉�</span></div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="stand_value"
label="鐢熶骇鑺傛媿"
width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.stand_value">{{ row.stand_value }} <span style="margin-left: 2px">绉�</span></div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="cavity_qty"
label="鍨嬭厰鏁�"
@@ -173,11 +208,17 @@
<el-table-column
label="鎿嶄綔"
+ 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 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)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -185,22 +226,21 @@
</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="getBeatRateSearch"
/>
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="70%"
- top="15vh"
+ width="1000px"
+ :top="isIpad?'5vh':'15vh'"
:close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
@@ -212,13 +252,16 @@
<el-select
v-show="operation==='add'"
v-model="dialogForm.partcode"
+ filterable
style="width: 220px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
+
@change="partDialogChange"
>
+ <!-- @focus="getPartSelect2"-->
<el-option
- v-for="item in partArr"
+ v-for="item in partArr2"
:key="item.partcode"
:label="item.partname"
:value="item.partcode"
@@ -236,6 +279,7 @@
v-show="operation==='add'"
v-model="dialogForm.routecode"
style="width: 220px"
+ filterable
:disabled="dialogForm.partcode===''"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
@@ -280,10 +324,13 @@
</div>
<el-table
+ ref="eqpDialogArrRef"
+ class="tableFixed"
:data="eqpDialogArr"
- height="400"
+ :height="tableHeight"
+ :style="{width: 100+'%',height:tableHeight-50+'px',}"
border
- stripe
+ :row-class-name="tableRowClassName"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -293,21 +340,25 @@
width="50"
label="搴忓彿"
prop="RowNum"
+ fixed
/>
<el-table-column
prop="eqpcode"
label="璁惧缂栫爜"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="eqpname"
label="璁惧鍚嶇О"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="wksp_name"
sortable="custom"
label="鐢熶骇杞﹂棿"
+ min-width="110"
/>
<el-table-column
sortable="custom"
@@ -375,6 +426,8 @@
</el-table-column>
<el-table-column
label="鎿嶄綔"
+ width="120"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -393,12 +446,13 @@
:page.sync="eqpTable.page"
:limit.sync="eqpTable.rows"
align="right"
- style="padding-top: 20px"
- layout="prev, pager, next,sizes"
+ style="padding-top: 20px;"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getEqpTable"
/>
</div>
+ <div v-if="eqpTableLength===0" style="width: 100px;height: 84px;" />
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -408,13 +462,21 @@
</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 { AddUpdateOrganization, DeleteOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import {
BeatRateSearch, DeleteBeatRate,
PartSelect,
@@ -423,33 +485,16 @@
StepSelectEqp,
StepSelectEqpList
} from '@/api/zzmx'
+import ImportPicker from '@/components/ImportPicker'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'JPGJ',
components: {
- Pagination
+ Pagination, ImportPicker
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -463,6 +508,7 @@
rows: 20 // 姣忛〉澶氬皯鏉�
},
partArr: [], // 浜у搧闆嗗悎
+ partArr2: [], // 浜у搧闆嗗悎瀵硅瘽妗�
routeArr: [], // 浜у搧闆嗗悎
stepArr: [], // 浜у搧闆嗗悎
eqpArr: [], // 浜у搧闆嗗悎
@@ -498,36 +544,44 @@
editRouteName: '', // 缂栬緫鏃跺伐鑹鸿矾绾垮悕绉�
editStepName: '', // 缂栬緫鏃跺姞宸ュ伐搴忓悕绉�
operation: '',
- dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- ],
- OrgCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
- ],
- OrgName: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- ],
- SupUnit: [
- { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
- ]
- }
+ dialogFormRules: {},
+ title_value: '鏁版嵁瀵煎叆 / 鑺傛媿宸ヤ环',
+ code: '24',
+ shows: false
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getBeatRateSearch()
+ }
}
},
created() {
- this.getBeatRateSearch()
- this.getPartSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
+ handleRequest() {
+ this.getBeatRateSearch().then(res => {
+ if (res.code === '200') {
+ this.getPartSelect()
+ }
+ })
+ },
+
async getBeatRateSearch() {
const res = await BeatRateSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -549,6 +603,10 @@
async getPartSelect() {
const { data: res } = await PartSelect()
this.partArr = res
+ },
+ async getPartSelect2() {
+ const { data: res } = await PartSelect()
+ this.partArr2 = res
},
async partChange(val) {
const { data: res } = await PartSelectRpute({ partcode: val })
@@ -578,27 +636,18 @@
},
async partDialogChange(val) {
const { data: res } = await PartSelectRpute({ partcode: val })
- console.log(this.routeDialogArr = res, 888)
+ this.routeDialogArr = res
this.stepDialogArr = []
this.eqpDialogArr = []
},
async routeDialogChange(val) {
const { data: res } = await RouteSelectStep({ routecode: val })
this.stepDialogArr = res
- // this.stepDialogArr = [
- // { code: '1001', name: '娴嬭瘯宸ュ簭1' },
- // { code: '1002', name: '娴嬭瘯宸ュ簭2' },
- // { code: '1003', name: '娴嬭瘯宸ュ簭3' },
- // { code: '1004', name: '娴嬭瘯宸ュ簭4' },
- // { code: '1005', name: '娴嬭瘯宸ュ簭5' },
- // { code: '1006', name: '娴嬭瘯宸ュ簭6' },
- // { code: '1007', name: '娴嬭瘯宸ュ簭7' },
- // { code: '1008', name: '娴嬭瘯宸ュ簭8' },
- // { code: '1009', name: '娴嬭瘯宸ュ簭9' }
- // ]
this.eqpDialogArr = []
},
radioChange(val) {
+ this.isEqpTableEdit = true
+
// this.dialogForm.stepcode = this.stepDialogArr.find(item => item.name === val).code
this.getEqpTable(val)
},
@@ -632,6 +681,7 @@
this.eqpDialogArr.forEach(item => {
item.isVisible = 0
})
+ this.$refs.tableDataRef.doLayout()
},
// 淇濆瓨琛�
async saveRow(row) {
@@ -646,7 +696,7 @@
cavity_qty: row.cavity_qty, // 鍨嬭厰鏁�
unprice: row.unprice// 璁′欢鍗曚环
}
- console.log(data, 7)
+
// row.isVisible = 0
const res = await SaveBeatRate(data)
if (res.code === '200') {
@@ -671,7 +721,6 @@
},
// 澶嶅埗琛�
async copyRow(row) {
- console.log(row)
let currentData = {}// 褰撳墠琛屽璞�
let nextData = {}// 涓嬩竴琛屽璞�
if (row.RowNum === this.eqpDialogArr.length) {
@@ -684,8 +733,6 @@
}
})
}
- console.log(currentData, 2)
- console.log(nextData, 3)
const newData = {
partcode: this.eqpTable.partcode, // 浜у搧缂栫爜
routecode: this.eqpTable.routecode, // 宸ヨ壓璺嚎缂栫爜
@@ -697,11 +744,12 @@
cavity_qty: currentData.cavity_qty, // 鍨嬭厰鏁�
unprice: currentData.unprice// 璁′欢鍗曚环
}
- console.log(newData, 4)
+
const res = await SaveBeatRate(newData)
if (res.code === '200') {
this.$message.success('澶嶅埗鎴愬姛锛�')
await this.getEqpTable()
+ this.isEqpTableEdit = true
}
},
// 璁惧鑺傛媿鍊兼敼鍙�
@@ -724,12 +772,12 @@
add(operation) {
this.operation = operation
this.dialogVisible = true
+ this.getPartSelect2()
},
// 淇敼鎸夐挳
async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
- console.log(row)
this.editPartName = row.partname
this.editRouteName = row.route_name
@@ -752,15 +800,17 @@
type: 'warning'
}).then(() => {
const data = {
- partcode: this.eqpTable.partcode,
- routecode: this.eqpTable.routecode,
- stepcode: this.eqpTable.stepcode,
+ partcode: row.partcode,
+ routecode: row.route_code,
+ stepcode: row.stepcode,
eqpcode: row.eqp_code
}
- console.log(data)
DeleteBeatRate(data).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getBeatRateSearch()
}
})
@@ -779,10 +829,12 @@
this.dialogForm.stand_value = ''
this.dialogForm.cavity_qty = ''
this.dialogForm.unprice = ''
+ this.eqpTableLength = 0
this.routeDialogArr = []
this.stepDialogArr = []
this.eqpDialogArr = []
this.$refs.dialogForm.clearValidate()
+ this.getBeatRateSearch()
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -810,42 +862,77 @@
// }
// })
// },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ },
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 195
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 40
+ }
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
}
}
}
</script>
+<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
+.el-button--text{
+ font-size: 14px;
+ cursor: pointer;
+}
+.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;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
+ //background-color: $main_color !important;
}
-::v-deep .el-button--primary:hover {
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
border: none;
}
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
}
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
+::v-deep .el-dialog__body {
+ padding: 20px 20px !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 {
@@ -853,106 +940,30 @@
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 20px !important;
-}
-
-::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-input__inner:focus {
- border-color: $main_color;
-}
-
::v-deep .el-table .caret-wrapper {
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-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;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
.body ::v-deep .el-divider {
@@ -964,25 +975,21 @@
.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;
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
}
+</style>
+<style>
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
+.el-table .custom-row {
+ background: #f8f8fa;
}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
-}
-
</style>
--
Gitblit v1.9.3