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/sbgl/sbqd.vue | 90 ++++++++++++++++++++++++--------------------
1 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 819994c..c1cff22 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -120,25 +120,30 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="code"
label="璁惧缂栫爜"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="name"
label="璁惧鍚嶇О"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="eqptype_name"
label="璁惧绫诲瀷"
+ min-width="110"
sortable="custom"
/>
<el-table-column
prop="eqpgroup_name"
label="璁惧缁�"
+ min-width="110"
sortable="custom"
/>
<el-table-column
@@ -166,12 +171,13 @@
prop="wksp_name"
label="鐢熶骇杞﹂棿"
sortable="custom"
+ min-width="120"
/>
- <el-table-column
- prop="Line_name"
- label="鎵�灞炰骇绾�"
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="Line_name"-->
+ <!-- label="鎵�灞炰骇绾�"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="operation_ration"
label="绋煎姩鐜�"
@@ -190,11 +196,13 @@
/>
<el-table-column
prop="lm_date"
+ width="160"
label="鍒涘缓鏃堕棿"
sortable="custom"
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
width="100"
>
<template slot-scope="{row}">
@@ -297,23 +305,23 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鎵�灞炰骇绾�" prop="linecode">
- <el-select
- v-model="dialogForm.linecode"
- filterable
- :popper-append-to-body="false"
- :disabled="dialogForm.workshopcode===''"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in WorkLineArr"
- :key="item.linecode"
- :label="item.linename"
- :value="item.linecode"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item label="鎵�灞炰骇绾�" prop="linecode">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.linecode"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- :disabled="dialogForm.workshopcode===''"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in WorkLineArr"-->
+ <!-- :key="item.linecode"-->
+ <!-- :label="item.linename"-->
+ <!-- :value="item.linecode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item label="浣跨敤鐘舵��" prop="status">
<el-select
v-model="dialogForm.status"
@@ -331,7 +339,7 @@
</el-select>
</el-form-item>
<el-form-item label="绋煎姩鐜�" prop="ratio">
- <el-input v-model="dialogForm.ratio" style="width: 195px" />
+ <el-input v-model="dialogForm.ratio" style="width: 175px" />
<span style="margin-left: 10px">%</span>
</el-form-item>
@@ -547,7 +555,6 @@
<script>
import Pagination from '@/components/Pagination'
-import { getCookie } from '@/utils/auth'
import {
AddUpdateDeviceGroup, AddUpdateDeviceManger,
AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
@@ -609,10 +616,10 @@
devicename: '',
devicetypecode: '',
devicegroupcode: '',
- importdate: '',
+ importdate: handleDatetime(new Date()),
workshopcode: '',
linecode: '',
- status: '',
+ status: 'Y',
ratio: ''
},
DeviceGroupDialogArr: [], // 璁惧缁勬暟缁�
@@ -637,9 +644,9 @@
workshopcode: [
{ required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
],
- linecode: [
- { required: true, message: '璇烽�夋嫨鎵�灞炰骇绾�', trigger: ['blur', 'change'] }
- ],
+ // linecode: [
+ // { required: true, message: '璇烽�夋嫨鎵�灞炰骇绾�', trigger: ['blur', 'change'] }
+ // ],
status: [
{ required: true, message: '璇烽�夋嫨浣跨敤鐘舵��', trigger: ['blur', 'change'] }
]
@@ -752,7 +759,7 @@
this.dialogForm.devicegroupcode = row.eqpgroup_code
this.dialogForm.importdate = row.input_date
this.dialogForm.workshopcode = row.wksp_code
- this.dialogForm.linecode = row.Line_code
+ // this.dialogForm.linecode = row.Line_code
this.dialogForm.status = row.enable
this.dialogForm.ratio = row.operation_ration
})
@@ -781,10 +788,10 @@
this.dialogForm.devicename = ''
this.dialogForm.devicetypecode = ''
this.dialogForm.devicegroupcode = ''
- this.dialogForm.importdate = ''
+ this.dialogForm.importdate = handleDatetime(new Date())
this.dialogForm.workshopcode = ''
- this.dialogForm.linecode = ''
- this.dialogForm.status = ''
+ // this.dialogForm.linecode = ''
+ this.dialogForm.status = 'Y'
this.dialogForm.ratio = ''
this.$refs.dialogForm.clearValidate()
},
@@ -792,7 +799,7 @@
async workshopcodeChange(val) {
const { data: res } = await WorkShopSelectLine({ workshopcode: val })
this.WorkLineArr = res
- this.dialogForm.linecode = ''
+ // this.dialogForm.linecode = ''
},
// 瀵硅瘽妗嗚澶囩被鍨嬩笅鎷夐�夋嫨鏀瑰彉鏃�
async devicetypecodeChange(val) {
@@ -816,7 +823,8 @@
devicegroupcode: this.dialogForm.devicegroupcode,
importdate: handleDatetime(this.dialogForm.importdate),
workshopcode: this.dialogForm.workshopcode,
- linecode: this.dialogForm.linecode,
+ // linecode: this.dialogForm.linecode,
+ linecode: '',
status: this.dialogForm.status,
ratio: this.dialogForm.ratio,
OperType: this.operation === 'add' ? 'Add' : 'Update'
@@ -911,9 +919,9 @@
if (row.name.trim().length < 1) {
return this.$message.info('绫诲瀷鍚嶇О涓嶈兘涓虹┖锛�')
}
- if (row.remark.trim().length < 1) {
- return this.$message.info('绫诲瀷鎻忚堪涓嶈兘涓虹┖锛�')
- }
+ // if (row.remark.trim().length < 1) {
+ // return this.$message.info('绫诲瀷鎻忚堪涓嶈兘涓虹┖锛�')
+ // }
const data = {
'code': row.code,
'name': row.name,
@@ -1025,9 +1033,9 @@
if (row.eqptype_code.trim().length < 1) {
return this.$message.info('鎵�灞炶澶囩被鍨嬩笉鑳戒负绌猴紒')
}
- if (row.remark.trim().length < 1) {
- return this.$message.info('鍒嗙粍鎻忚堪涓嶈兘涓虹┖锛�')
- }
+ // if (row.remark.trim().length < 1) {
+ // return this.$message.info('鍒嗙粍鎻忚堪涓嶈兘涓虹┖锛�')
+ // }
const data = {
'code': row.code,
'name': row.name,
--
Gitblit v1.9.3