From b8b16d90fd13bcad5881a4562b5bbe96e576bd6b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 03 八月 2022 16:27:56 +0800
Subject: [PATCH] 1.解决工单手动打印大二维码问题
---
src/views/sbgl/sbqd.vue | 402 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 295 insertions(+), 107 deletions(-)
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 3d79b96..c1cff22 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -17,7 +17,13 @@
<el-input v-model="form.DeviceName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" style=" display: flex;">
- <el-select v-model="form.Status" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.Status"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -27,7 +33,14 @@
</el-select>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" style=" display: flex;">
- <el-select v-model="form.WorkShop" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.WorkShop"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <!-- @focus="getWorkShopSelect"-->
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -37,7 +50,16 @@
</el-select>
</el-form-item>
<el-form-item filterable label="璁惧绫诲瀷" style="display: flex;">
- <el-select v-model="form.DeviceType" style="width: 200px" placeholder="璇烽�夋嫨" @change="deviceTypeChange">
+ <el-select
+ v-model="form.DeviceType"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ filterable
+ placeholder="璇烽�夋嫨"
+
+ @change="deviceTypeChange"
+ >
+ <!-- @focus="getDeviceTypeSelect"-->
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -49,6 +71,8 @@
<el-form-item label="璁惧缁�" style=" display: flex;">
<el-select
v-model="form.DeviceGroup"
+ filterable
+ :popper-append-to-body="false"
:disabled="form.DeviceType===''"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -73,16 +97,17 @@
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
<el-button type="primary" icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
<el-table
:data="tableData"
border
+ :height="tableHeight+'px'"
stripe
highlight-current-row
- :style="{width: 100+'%',height:tableHeight+'px'}"
+ :style="{width: 100+'%',height:(tableHeight-50)+'px'}"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
@@ -95,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
@@ -129,7 +159,7 @@
</el-table-column>
<el-table-column
prop="input_date"
- label="鎶曞叆鏃堕棿"
+ label="鎶曞叆鏃ユ湡"
sortable="custom"
width="120"
>
@@ -141,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="绋煎姩鐜�"
@@ -165,17 +196,19 @@
/>
<el-table-column
prop="lm_date"
+ width="160"
label="鍒涘缓鏃堕棿"
sortable="custom"
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
width="100"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
- <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
+ <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
+ <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
</template>
</el-table-column>
@@ -195,41 +228,108 @@
</div>
<!--璁惧娓呭崟鏂板缂栬緫-->
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ :close-on-click-modal="false"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
top="15vh"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="璁惧缂栫爜" prop="OrgCode">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-form-item label="璁惧缂栫爜" prop="devicecode">
+ <el-input v-model="dialogForm.devicecode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
- <el-form-item label="璁惧鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-form-item label="璁惧鍚嶇О" prop="devicename">
+ <el-input v-model="dialogForm.devicename" style="width: 200px" />
</el-form-item>
- <el-form-item label="璁惧绫诲瀷" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-form-item label="璁惧绫诲瀷" prop="devicetypecode">
+ <el-select
+ v-model="dialogForm.devicetypecode"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="devicetypecodeChange"
+ >
+ <el-option
+ v-for="item in DeviceTypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
</el-form-item>
- <el-form-item label="璁惧缁�" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-form-item label="璁惧缁�" prop="devicegroupcode">
+ <el-select
+ v-model="dialogForm.devicegroupcode"
+ :popper-append-to-body="false"
+ :disabled="dialogForm.devicetypecode===''"
+ style="width: 200px"
+ filterable
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in DeviceGroupDialogArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
</el-form-item>
- <el-form-item label="鎶曞叆鏃ユ湡" prop="OrgName">
+ <el-form-item label="鎶曞叆鏃ユ湡" prop="importdate">
<el-date-picker
- v-model="dialogForm.OrgCode"
+ v-model="dialogForm.importdate"
+ style="width: 200px"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ popper-class="dateStyle"
/>
</el-form-item>
- <el-form-item label="鎵�灞炶溅闂�" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-form-item label="鎵�灞炶溅闂�" prop="workshopcode">
+ <el-select
+ v-model="dialogForm.workshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="workshopcodeChange"
+ >
+ <!-- @focus="getWorkShopSelect"-->
+
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
</el-form-item>
- <el-form-item label="鎵�灞炰骇绾�" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
- </el-form-item>
- <el-form-item label="浣跨敤鐘舵��" prop="OrgName">
- <el-select v-model="form.Status" placeholder="璇烽�夋嫨">
+ <!-- <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"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -238,8 +338,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="绋煎姩鐜�" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-form-item label="绋煎姩鐜�" prop="ratio">
+ <el-input v-model="dialogForm.ratio" style="width: 175px" />
+ <span style="margin-left: 10px">%</span>
</el-form-item>
</el-form>
@@ -255,8 +356,9 @@
<el-dialog
title="璁惧绫诲瀷"
:visible.sync="DeviceTypeDialogVisible"
- width="50%"
+ width="800px"
top="15vh"
+ :close-on-click-modal="false"
class="DeviceTypeDialogVisible"
@close="handleCloseDeviceType"
>
@@ -267,8 +369,8 @@
<el-table
:data="DeviceTypeArray"
border
+ height="300"
highlight-current-row
- :style="{width: 100+'%',height:tableHeight-300+'px'}"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeOfDeviceType"
@@ -341,7 +443,8 @@
<el-dialog
title="璁惧缁�"
:visible.sync="DeviceGroupDialogVisible"
- width="70%"
+ width="800px"
+ :close-on-click-modal="false"
top="15vh"
class="DeviceTypeDialogVisible"
@close="handleCloseDeviceGroup"
@@ -353,7 +456,7 @@
:data="DeviceGroupArray"
border
highlight-current-row
- :style="{width: 100+'%',height:tableHeight-300+'px'}"
+ height="300"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeOfDeviceGroup"
@@ -389,8 +492,13 @@
sortable="custom"
>
<template slot-scope="{row}">
- <!-- <el-input v-if="row.isVisible===1" v-model="row.eqptype_code" placeholder="璇疯緭鍏�" />-->
- <el-select v-if="row.isVisible===1" v-model="row.eqptype_code" placeholder="璇烽�夋嫨">
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.eqptype_code"
+ filterable
+ :popper-append-to-body="false"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -404,7 +512,6 @@
<el-table-column
prop="remark"
label="鍒嗙粍鎻忚堪"
- show-overflow-tooltip
sortable="custom"
>
<template slot-scope="{row}">
@@ -449,27 +556,20 @@
<script>
import Pagination from '@/components/Pagination'
import {
- AddUpdateOrganization,
- DeleteOrganization,
- OrganizationSearch,
- PrentOrganization,
- RoleTypeDelete
-} from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
-import {
- AddUpdateDeviceGroup,
- AddUpdateDeviceType, DeleteDeviceType,
+ AddUpdateDeviceGroup, AddUpdateDeviceManger,
+ AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
DeviceGroupSearch,
DeviceMangerSearch,
DeviceTypeSearch,
DeviceTypeSelect,
DeviceTypeSelectGroup,
- WorkShopSelect
+ WorkShopSelect, WorkShopSelectLine
} from '@/api/sbgl'
+import { handleDatetime } from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SBQD',
components: {
Pagination
},
@@ -483,13 +583,6 @@
} else {
callback()
}
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
}
}
return {
@@ -518,24 +611,44 @@
tableData: [],
dialogVisible: false,
dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ id: '',
+ devicecode: '',
+ devicename: '',
+ devicetypecode: '',
+ devicegroupcode: '',
+ importdate: handleDatetime(new Date()),
+ workshopcode: '',
+ linecode: '',
+ status: 'Y',
+ ratio: ''
},
+ DeviceGroupDialogArr: [], // 璁惧缁勬暟缁�
+ WorkLineArr: [], // 鎵�灞炰骇绾挎暟缁�
operation: '',
dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- ],
- OrgCode: [
+ devicecode: [
{ required: true, validator: validateName, trigger: ['blur', 'change'] }
],
- OrgName: [
+ devicename: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
],
- SupUnit: [
- { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
+ devicetypecode: [
+ { required: true, message: '璇烽�夋嫨璁惧绫诲瀷', trigger: ['blur', 'change'] }
+ ],
+ devicegroupcode: [
+ { required: true, message: '璇烽�夋嫨璁惧缁�', trigger: ['blur', 'change'] }
+ ],
+ importdate: [
+ { required: true, message: '璇烽�夋嫨鎶曞叆鏃ユ湡', trigger: ['blur', 'change'] }
+ ],
+ workshopcode: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
+ ],
+ // linecode: [
+ // { required: true, message: '璇烽�夋嫨鎵�灞炰骇绾�', trigger: ['blur', 'change'] }
+ // ],
+ status: [
+ { required: true, message: '璇烽�夋嫨浣跨敤鐘舵��', trigger: ['blur', 'change'] }
]
},
DeviceTypeDialogVisible: false,
@@ -589,7 +702,7 @@
},
// 璁惧绫诲瀷鏀瑰彉鏃�
async deviceTypeChange(val) {
- this.form.DeviceType = val
+ this.form.DeviceGroup = ''
const { data: res } = await DeviceTypeSelectGroup({ eqptypecode: val })
this.DeviceGroupArr = res
},
@@ -633,40 +746,66 @@
this.dialogVisible = true
},
// 淇敼鎸夐挳
- edit(operation, row) {
+ async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
-
+ await this.devicetypecodeChange(row.eqptype_code)
+ await this.workshopcodeChange(row.wksp_code)
this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ this.dialogForm.id = row.id
+ this.dialogForm.devicecode = row.code
+ this.dialogForm.devicename = row.name
+ this.dialogForm.devicetypecode = row.eqptype_code
+ 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.status = row.enable
+ this.dialogForm.ratio = row.operation_ration
})
},
// 鍒犻櫎鎸夐挳
- async del(id) {
+ async del(row) {
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- // DeleteOrganization({ orgid: id }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // this.getDeviceMangerSearch()
- // }
- // })
+ DeleteDeviceManger({ devicecode: row.code }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ this.getDeviceMangerSearch()
+ }
+ })
}).catch(() => {
this.$message.info('宸插彇娑堝垹闄�')
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm.id = ''
+ this.dialogForm.devicecode = ''
+ this.dialogForm.devicename = ''
+ this.dialogForm.devicetypecode = ''
+ this.dialogForm.devicegroupcode = ''
+ this.dialogForm.importdate = handleDatetime(new Date())
+ this.dialogForm.workshopcode = ''
+ // this.dialogForm.linecode = ''
+ this.dialogForm.status = 'Y'
+ this.dialogForm.ratio = ''
this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗘墍灞炶溅闂翠笅鎷夐�夋嫨鏀瑰彉鏃�
+ async workshopcodeChange(val) {
+ const { data: res } = await WorkShopSelectLine({ workshopcode: val })
+ this.WorkLineArr = res
+ // this.dialogForm.linecode = ''
+ },
+ // 瀵硅瘽妗嗚澶囩被鍨嬩笅鎷夐�夋嫨鏀瑰彉鏃�
+ async devicetypecodeChange(val) {
+ const { data: res } = await DeviceTypeSelectGroup({ eqptypecode: val })
+ this.DeviceGroupDialogArr = res
+ this.dialogForm.devicegroupcode = ''
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
@@ -677,12 +816,20 @@
this.$refs.dialogForm.validate(valid => {
if (valid) {
const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
+ id: this.dialogForm.id,
+ devicecode: this.dialogForm.devicecode,
+ devicename: this.dialogForm.devicename,
+ devicetypecode: this.dialogForm.devicetypecode,
+ devicegroupcode: this.dialogForm.devicegroupcode,
+ importdate: handleDatetime(this.dialogForm.importdate),
+ workshopcode: this.dialogForm.workshopcode,
+ // linecode: this.dialogForm.linecode,
+ linecode: '',
+ status: this.dialogForm.status,
+ ratio: this.dialogForm.ratio,
+ OperType: this.operation === 'add' ? 'Add' : 'Update'
}
- AddUpdateOrganization(data).then(res => {
+ AddUpdateDeviceManger(data).then(res => {
if (res.code === '200') {
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
@@ -697,8 +844,11 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
+ this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ if (window.innerHeight < 800) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
},
@@ -740,7 +890,9 @@
},
// 鏂板鎸夐挳
addDeviceType() {
- this.DeviceTypeArray.unshift({ code: '', name: '', group: '', remark: '', isVisible: 1 })
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ this.DeviceTypeArray.unshift({ code: '', name: '', group: '', remark: '', isVisible: 1, number: number })
},
// 鍒犻櫎
DeviceTypeDel(row) {
@@ -767,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,
@@ -785,7 +937,7 @@
// 鍙栨秷
DeviceTypeCancel(row) {
this.DeviceTypeArray.forEach((item, index) => {
- if (item.isVisible === 1 && item.code === row.code) {
+ if (item.isVisible === 1 && item.number === row.number) {
this.DeviceTypeArray.splice(index, 1)
}
})
@@ -815,7 +967,17 @@
},
// 鏂板
addDeviceGroup() {
- this.DeviceGroupArray.unshift({ code: '', name: '', eqptype_code: '', eqptype_name: '', remark: '', isVisible: 1 })
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ this.DeviceGroupArray.unshift({
+ code: '',
+ name: '',
+ eqptype_code: '',
+ eqptype_name: '',
+ remark: '',
+ isVisible: 1,
+ number: number
+ })
},
// 鎺掑簭
sortChangeOfDeviceGroup({ column, prop, order }) {
@@ -871,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,
@@ -889,7 +1051,7 @@
// 鍙栨秷鎸夐挳
DeviceGroupCancel(row) {
this.DeviceGroupArray.forEach((item, index) => {
- if (item.isVisible === 1 && item.code === row.code) {
+ if (item.isVisible === 1 && item.number === row.number) {
this.DeviceGroupArray.splice(index, 1)
}
})
@@ -905,8 +1067,13 @@
height: 30px;
display: flex;
align-items: center;
- border: 1px solid $main_color;
+ //border: 1px solid $main_color;
+ border: none;
padding: 0 20px;
+}
+
+::v-deep .el-button--primary:hover {
+ border: none;
}
::v-deep .el-button--info {
@@ -955,6 +1122,7 @@
::v-deep .el-select .el-input .el-select__caret {
display: flex;
align-items: center;
+ justify-content: center;
}
}
@@ -1037,12 +1205,32 @@
margin: 10px 30px 0px 0;
}
-.body ::v-deep .el-divider{
+.body ::v-deep .el-divider {
border: 1px solid #eee;
width: 99%;
margin: 10px auto;
}
-::v-deep .el-form-item{
+
+.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected {
+ color: $main_color;
+}
+</style>
+<style lang="scss">
+.dateStyle {
+ .el-date-table td.today span {
+ color: #42b983;
+ }
+}
</style>
--
Gitblit v1.9.3