From 458f6714f335938fce80690c037ffca0ccfaa50c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 03 八月 2022 16:31:52 +0800
Subject: [PATCH] 1.综合看板渲染数据，完成一个版本
---
src/views/zzmx/jpgj.vue | 74 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 736c146..b12b1f8 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -13,11 +13,14 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-select
v-model="form.partcode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
+
@change="partChange"
>
+ <!-- @focus="getPartSelect"-->
<el-option
v-for="item in partArr"
:key="item.partcode"
@@ -29,6 +32,7 @@
<el-form-item label="宸ヨ壓璺嚎" style=" display: flex;">
<el-select
v-model="form.routecode"
+ filterable
:disabled="form.partcode===''"
:popper-append-to-body="false"
style="width: 200px"
@@ -63,6 +67,7 @@
<el-form-item label="鍏宠仈璁惧" style=" display: flex;">
<el-select
v-model="form.eqpcode"
+ filterable
:disabled="form.stepcode===''"
:popper-append-to-body="false"
style="width: 200px"
@@ -109,41 +114,48 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="partcode"
+ min-width="160"
label="浜у搧缂栫爜"
sortable="custom"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
+ min-width="160"
sortable="custom"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
- width="110"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="wksp_name"
label="鐢熶骇杞﹂棿"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="route_name"
label="宸ヨ壓璺嚎"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="stepname"
label="鍔犲伐宸ュ簭"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="eqp_name"
label="鍔犲伐璁惧"
+ min-width="110"
sortable="custom"
/>
<el-table-column
@@ -173,10 +185,11 @@
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+ <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
<el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
</template>
@@ -197,10 +210,11 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="70%"
+ width="1200px"
top="15vh"
+ :fullscreen="isFullscreen"
:close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
@@ -212,13 +226,16 @@
<el-select
v-show="operation==='add'"
v-model="dialogForm.partcode"
+ filterable
style="width: 220px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
+
@change="partDialogChange"
>
+ <!-- @focus="getPartSelect2"-->
<el-option
- v-for="item in partArr"
+ v-for="item in partArr2"
:key="item.partcode"
:label="item.partname"
:value="item.partcode"
@@ -236,6 +253,7 @@
v-show="operation==='add'"
v-model="dialogForm.routecode"
style="width: 220px"
+ filterable
:disabled="dialogForm.partcode===''"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
@@ -298,16 +316,19 @@
prop="eqpcode"
label="璁惧缂栫爜"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="eqpname"
label="璁惧鍚嶇О"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="wksp_name"
sortable="custom"
label="鐢熶骇杞﹂棿"
+ min-width="110"
/>
<el-table-column
sortable="custom"
@@ -413,8 +434,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import {
BeatRateSearch, DeleteBeatRate,
PartSelect,
@@ -426,7 +445,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'JPGJ',
components: {
Pagination
},
@@ -450,6 +469,7 @@
}
}
return {
+ isFullscreen: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -463,6 +483,7 @@
rows: 20 // 姣忛〉澶氬皯鏉�
},
partArr: [], // 浜у搧闆嗗悎
+ partArr2: [], // 浜у搧闆嗗悎瀵硅瘽妗�
routeArr: [], // 浜у搧闆嗗悎
stepArr: [], // 浜у搧闆嗗悎
eqpArr: [], // 浜у搧闆嗗悎
@@ -550,6 +571,10 @@
const { data: res } = await PartSelect()
this.partArr = res
},
+ async getPartSelect2() {
+ const { data: res } = await PartSelect()
+ this.partArr2 = res
+ },
async partChange(val) {
const { data: res } = await PartSelectRpute({ partcode: val })
this.routeArr = res
@@ -578,27 +603,18 @@
},
async partDialogChange(val) {
const { data: res } = await PartSelectRpute({ partcode: val })
- console.log(this.routeDialogArr = res, 888)
+ this.routeDialogArr = res
this.stepDialogArr = []
this.eqpDialogArr = []
},
async routeDialogChange(val) {
const { data: res } = await RouteSelectStep({ routecode: val })
this.stepDialogArr = res
- // this.stepDialogArr = [
- // { code: '1001', name: '娴嬭瘯宸ュ簭1' },
- // { code: '1002', name: '娴嬭瘯宸ュ簭2' },
- // { code: '1003', name: '娴嬭瘯宸ュ簭3' },
- // { code: '1004', name: '娴嬭瘯宸ュ簭4' },
- // { code: '1005', name: '娴嬭瘯宸ュ簭5' },
- // { code: '1006', name: '娴嬭瘯宸ュ簭6' },
- // { code: '1007', name: '娴嬭瘯宸ュ簭7' },
- // { code: '1008', name: '娴嬭瘯宸ュ簭8' },
- // { code: '1009', name: '娴嬭瘯宸ュ簭9' }
- // ]
this.eqpDialogArr = []
},
radioChange(val) {
+ this.isEqpTableEdit = true
+
// this.dialogForm.stepcode = this.stepDialogArr.find(item => item.name === val).code
this.getEqpTable(val)
},
@@ -646,7 +662,7 @@
cavity_qty: row.cavity_qty, // 鍨嬭厰鏁�
unprice: row.unprice// 璁′欢鍗曚环
}
- console.log(data, 7)
+
// row.isVisible = 0
const res = await SaveBeatRate(data)
if (res.code === '200') {
@@ -671,7 +687,6 @@
},
// 澶嶅埗琛�
async copyRow(row) {
- console.log(row)
let currentData = {}// 褰撳墠琛屽璞�
let nextData = {}// 涓嬩竴琛屽璞�
if (row.RowNum === this.eqpDialogArr.length) {
@@ -684,8 +699,6 @@
}
})
}
- console.log(currentData, 2)
- console.log(nextData, 3)
const newData = {
partcode: this.eqpTable.partcode, // 浜у搧缂栫爜
routecode: this.eqpTable.routecode, // 宸ヨ壓璺嚎缂栫爜
@@ -697,7 +710,7 @@
cavity_qty: currentData.cavity_qty, // 鍨嬭厰鏁�
unprice: currentData.unprice// 璁′欢鍗曚环
}
- console.log(newData, 4)
+
const res = await SaveBeatRate(newData)
if (res.code === '200') {
this.$message.success('澶嶅埗鎴愬姛锛�')
@@ -724,12 +737,12 @@
add(operation) {
this.operation = operation
this.dialogVisible = true
+ this.getPartSelect2()
},
// 淇敼鎸夐挳
async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
- console.log(row)
this.editPartName = row.partname
this.editRouteName = row.route_name
@@ -752,12 +765,11 @@
type: 'warning'
}).then(() => {
const data = {
- partcode: this.eqpTable.partcode,
- routecode: this.eqpTable.routecode,
- stepcode: this.eqpTable.stepcode,
+ partcode: row.partcode,
+ routecode: row.route_code,
+ stepcode: row.stepcode,
eqpcode: row.eqp_code
}
- console.log(data)
DeleteBeatRate(data).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
@@ -783,6 +795,7 @@
this.stepDialogArr = []
this.eqpDialogArr = []
this.$refs.dialogForm.clearValidate()
+ this.getBeatRateSearch()
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -815,6 +828,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ // this.isFullscreen = window.innerHeight < 800
})
}
}
--
Gitblit v1.9.3