From f3335e01ea71614db9fa6aedf1d35e1202c3b12f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 八月 2022 15:46:26 +0800
Subject: [PATCH] 修改登陆时传PC参数
---
src/views/zzmx/gxdy.vue | 342 +++++++++++++++++++++++++++-----------------------------
1 files changed, 167 insertions(+), 175 deletions(-)
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index c1ff956..43564bf 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -1,7 +1,13 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+
+ <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>-->
+ </div>
+
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
@@ -17,7 +23,13 @@
<el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍚敤鐘舵��" style=" display: flex;">
- <el-select v-model="form.enable" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.enable"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in enableArr"
:key="item.code"
@@ -29,6 +41,7 @@
<el-form-item label="宸ュ簭绫诲瀷" style=" display: flex;">
<el-select
v-model="form.steptypecode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -51,19 +64,14 @@
</div>
</el-form>
</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
:data="tableData"
:height="tableHeight"
border
- stripe
- :style="{width: 100+'%',height:tableHeight+'px',}"
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:tableHeight+'px'}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -77,19 +85,23 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="stepcode"
label="宸ュ簭缂栫爜"
+ min-width="150"
sortable="custom"
/>
<el-table-column
prop="stepname"
+ min-width="150"
label="宸ュ簭鍚嶇О"
sortable="custom"
/>
<el-table-column
prop="flwtype"
+ min-width="150"
label="宸ュ簭绫诲瀷"
sortable="custom"
>
@@ -102,12 +114,14 @@
<el-table-column
prop="descr"
label="宸ュ簭鎻忚堪"
+ min-width="180"
sortable="custom"
/>
<el-table-column
prop="enable"
label="鍚敤鐘舵��"
sortable="custom"
+ width="110"
>
<template slot-scope="{row}">
<div v-if="row.enable==='Y'">鏄�</div>
@@ -117,38 +131,62 @@
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ width="110"
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ width="160"
sortable="custom"
/>
<el-table-column
label="鍏宠仈宸ヤ綔绔�"
+ prop="is_eqp"
+ width="110"
>
<template slot-scope="{row}">
<div class="operationClass">
- <i class="el-icon-share" @click="workClick(row)" />
+ <i v-if="row.is_eqp==='Y'" class="el-icon-share" @click="workClick(row)" />
+ <i
+ v-if="row.is_eqp==='N'"
+ class="el-icon-share"
+ style="color: rgb(180 ,181, 185)"
+ @click="workClick(row)"
+ />
</div>
</template>
</el-table-column>
<el-table-column
label="鍏宠仈缂洪櫡"
+ prop="is_defect"
+ width="110"
>
<template slot-scope="{row}">
<div class="operationClass">
- <i class="el-icon-share" @click="defectClick(row)" />
+ <i v-if="row.is_defect==='Y'" class="el-icon-share" @click="defectClick(row)" />
+ <i
+ v-if="row.is_defect==='N'"
+ class="el-icon-share"
+ style="color:rgb(180 ,181, 185);"
+ @click="defectClick(row)"
+ />
</div>
</template>
</el-table-column>
<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>
@@ -161,7 +199,7 @@
: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="getStepSearch"
/>
@@ -169,9 +207,9 @@
<!--鏂板淇敼瀵硅瘽妗�-->
<el-dialog
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
:close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@@ -179,30 +217,44 @@
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<el-form-item label="宸ュ簭缂栫爜" prop="stepcode">
- <el-input v-model="dialogForm.stepcode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.stepcode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="宸ュ簭鍚嶇О" prop="stepname">
- <el-input v-model="dialogForm.stepname" style="width: 220px" />
+ <el-input v-model="dialogForm.stepname" style="width: 200px" />
</el-form-item>
+
<el-form-item prop="steptypecode" label="宸ュ簭绫诲瀷">
- <el-select
+ <el-radio-group
v-model="dialogForm.steptypecode"
- style="width: 220px"
- placeholder="璇烽�夋嫨"
- :popper-append-to-body="false"
+ style="width: 200px"
>
- <el-option
+ <el-radio
v-for="item in steptypeArr"
:key="item.code"
- :label="item.name"
:value="item.code"
+ :label="item.name"
/>
- </el-select>
+ </el-radio-group>
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.steptypecode"-->
+ <!-- filterable-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in steptypeArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
</el-form-item>
<el-form-item prop="enable" label="鍚敤鐘舵��">
<el-select
v-model="dialogForm.enable"
- style="width: 220px"
+ filterable
+ style="width: 200px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
>
@@ -215,7 +267,7 @@
</el-select>
</el-form-item>
<el-form-item label="宸ュ簭鎻忚堪" prop="description">
- <el-input v-model="dialogForm.description" type="textarea" style="width: 220px" />
+ <el-input v-model="dialogForm.description" type="textarea" style="width: 200px" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -231,7 +283,7 @@
title="鍏宠仈宸ヤ綔绔�"
:visible.sync="workDialogVisible"
width="50%"
- top="15vh"
+ :top="isIpad?'5vh': '15vh'"
:close-on-click-modal="false"
class="workDialogVisible"
@closed="workHandleClose"
@@ -278,6 +330,7 @@
:data="workDialogForm.workTreeArr"
show-checkbox
node-key="code"
+ style="height: 280px;"
default-expand-all
:props="workTreeDefaultProps"
@check="checkBoxClick"
@@ -298,7 +351,7 @@
title="宸ュ簭鍏宠仈缂洪櫡"
:visible.sync="defectDialogVisible"
width="50%"
- top="15vh"
+ :top="isIpad?'5vh':'15vh'"
:close-on-click-modal="false"
class="defectDialogVisible"
@closed="defectHandleClose"
@@ -340,8 +393,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import {
AddUpdateStep,
DeleteStep, SaveStepAssociationDefect,
@@ -354,7 +405,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'GXDY',
components: {
Pagination
},
@@ -371,6 +422,7 @@
}
}
return {
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -390,8 +442,8 @@
],
steptypeArr: [
{ code: 'Z', name: '鑷埗' },
- { code: 'W', name: '澶栧崗' },
- { code: 'Z;W', name: '鑷埗锛涘鍗�' }
+ { code: 'W', name: '澶栧崗' }
+ // { code: 'Z;W', name: '鑷埗锛涘鍗�' }
],
total: 10,
tableData: [],
@@ -400,8 +452,8 @@
'id': '',
'stepcode': '',
'stepname': '',
- 'steptypecode': '',
- 'enable': '',
+ 'steptypecode': '鑷埗',
+ 'enable': 'Y',
'description': '',
'OperType': ''
},
@@ -450,6 +502,9 @@
this.getHeight()
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
async getStepSearch() {
const res = await StepSearch(this.form)
this.tableData = res.data
@@ -499,7 +554,7 @@
this.dialogForm.id = row.id
this.dialogForm.stepcode = row.stepcode
this.dialogForm.stepname = row.stepname
- this.dialogForm.steptypecode = row.flwtype
+ this.dialogForm.steptypecode = this.steptypeArr.find(item => item.code === row.flwtype).name
this.dialogForm.description = row.descr
this.dialogForm.enable = row.enable
})
@@ -525,8 +580,8 @@
handleClose() {
this.dialogForm.stepcode = ''
this.dialogForm.stepname = ''
- this.dialogForm.steptypecode = ''
- this.dialogForm.enable = ''
+ this.dialogForm.steptypecode = '鑷埗'
+ this.dialogForm.enable = 'Y'
this.dialogForm.description = ''
this.$refs.dialogForm.clearValidate()
},
@@ -542,7 +597,7 @@
id: this.dialogForm.id,
stepcode: this.dialogForm.stepcode,
stepname: this.dialogForm.stepname,
- steptypecode: this.dialogForm.steptypecode,
+ steptypecode: this.steptypeArr.find(item => item.name === this.dialogForm.steptypecode).code,
enable: this.dialogForm.enable,
description: this.dialogForm.description,
OperType: this.operation === 'add' ? 'Add' : 'Update'
@@ -562,8 +617,13 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ // this.mainHeight = window.innerHeight - 250
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 40
+ }
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
},
/* 鍏宠仈宸ヤ綔绔欐ā鍧�*/
@@ -794,7 +854,7 @@
console.log('3.绗笁绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓嶄负闆�')
console.log(obj.code, 12)
this.workDialogForm.workGatherArr.forEach((item, index) => {
- if (item.code === obj.code) {
+ if (item.code === checkedFatherCode) {
this.workDialogForm.workGatherArr[index].isSelected2 = true
this.workDialogForm.workCodeSelectedGatherArr.push(obj.code)
this.$nextTick(() => {
@@ -851,6 +911,7 @@
const res = await SaveStepAssociationEqp(this.workDialogForm.stepcode, data)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getStepSearch()
this.workDialogVisible = false
}
},
@@ -885,7 +946,7 @@
this.defectDialogVisible = false
},
// 纭
- async defectDialogVisibleConfirm() {
+ async defectDialogVisibleConfirm() {
const nodeKey = this.$refs.defectTree.getCheckedKeys()
const data = []
this.defectTree[0].children.forEach(item => {
@@ -897,77 +958,17 @@
const res = await SaveStepAssociationDefect(this.defectTreeCode, data)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getStepSearch()
this.defectDialogVisible = false
}
}
}
}
</script>
-
<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 {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
-}
-
-::v-deep .el-dialog__footer {
- display: flex;
- 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;
-}
-
-.defectDialogVisible {
- ::v-deep .el-dialog__body {
- padding: 20px 20px !important;
- }
-}
.workDialogVisible {
- ::v-deep .el-dialog__body {
- padding: 20px 20px !important;
- }
-
.myCheckboxGroup {
display: flex;
flex-wrap: wrap;
@@ -1021,27 +1022,60 @@
}
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
+</style>
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
}
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
+.el-icon-edit-outline {
+ margin-right: 15px;
}
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
+::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: 30px;
- line-height: 30px;
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
}
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .workDialogVisible .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .defectDialogVisible .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
::v-deep .el-table .caret-wrapper {
@@ -1049,57 +1083,25 @@
}
::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 {
@@ -1112,24 +1114,14 @@
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;
-}
+</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