From d33eacc1f85ac3a736b33ba4713a19aae466d711 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 05 八月 2022 16:42:53 +0800
Subject: [PATCH] 1.做适应平板显示的内容大小
---
src/views/zlgl/gxjy.vue | 141 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 113 insertions(+), 28 deletions(-)
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index 09ff2c6..70b27a2 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -15,7 +15,7 @@
/>
</div>
<!-- 鍏」淇℃伅 -->
- <div style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
+ <div v-if="!isIpad" style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
<div style="display: flex;">
<div style="display: flex;margin-right: 50px">
<div style="width: 90px">宸ュ崟缂栫爜锛�</div>
@@ -39,14 +39,46 @@
<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>
@@ -98,7 +130,9 @@
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ :row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"
+ @cell-dblclick="cellDblclick"
>
<el-table-column
type="index"
@@ -141,9 +175,17 @@
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>
@@ -242,7 +284,6 @@
// const SER_HZ = /^[\u4e00-\u9fa5]+$/
import $ from 'jquery'
import {
- DeleteStepCheckStaned,
MesOrderStepCheckItemList,
MesOrderStepCheckSearch,
MesOrderStepCheckSelect, SaveMesOrderStepCheckItem,
@@ -257,6 +298,7 @@
// },
data() {
return {
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: { // 宸ュ簭
@@ -283,13 +325,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 +341,15 @@
this.getFocus()
},
methods: {
+ handleRequest() {
+ this.getMesOrderStepCheckSelect().then(res => {
+ if (res.code === '200') {
+ this.getMesOrderSelectUser()
+ this.getJYSelectArr()
+ }
+ })
+ },
+
// 鑾峰彇鑱氱劍
getFocus() {
this.$nextTick(() => {
@@ -306,8 +358,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 +374,7 @@
},
// 妫�楠屾爣鍑嗕笅鎷夊�兼敼鍙�
async changeCheckStandard(val) {
+ this.isCancel = false
this.JYSelectedArr = []
const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: val })
this.JYTableData = res
@@ -330,12 +384,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 +409,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 +445,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 +471,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 +491,7 @@
}
})
},
+
// 鍒犻櫎
del(row) {
this.JYTableData.forEach((item, index) => {
@@ -518,6 +571,7 @@
clearContent() {
this.JYTableData = []
this.multipleSelection = []
+ this.JYSelectedArr = []
this.checkdescr = ''
this.checkUser = ''
this.checkResult = ''
@@ -529,12 +583,43 @@
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
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+
+ this.isIpad = window.innerHeight < 769
})
}
}
--
Gitblit v1.9.3