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/zlgl/gxjy.vue | 361 ++++++++++++++++++++++++++++----------------------
1 files changed, 202 insertions(+), 159 deletions(-)
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index 09ff2c6..fccc514 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -1,12 +1,15 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="margin-left: 10px;margin-top:10px;display: flex;flex-direction: column">
+ <div style="padding-top: 10px;display: flex;flex-direction: column">
<div style="margin-bottom: 15px;font-size: 14px">
<i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
</div>
<div style="display: flex;align-items: center">
- <div style="width: 90px;display: flex"><div style="color: red;width:10px">*</div>鎵弿鏉＄爜锛�</div>
+ <div style="width: 90px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 鎵弿鏉＄爜锛�
+ </div>
<el-input
v-model="form.orderstepqrcode"
name="GXproduceCode"
@@ -15,8 +18,8 @@
/>
</div>
<!-- 鍏」淇℃伅 -->
- <div style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
- <div style="display: flex;">
+ <div v-if="!isIpad" style="background:#f8f8fa ;display:flex;margin-top: 10px;align-items: center; line-height: 50px">
+ <div style="display: flex; margin-left: 10px">
<div style="display: flex;margin-right: 50px">
<div style="width: 90px">宸ュ崟缂栫爜锛�</div>
<div style="width: 200px">{{ form.wo_code }}</div>
@@ -39,19 +42,57 @@
<div style=" display: flex;margin-left: 30px;">
<div style="display: flex;margin-right: 50px">
<div style="width: 90px">宸ュ簭缂栫爜锛�</div>
- <div>{{ form.stepcode }}</div>
+ <div style="width: 100px">{{ form.stepcode }}</div>
</div>
<div style="display: flex;">
<div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
- <div>{{ form.stepname }}</div>
+ <div style="width: 100px">{{ form.stepname }}</div>
</div>
</div>
</div>
+ <div
+ v-if="isIpad"
+ style="display:flex;margin-top: 10px;align-items: center;line-height: 30px; flex-direction: column"
+ >
+ <div style="display: flex; justify-content: flex-start;width: 100%">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.wo_code }}</div>
+ </div>
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">浜у搧缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.partcode }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧鍚嶇О锛�</div>
+ <div style="width: 200px">{{ form.partname }}</div>
+ </div>
+ </div>
+
+ <div style=" display: flex; justify-content: flex-start;margin-top: 10px;width: 100%">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">浜у搧瑙勬牸锛�</div>
+ <div style="width: 200px">{{ form.partspec }}</div>
+ </div>
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.stepcode }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
+ <div style="width: 200px">{{ form.stepname }}</div>
+ </div>
+ </div>
+ </div>
+
<div style="margin: 15px 0;font-size: 14px">
<i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
</div>
<div style="display: flex;align-items: center">
- <div style="width: 90px;display: flex"><div style="color: red;width:10px">*</div>妫�楠屾爣鍑嗭細</div>
+ <div style="width: 90px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠屾爣鍑嗭細
+ </div>
<el-select
v-model="checkStandard"
style="width: 200px;"
@@ -66,7 +107,10 @@
:value="item.code"
/>
</el-select>
- <div style="width: 90px;margin-left: 50px;display: flex"><div style="color: red;width:10px">*</div>妫�楠屼汉鍛橈細</div>
+ <div style="width: 90px;margin-left: 50px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠屼汉鍛橈細
+ </div>
<el-select
v-model="checkUser"
style="width: 200px;"
@@ -91,19 +135,21 @@
<el-table
ref="multipleTable"
:data="JYTableData"
- :height="(tableHeight-195)+'px'"
+ :height="tableHeight+'px'"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@selection-change="handleSelectionChange"
+ @cell-dblclick="cellDblclick"
>
<el-table-column
type="index"
label="搴忓彿"
width="100"
+ fixed
/>
<!-- <el-table-column-->
<!-- prop="code"-->
@@ -141,9 +187,18 @@
prop="stepcheckitem_desc"
label="妫�楠屾爣鍑嗘弿杩�"
>
- <template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.stepcheckitem_desc" placeholder="璇疯緭鍏�" />
- <div v-else> {{ row.stepcheckitem_desc }}</div>
+ <template slot-scope="scope">
+ <el-input
+ v-if="scope.row.isVisible===1||scope.row.index === tabClickIndex && tabClickLabel === '妫�楠屾爣鍑嗘弿杩�'"
+ v-model="scope.row.stepcheckitem_desc"
+ placeholder="璇疯緭鍏�"
+ @keyup.enter.native="val=>keyUpEnterNative(val,scope.row)"
+ />
+ <div
+ v-else
+ > {{ scope.row.stepcheckitem_desc }}
+ </div>
+
</template>
</el-table-column>
@@ -202,7 +257,10 @@
<div style="display: flex;margin-top: 20px;align-items: center">
<div style="display: flex;margin-right: 50px;align-items: center">
- <div style="width: 90px;display: flex"><div style="color: red;width:10px">*</div>妫�楠岀粨鏋滐細</div>
+ <div style="width: 90px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠岀粨鏋滐細
+ </div>
<el-select
v-model="checkResult"
style="width: 200px;"
@@ -242,7 +300,6 @@
// const SER_HZ = /^[\u4e00-\u9fa5]+$/
import $ from 'jquery'
import {
- DeleteStepCheckStaned,
MesOrderStepCheckItemList,
MesOrderStepCheckSearch,
MesOrderStepCheckSelect, SaveMesOrderStepCheckItem,
@@ -257,6 +314,7 @@
// },
data() {
return {
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: { // 宸ュ簭
@@ -283,13 +341,14 @@
JYTableData: [], // 妫�楠岄」淇℃伅琛ㄦ牸
JYSelectArr: [], // 妫�楠屼笅鎷夋暟缁�
JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
- multipleSelection: []// 琛ㄦ牸澶氶�夋
+ multipleSelection: [], // 琛ㄦ牸澶氶�夋
+ tabClickIndex: null, // 鐐瑰嚮鐨勫崟鍏冩牸
+ tabClickLabel: '', // 褰撳墠鐐瑰嚮鐨勫垪鍚�
+ isCancel: false// 鏄惁鐐瑰嚮鍙栨秷鎸夐挳
}
},
created() {
- this.getMesOrderStepCheckSelect()
- this.getMesOrderSelectUser()
- this.getJYSelectArr()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -298,6 +357,15 @@
this.getFocus()
},
methods: {
+ handleRequest() {
+ this.getMesOrderStepCheckSelect().then(res => {
+ if (res.code === '200') {
+ this.getMesOrderSelectUser()
+ this.getJYSelectArr()
+ }
+ })
+ },
+
// 鑾峰彇鑱氱劍
getFocus() {
this.$nextTick(() => {
@@ -306,8 +374,9 @@
},
// 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋暟缁�
async getMesOrderStepCheckSelect() {
- const { data: res } = await MesOrderStepCheckSelect()
- this.checkStandardSelect = res
+ const res = await MesOrderStepCheckSelect()
+ this.checkStandardSelect = res.data
+ return { code: res.code }
},
// 鑾峰彇妫�楠屼汉鍛樹笅鎷�
async getMesOrderSelectUser() {
@@ -321,6 +390,7 @@
},
// 妫�楠屾爣鍑嗕笅鎷夊�兼敼鍙�
async changeCheckStandard(val) {
+ this.isCancel = false
this.JYSelectedArr = []
const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: val })
this.JYTableData = res
@@ -330,12 +400,13 @@
number = number === 0 ? (10 + Math.random()) : number
// item.result = 0 // 0鍚堟牸 1涓嶈壇
- item.result = 'NG'
+ item.result = 'OK'
item.isVisible = 0
item.number = number
this.JYSelectedArr.push(item.code)
})
+ this.$refs.multipleTable.toggleAllSelection()
},
// changeRadioValue(val, row) {
// console.log(val, row.result, 20000)
@@ -354,13 +425,13 @@
it.result = 'NG'
}
})
- if (this.multipleSelection.length > 0) {
- if (this.multipleSelection.length === this.JYTableData.length) {
- this.checkResult = 'OK'
- } else {
- this.checkResult = 'NG'
- }
+
+ if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
+ this.checkResult = 'OK'
} else {
+ this.checkResult = 'NG'
+ }
+ if (this.isCancel) {
this.checkResult = ''
}
},
@@ -390,8 +461,9 @@
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
- const data = { result: 'NG', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
+ const data = { result: 'OK', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
this.JYTableData.push(data)
+ this.$refs.multipleTable.toggleRowSelection(data, true)
},
// 纭
@@ -415,14 +487,10 @@
}
})
- if (this.multipleSelection.length > 0) {
- if (this.multipleSelection.length === this.JYTableData.length) {
- this.checkResult = 'OK'
- } else {
- this.checkResult = 'NG'
- }
+ if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
+ this.checkResult = 'OK'
} else {
- this.checkResult = ''
+ this.checkResult = 'NG'
}
},
// 鍙栨秷
@@ -439,6 +507,7 @@
}
})
},
+
// 鍒犻櫎
del(row) {
this.JYTableData.forEach((item, index) => {
@@ -518,6 +587,7 @@
clearContent() {
this.JYTableData = []
this.multipleSelection = []
+ this.JYSelectedArr = []
this.checkdescr = ''
this.checkUser = ''
this.checkResult = ''
@@ -529,12 +599,45 @@
this.form.partspec = ''
this.form.stepcode = ''
this.form.stepname = ''
+
+ this.isCancel = true
+ },
+
+ // 鍗曞厓鏍艰鐐瑰嚮鏃�
+ cellDblclick(row, column, cell, event) {
+ console.log(row, column, cell, event)
+ console.log(column.label)
+ console.log(row.index)
+ switch (column.label) {
+ case '妫�楠屾爣鍑嗘弿杩�':
+ this.tabClickIndex = row.index
+ this.tabClickLabel = column.label
+ break
+ // case '鍒よ矗閲戦(鍏�)':
+ // this.tabClickIndex = row.index
+ // this.tabClickLabel = column.label
+ // break
+ default:
+ return
+ }
+ },
+ // 鍥炶溅浜嬩欢
+ keyUpEnterNative(val, row) {
+ this.tabClickLabel = ''
+ },
+
+ tableRowClassName({ row, rowIndex }) {
+ // 鎶婃瘡涓�琛岀殑绱㈠紩鏀捐繘row
+ row.index = rowIndex
+ return 'custom-row'
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 450
+
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
}
}
@@ -542,30 +645,61 @@
</script>
<style lang="scss" scoped>
+::v-deep .el-select .el-input .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+</style>
+<!--鍏叡椤甸潰鏍峰紡-->
+<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 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 {
@@ -573,106 +707,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 100px !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 {
@@ -685,29 +743,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;
-}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select .el-input .el-select__caret {
- display: flex;
- align-items: center;
- justify-content: center;
+.el-table .custom-row {
+ background: #f8f8fa;
}
</style>
--
Gitblit v1.9.3