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/scgl/gd.vue | 384 ++++++++++++++++++++++++++++--------------------------
1 files changed, 202 insertions(+), 182 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 1c12268..df43f3c 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -1,7 +1,14 @@
<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-connection" @click="send('send')">娲惧彂</el-button>
+ <el-button icon="el-icon-switch-button" @click="orderClose">宸ュ崟鍏抽棴</el-button>
+ </div>
+
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
@@ -65,7 +72,7 @@
type="date"
size="mini"
:clearable="false"
- style="width: 200px;"
+ class="dateMini"
format="yyyy-MM-dd"
placeholder="閫夋嫨鏃ユ湡"
/>
@@ -76,12 +83,12 @@
<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>
- <!-- <div v-if="!isFullscreen" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
+ <!-- <div v-if="!isIpad" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
<!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
<!-- <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>-->
<!-- <el-button type="primary" icon="el-icon-switch-button">璁㈠崟鍏抽棴</el-button>-->
<!-- </div>-->
- <!-- <div v-if="isFullscreen" style="display: flex;flex-direction: column;align-items: end">-->
+ <!-- <div v-if="isIpad" style="display: flex;flex-direction: column;align-items: end">-->
<!-- <div style="display: flex;margin: 10px 0">-->
<!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
<!-- <el-button type="primary" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>-->
@@ -92,19 +99,13 @@
</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-connection" @click="send('send')">娲惧彂</el-button>
- <el-button type="primary" icon="el-icon-switch-button" @click="orderClose">宸ュ崟鍏抽棴</el-button>
- </div>
- <el-divider />
+
<div class="elTableDiv">
<el-table
:data="tableData"
:height="tableHeight+'px'"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -235,8 +236,12 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="check(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-tickets" style="cursor: pointer;color: #42b983;margin-right: 15px" @click="check(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>
@@ -249,7 +254,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="getMesOrderSearch"
/>
@@ -432,7 +437,7 @@
<el-table
:data="searchTableData"
border
- stripe
+ :row-class-name="tableRowClassName"
height="300"
style="width: 100%;"
highlight-current-row
@@ -443,6 +448,7 @@
prop="seq"
label="搴忓彿"
width="50"
+ fixed
/>
<el-table-column
prop="stepcode"
@@ -464,6 +470,7 @@
<el-table-column
prop="descr"
label="宸ュ簭鎻忚堪"
+ fixed="right"
/>
</el-table>
</el-dialog>
@@ -495,7 +502,7 @@
<el-table
:data="taskTableData"
border
- stripe
+ :row-class-name="tableRowClassName"
height="300"
style="width: 100%;"
highlight-current-row
@@ -506,6 +513,7 @@
prop="seq"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="wo_code"
@@ -544,6 +552,7 @@
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ fixed="right"
/>
</el-table>
@@ -569,7 +578,7 @@
<div id="printMe" style="padding: 30px">
<div style="font-size: 26px; text-align: center">娴佺▼鍗�</div>
- <div style="display: flex;justify-content: space-around;margin-top: 20px">
+ <div style="display: flex;justify-content: space-around;margin-top: 20px; position: relative;">
<div style="width: 78%">
<el-form
ref="formApprove"
@@ -606,10 +615,18 @@
</div>
</el-form>
</div>
- <div style="width: 22%;display: flex;justify-content: center;align-items: center">
- <!-- <div :id="'qrCode'+0" :ref="'qrCodeDiv'+0" />-->
- <div />
+ <div
+ id="qrCode"
+ style="width: 22%;height:97px;
+ margin-top: 20px;
+ overflow-y: scroll;display: flex;
+ justify-content: center;
+ position: relative;"
+ >
+ <!-- <div id="qrCode0" ref="qrCodeDiv0" />-->
</div>
+ <div style="background-color: #fff;width: 20px;height:120px; position: absolute;right: 0" />
+ <div style="z-index: 10;background-color:transparent;width: 120px;height:120px; position: absolute;right: 21px" />
</div>
<!-- <div style="width:100%;height: 30px;border-bottom: 1px solid #eee;margin-bottom: 20px" />-->
@@ -724,7 +741,7 @@
}
}
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
username: '',
@@ -852,8 +869,7 @@
}
},
created() {
- this.getMesOrderSearch()
- this.getSelect()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -863,6 +879,16 @@
this.username = getCookie('username')
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
+ handleRequest() {
+ this.getMesOrderSearch().then(res => {
+ if (res.code === '200') {
+ this.getSelect()
+ }
+ })
+ },
async getMesOrderSearch() {
// let tempDate = this.form.createdate
// if (tempDate.length > 0) {
@@ -887,6 +913,7 @@
this.total = res.count
// this.form.createdate = tempDate
+ return { code: res.code }
},
async getSelect() {
// 鑾峰彇浜у搧淇℃伅
@@ -1171,12 +1198,12 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
- if (this.isFullscreen) {
- this.tableHeight = this.tableHeight - 50
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 260
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 20
}
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
},
// 宸ヨ壓璺嚎鏀惧ぇ闀滅偣鍑�
@@ -1215,10 +1242,15 @@
this.formApprove.lm_date = res3[0].lm_date
this.$nextTick(() => {
- // this.bindQRCode(0, this.formApprove.mesordercode, 'big')
res3.forEach(i => {
this.bindQRCode(i.seq, i.stepqrcode, 'small')
})
+ // this.bindQRCode('0', this.formApprove.mesordercode, 'big')
+
+ const div = document.getElementById('qrCode')
+ // 杩欎箞澶氫唬鐮佸彧闇�瑕佽繖涓�鍙ュ疄鐜版垜浠墍闇�瑕佺殑鍔熻兘锛屽畾浣峝iv婊氬姩鏉′綅缃湪搴曢儴锛宻crollHeight璁＄畻鍑篸iv鐨勯珮搴︼紝鍐峴crollTop 璁剧疆婊氬姩鏉＄殑楂樺害涓哄灏�
+ // div.scrollTop = div.scrollHeight // 婊氬姩鏉′綅浜庢渶搴曢儴
+ div.scrollTop = 0 // 婊氬姩鏉′綅浜庢渶椤堕儴
})
}
})
@@ -1251,15 +1283,28 @@
// },
// 鐢熸垚浜岀淮鐮�
bindQRCode(seq, text, size) {
- new QRCode(this.$refs['qrCodeDiv' + seq], {
- text: text,
- width: size === 'big' ? 90 : 60,
- height: size === 'big' ? 90 : 60,
- // colorDark: '#333333', // 浜岀淮鐮侀鑹�
- colorDark: '#000', // 浜岀淮鐮侀鑹�
- colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
- correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
- })
+ if (size === 'big') {
+ console.log(text, 1)
+ new QRCode(this.$refs.qrCodeDiv0, {
+ text: text,
+ width: size === 'big' ? 90 : 60,
+ height: size === 'big' ? 90 : 60,
+ // colorDark: '#333333', // 浜岀淮鐮侀鑹�
+ colorDark: '#000', // 浜岀淮鐮侀鑹�
+ colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
+ correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
+ })
+ } else {
+ new QRCode(this.$refs['qrCodeDiv' + seq], {
+ text: text,
+ width: size === 'big' ? 90 : 60,
+ height: size === 'big' ? 90 : 60,
+ // colorDark: '#333333', // 浜岀淮鐮侀鑹�
+ colorDark: '#000', // 浜岀淮鐮侀鑹�
+ colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
+ correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
+ })
+ }
},
dialogVisibleConfirmClose() {
@@ -1271,19 +1316,9 @@
this.formApprove.plan_qty = ''
this.formApprove.routename = ''
this.formApprove.lm_date = ''
- // this.$refs.qrCodeDiv0 = ''
- // this.$refs.qrCodeDiv1 = ''
- // this.$refs.qrCodeDiv2 = ''
- // this.$refs.qrCodeDiv3 = ''
- // // this.$ref['qrCodeDiv'].clearable()
- // this.tableDataPrint.forEach((item, index) => {
- // this.$ref[('qrCodeDiv' + index).toString()] = ''
- // // this.bindQRCode(item.seq, '')
- // })
- // // this.bindQRCode(this.tableDataPrint.length, '')
- // this.$ref[('qrCodeDiv' + this.tableDataPrint.length).toString()] = ''
- // // this.bindQRCode()
+ // this.$refs.qrCodeDiv0.title = ''
+
this.tableDataPrint = []
},
// 琛ユ墦鎸夐挳
@@ -1298,53 +1333,10 @@
<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;
+.el-date-editor{
+ font-size: 14px;
}
-
-::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;
}
@@ -1357,37 +1349,8 @@
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 {
@@ -1403,45 +1366,8 @@
align-items: center;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
-}
-
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::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;
-}
-
-.body ::v-deep .el-divider {
- border: 1px solid #eee;
- width: 99%;
- margin: 10px auto;
}
.body ::v-deep .el-form-item {
@@ -1450,26 +1376,6 @@
.elForm ::v-deep .el-form-item {
margin-bottom: 0;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
-}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
}
.elTableDiv {
@@ -1511,3 +1417,117 @@
color: #000 !important;
}
</style>
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+.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 {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.dateMini {
+ ::v-deep .el-input__inner {
+ line-height: 34px;
+ height: 34px;
+ width: 200px;
+ display: flex;
+ font-size: 14px !important;
+ align-items: center !important;
+ }
+
+ ::v-deep .el-input__prefix{
+ margin-top: -3px;
+ }
+ //::v-deep .el-range__icon{
+ // line-height: 28px;
+ //}
+}
+
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
--
Gitblit v1.9.3