From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/zzmx/jpgj.vue | 139 ++++++++++++++++++++++++++++++++++------------
1 files changed, 102 insertions(+), 37 deletions(-)
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 90f6db1..a3d51ed 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -3,17 +3,17 @@
<div class="body" :style="{height:mainHeight+'px'}">
<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>
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button v-waves 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"
+ style="display: flex;"
>
<div class="elForm">
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
@@ -88,15 +88,20 @@
</el-select>
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
- <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 class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ />
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight"
border
@@ -120,12 +125,14 @@
<el-table-column
prop="partcode"
min-width="160"
+ show-tooltip-when-overflow
label="浜у搧缂栫爜"
sortable="custom"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
+ show-tooltip-when-overflow
min-width="160"
sortable="custom"
/>
@@ -134,6 +141,7 @@
label="浜у搧瑙勬牸"
min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.partspec">{{ row.partspec }}</div>
@@ -145,28 +153,33 @@
label="鐢熶骇杞﹂棿"
min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<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"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="eqp_name"
label="鍔犲伐璁惧"
+ show-tooltip-when-overflow
min-width="110"
sortable="custom"
/>
<el-table-column
prop="eqp_value"
label="璁惧鑺傛媿"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
>
@@ -179,6 +192,7 @@
prop="stand_value"
label="鐢熶骇鑺傛媿"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -189,6 +203,7 @@
<el-table-column
prop="cavity_qty"
label="鍨嬭厰鏁�"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
/>
@@ -196,6 +211,7 @@
prop="unprice"
width="110"
label="璁′欢鍗曚环"
+ show-tooltip-when-overflow
sortable="custom"
/>
@@ -207,10 +223,10 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i :style="{color:$store.state.settings.theme}" 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)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
</template>
@@ -230,6 +246,7 @@
</div>
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
width="1000px"
@@ -240,7 +257,7 @@
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<div style="display: flex;align-items: center">
- <i class="el-icon-s-comment" style="color:#42b983;margin-top: -20px" />
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" style="margin-top: -20px" />
<el-form-item prop="partcode" label="浜у搧鍚嶇О">
<el-select
v-show="operation==='add'"
@@ -249,7 +266,6 @@
style="width: 220px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
-
@change="partDialogChange"
>
<!-- @focus="getPartSelect2"-->
@@ -296,7 +312,7 @@
</el-form>
<div style="display: flex;flex-direction: column;margin-bottom: 20px">
<div>
- <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />宸ュ簭闆嗗悎
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />宸ュ簭闆嗗悎
</div>
<div style="display: flex;background-color: #F2F6FC;padding:20px 0 20px 20px; min-height: 100px">
<el-radio-group v-model="dialogForm.stepcode" @change="radioChange">
@@ -313,20 +329,24 @@
<div style="display: flex;flex-direction: column;min-height: 300px">
<div>
- <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />璁惧鍒楄〃
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin: -20px 10px 20px 0" />璁惧鍒楄〃
</div>
<el-table
+ ref="eqpDialogArrRef"
+ :key="tableTimeStampKey"
+ class="tableFixed"
:data="eqpDialogArr"
:height="tableHeight"
- :style="{width: 100+'%',height:tableHeight-50+'px',}"
+ :style="{width: 100+'%',height:tableHeight-50+'px'}"
border
:row-class-name="tableRowClassName"
- highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ highlight-current-row
@sort-change="dialogSortChange"
>
+ <!-- @row-click="rowClick"-->
<el-table-column
width="50"
label="搴忓彿"
@@ -337,24 +357,28 @@
prop="eqpcode"
label="璁惧缂栫爜"
sortable="custom"
+ show-tooltip-when-overflow
min-width="110"
/>
<el-table-column
prop="eqpname"
label="璁惧鍚嶇О"
min-width="110"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="wksp_name"
sortable="custom"
label="鐢熶骇杞﹂棿"
+ show-tooltip-when-overflow
min-width="110"
/>
<el-table-column
sortable="custom"
prop="eqp_value"
label="璁惧鑺傛媿"
+ show-tooltip-when-overflow
width="110"
>
<template slot-scope="{row}">
@@ -422,10 +446,10 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===1" type="text" @click="saveRow(row)">淇濆瓨</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="cancelRow(row)">鍙栨秷</el-button>
- <el-button v-if="row.isVisible===0" type="text" @click="editRow(row)">缂栬緫</el-button>
- <el-button v-if="row.isVisible===0" type="text" @click="copyRow(row)">澶嶅埗</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveRow(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelRow(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="editRow(row)">缂栬緫</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="copyRow(row)">澶嶅埗</el-button>
</div>
</template>
</el-table-column>
@@ -447,9 +471,9 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">杩� 鍥�</el-button>
- <!-- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
- <!-- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="dialogVisibleCancel">杩� 鍥�</el-button>
+ <!-- <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
+ <!-- <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
@@ -477,12 +501,15 @@
StepSelectEqpList
} from '@/api/zzmx'
import ImportPicker from '@/components/ImportPicker'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'JPGJ',
components: {
Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
data() {
return {
isIpad: false,
@@ -536,6 +563,9 @@
editStepName: '', // 缂栬緫鏃跺姞宸ュ伐搴忓悕绉�
operation: '',
dialogFormRules: {},
+ radioChangeTempValue: '',
+
+ tableTimeStampKey: new Date().getTime(),
title_value: '鏁版嵁瀵煎叆 / 鑺傛媿宸ヤ环',
code: '24',
@@ -630,15 +660,18 @@
this.routeDialogArr = res
this.stepDialogArr = []
this.eqpDialogArr = []
+ this.dialogForm.routecode = ''
},
async routeDialogChange(val) {
const { data: res } = await RouteSelectStep({ routecode: val })
this.stepDialogArr = res
this.eqpDialogArr = []
+ this.radioChangeTempValue = ''
},
radioChange(val) {
this.isEqpTableEdit = true
+ this.radioChangeTempValue = val
// this.dialogForm.stepcode = this.stepDialogArr.find(item => item.name === val).code
this.getEqpTable(val)
},
@@ -659,12 +692,14 @@
this.eqpTable.partcode = this.dialogForm.partcode
this.eqpTable.routecode = this.dialogForm.routecode
this.eqpTable.stepcode = this.stepDialogArr.find(item => item.name === val).code
- } else if (typeof val === 'number') {
+ // } else if (typeof val === 'number') {
+ } else {
this.eqpTable.partcode = this.dialogForm.partcode
this.eqpTable.routecode = this.dialogForm.routecode
this.eqpTable.stepcode = this.stepDialogArr[0].code
this.dialogForm.stepcode = this.stepDialogArr[0].name
}
+
const res = await StepSelectEqpList(this.eqpTable)
this.eqpDialogArr = res.data
this.eqpTableLength = res.count
@@ -672,6 +707,7 @@
this.eqpDialogArr.forEach(item => {
item.isVisible = 0
})
+ this.$refs.tableDataRef.doLayout()
},
// 淇濆瓨琛�
async saveRow(row) {
@@ -692,25 +728,43 @@
if (res.code === '200') {
this.isEqpTableEdit = true
this.$message.success('淇濆瓨鎴愬姛锛�')
- await this.getEqpTable()
+ this.radioChange(this.radioChangeTempValue)
}
},
// 鍙栨秷琛�
cancelRow(row) {
this.getEqpTable()
+
+ this.radioChange(this.radioChangeTempValue)
+ this.dialogForm.stepcode = this.radioChangeTempValue
+
this.isEqpTableEdit = true
},
// 缂栬緫琛�
editRow(row) {
if (this.isEqpTableEdit) {
row.isVisible = 1
+ let temp = {}
+ this.eqpDialogArr.forEach((item, index) => {
+ if (row.eqpcode === item.eqpcode) {
+ temp = item
+ this.eqpDialogArr.splice(index, 1, temp)
+ this.eqpDialogArr[index].isVisible = 1
+ }
+ })
this.isEqpTableEdit = false
+ this.tableTimeStampKey = new Date().getTime()
} else {
return this.$message.info('鍙兘涓�琛屼竴琛屼慨鏀癸紒')
}
},
+ // rowClick(row, column, event) {
+ // console.log(row, column, event, 3)
+ // console.log(this.dialogForm.stepcode, 4)
+ // this.getEqpTable(this.dialogForm.stepcode)
+ // },
// 澶嶅埗琛�
- async copyRow(row) {
+ async copyRow(row) {
let currentData = {}// 褰撳墠琛屽璞�
let nextData = {}// 涓嬩竴琛屽璞�
if (row.RowNum === this.eqpDialogArr.length) {
@@ -738,7 +792,7 @@
const res = await SaveBeatRate(newData)
if (res.code === '200') {
this.$message.success('澶嶅埗鎴愬姛锛�')
- await this.getEqpTable()
+ this.radioChange(this.radioChangeTempValue)
this.isEqpTableEdit = true
}
},
@@ -765,7 +819,7 @@
this.getPartSelect2()
},
// 淇敼鎸夐挳
- async edit(operation, row) {
+ async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
@@ -773,13 +827,11 @@
this.editRouteName = row.route_name
this.editStepName = row.stepname
- // this.$nextTick(() => {
+ await this.partDialogChange(row.partcode)
+ await this.routeDialogChange(row.route_code)
this.dialogForm.partcode = row.partcode
this.dialogForm.routecode = row.route_code
this.dialogForm.stepcode = row.stepcode
- // })
- await this.partDialogChange(row.partcode)
- await this.routeDialogChange(row.route_code)
await this.radioChange(0)
},
// 鍒犻櫎鎸夐挳
@@ -864,11 +916,12 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ 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()
})
}
}
@@ -878,15 +931,17 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-.el-button--text{
+.el-button--text {
font-size: 14px;
cursor: pointer;
}
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
}
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
margin-right: 15px;
}
@@ -947,8 +1002,8 @@
background-color: #f8f8fa;
}
-::v-deep .el-table__body .el-table__row.hover-row td{
- background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -964,10 +1019,20 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
</style>
<style>
--
Gitblit v1.9.3