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/sbgl/djbz.vue | 775 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 671 insertions(+), 104 deletions(-)
diff --git a/src/views/sbgl/djbz.vue b/src/views/sbgl/djbz.vue
index c858a88..1112151 100644
--- a/src/views/sbgl/djbz.vue
+++ b/src/views/sbgl/djbz.vue
@@ -1,18 +1,18 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
- <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>
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <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;">
@@ -32,18 +32,27 @@
</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"
:data="tableData"
:height="tableHeight+'px'"
border
+ class="tableFixed"
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -58,52 +67,101 @@
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="code"
label="鏍囧噯缂栫爜"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
- prop="org_name"
+ prop="name"
label="鏍囧噯鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="description"
label="鏍囧噯鎻忚堪"
sortable="custom"
- />
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.description">{{ row.description }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="parentorg_name"
+ prop="iscontr"
label="鐐规绠℃帶"
sortable="custom"
- />
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.iscontr==='Y'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row.iscontr==='N'">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 鍚�
+ </div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="parentorg_name"
+ prop="is_checkeqp"
label="鍏宠仈璁惧"
+ show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <i
+ v-if="row.is_checkeqp==='Y'"
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-share"
+ @click="checkeqpClick(row)"
+ />
+ <i
+ v-if="row.is_checkeqp==='N'"
+ class="el-icon-share"
+ style="color: rgb(180 ,181, 185)"
+ @click="checkeqpClick(row)"
+ />
+ </template>
+ </el-table-column>
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
width="160"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <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 :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -115,23 +173,24 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceCheckStandArdSearch"
/>
</div>
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
width="800px"
:close-on-click-modal="false"
top="8vh"
@closed="handleClose"
- @close="handleClose"
>
+ <!-- @close="handleClose"-->
<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="margin: 0 30px;">
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
@@ -141,7 +200,7 @@
<el-form-item label="鏍囧噯鍚嶇О" prop="name">
<el-input v-model="dialogForm.name" style="width: 200px" />
</el-form-item>
- <el-form-item prop="SupUnit" label="鐐规绠℃帶">
+ <el-form-item required label="鐐规绠℃帶">
<el-select
v-model="dialogForm.enable"
style="width: 200px"
@@ -162,13 +221,14 @@
</el-form>
</div>
<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="margin-bottom:10px">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addRow">鏂板</el-button>
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addRow">鏂板</el-button>
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataDialogRef"
:data="tableDataDialog"
:height="(tableHeight-300)+'px'"
border
@@ -186,6 +246,7 @@
<el-table-column
prop="checkitem_code"
label="鐐规閮ㄤ綅缂栫爜"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.checkitem_code }}</div>
@@ -207,6 +268,7 @@
<el-table-column
prop="checkitem_name"
label="鐐规閮ㄤ綅鍚嶇О"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.checkitem_name }}</div>
@@ -227,20 +289,22 @@
</el-table-column>
<el-table-column
- prop="chkdesc"
+ prop="checkitem_descr"
label="鐐规瑕佹眰"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.chkdesc }}</div>
- <el-input v-else v-model="row.chkdesc" />
+ <div v-if="row.isVisible===0">{{ row.checkitem_descr }}</div>
+ <el-input v-else v-model="row.checkitem_descr" />
</template>
</el-table-column>
<el-table-column
prop="isscan"
label="閫夋嫨鎵爜"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.isscan==='Y'?'鏄�':'鍚�' }}</div>
+ <div v-if="row.isVisible===0">{{ row.isscan === 'Y' ? '鏄�' : '鍚�' }}</div>
<el-select
v-if="row.isVisible===1"
v-model="row.isscan"
@@ -258,9 +322,10 @@
<el-table-column
prop="cycle"
label="鐐规鍛ㄦ湡"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.cycle==='D'?'鏃�':'' }}</div>
+ <div v-if="row.isVisible===0">{{ row.cycle === 'D' ? '鏃�' : '' }}</div>
<el-select
v-if="row.isVisible===1"
v-model="row.cycle"
@@ -282,11 +347,11 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="editRow(row)">缂栬緫</el-button>
- <el-button v-if="row.isVisible===0" type="text" @click="delRow(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="delRow(row)">鍒犻櫎</el-button>
- <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===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>
</div>
</template>
</el-table-column>
@@ -294,8 +359,103 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <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
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ <!-- 鍏宠仈璁惧-->
+ <el-dialog
+ v-el-drag-dialog
+ title="鍏宠仈璁惧"
+ :visible.sync="dialogVisibleEqp"
+ width="800px"
+ top="10vh"
+ :close-on-click-modal="false"
+ class="dialogVisibleEqp"
+ @closed="handleCloseEqp"
+ @close="handleCloseEqp"
+ >
+ <!-- @opened="handleOpenedRoles"-->
+
+ <div>
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 鏍囧噯鍚嶇О锛歿{ dialogFormEqp.name }}
+ </div>
+ <el-divider />
+ <div>
+ <div style="margin-bottom:20px">
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 璁惧鎵�灞炶溅闂撮泦鍚堬細
+ </div>
+ <div class="myCheckboxGroup">
+
+ <div
+ v-for="item in dialogFormEqp.eqpArr"
+ :key="item.code"
+ :style="{border:item.isSelected1?'1px solid '+$store.state.settings.theme:'1px solid #eee'}"
+ class="myCheckbox"
+ @click="myCheckboxClick(item)"
+ >
+ <!-- <input-->
+ <!-- class="myCheckboxInput"-->
+ <!-- type="checkbox"-->
+ <!-- :value="item.code"-->
+ <!-- :name="item.name"-->
+ <!-- :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+ <!-- @click="myCheckboxInputClick(item)"-->
+ <!-- >{{ item.name }}-->
+ <!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
+ <!-- onClick="event.cancelBubble = true"-->
+
+ <el-checkbox
+ :key="item.code"
+ v-model="item.isSelected2"
+ class="myCheckboxInput"
+ :value="item.code"
+ :name="item.name"
+ :checked="item.isSelected2"
+ :label="item.name"
+ @change="myCheckboxInputClick(item)"
+ />
+ <div class="myCheckboxInputLabel">{{ item.name }}</div>
+
+ </div>
+ </div>
+ </div>
+ <el-divider />
+ <div>
+ <div style="margin-bottom:20px">
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 璁惧淇℃伅锛�
+ </div>
+ <el-tree
+ ref="epqTree"
+ :data="dialogFormEqp.eqpTree"
+ show-checkbox
+ node-key="code"
+ default-expand-all
+ style="height: 300px"
+ :props="defaultPropsOfEqpTree"
+ @check="checkBoxClick"
+ />
+ <!-- @check-change="checkChange"-->
+
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="eqpDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="eqpDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -318,33 +478,24 @@
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
-import { AddUpdateDeviceCheckStandArd, DeviceCheckItemSelect, DeviceCheckStandArdSearch } from '@/api/sbgl'
+import {
+ AddUpdateDeviceCheckStandArd, DeleteDeviceCheckStaned,
+ DeviceCheckItemSelect,
+ DeviceCheckStandArdSearch, DeviceCheckStanedAssociationEqp, SaveDeviceCheckStanedAssociationEqp,
+ ViewDeviceCheckStanedSearch
+} from '@/api/sbgl'
+import $ from 'jquery'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'Zzjg',
components: {
Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
- const validateTypeCode = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇烽�夋嫨涓婄骇'))
- } else {
- callback()
- }
- }
return {
mainHeight: 0,
tableHeight: 0,
@@ -371,13 +522,13 @@
code: '',
name: '',
enable: 'Y',
- description: ''// 涓婄骇鍗曚綅
+ description: ''
},
operation: '',
dialogFormRules: {
code: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
name: [
{ required: true, message: '璇疯緭鍏ユ爣鍑嗗悕绉�', trigger: ['blur', 'change'] }
@@ -387,11 +538,27 @@
]
},
tableDataDialog: [], // 琛ㄦ牸鏁版嵁
- tableDataDialogSelected: [], // 宸查�塩ode
+ // tableDataDialogSelected: [], // 宸查�塩ode
checkItemSelectArr: [],
+ checkItemIsCancel: true,
+ dialogVisibleEqp: false,
+
+ dialogFormEqp: {
+ name: '',
+ code: '',
+ eqpAll: [], // 杞﹂棿鍙婅澶囨墍鏈�
+ eqpArr: [], // 杞﹂棿闆嗗悎鎵�鏈�
+ eqpTree: [], // 璁惧鏍戝舰鎵�鏈�
+ eqpCodeSelectedArr: []// 璁惧鏍戝舰閫変腑
+ },
+ defaultPropsOfEqpTree: {
+ value: 'code',
+ label: 'name',
+ children: 'children'
+ },
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
- code: '4',
+ code: '22',
shows: false
}
@@ -404,18 +571,25 @@
}
},
created() {
- this.getDeviceCheckStandArdSearch()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ handleRequest() {
+ this.getDeviceCheckStandArdSearch().then(res => {
+ if (res.code === '200') {
+ this.getDeviceCheckItemSelect()
+ }
+ })
+ },
async getDeviceCheckStandArdSearch() {
- console.log(this.form, 11)
const res = await DeviceCheckStandArdSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -444,10 +618,9 @@
},
// 閲嶇疆
reset() {
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
+ this.form.checkstandcode = ''
+ this.form.checkstandname = ''
+ this.form.checkcontr = ''
this.getDeviceCheckStandArdSearch()
},
@@ -460,19 +633,46 @@
add(operation) {
this.operation = operation
this.dialogVisible = true
- this.getDeviceCheckItemSelect()
+ // this.getDeviceCheckItemSelect()
+ this.$nextTick(() => {
+ this.$refs.tableDataDialogRef.doLayout()
+ })
},
// 淇敼鎸夐挳
edit(operation, row) {
+ // this.getDeviceCheckItemSelect()
this.operation = operation
+ this.getViewDeviceCheckStanedSearch(row.code)
this.dialogVisible = true
- this.getDeviceCheckItemSelect()
this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ this.$refs.tableDataDialogRef.doLayout()
})
+ // this.$nextTick(() => {
+ // this.dialogForm.code = row.code
+ // this.dialogForm.name = row.name
+ // this.dialogForm.enable = row.enable
+ // this.dialogForm.description = row.description
+ // })
+ },
+ // 淇敼鍓嶈姹傛帴鍙�
+ async getViewDeviceCheckStanedSearch(checkstand_code) {
+ const { data: res } = await ViewDeviceCheckStanedSearch({ checkstand_code })
+ this.tableDataDialog = res.Data
+
+ this.dialogForm.code = res.code
+ this.dialogForm.name = res.name
+ this.dialogForm.enable = res.enable
+ this.dialogForm.description = res.description
+
+ this.tableDataDialog.forEach(item => {
+ item.isVisible = 0
+ item.checkitem_code = item.code
+ item.checkitem_name = item.name
+ item.checkitem_descr = item.chkdesc
+ })
+
+ this.checkItemSelectArr = [...this.checkItemSelectArr].filter(x => [...this.tableDataDialog].every(y => y.checkitem_code !== x.code))
},
// 鍒犻櫎鎸夐挳
async del(row) {
@@ -481,9 +681,12 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: row.code }).then(res => {
+ DeleteDeviceCheckStaned({ checkstand_code: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDeviceCheckStandArdSearch()
}
})
@@ -491,6 +694,7 @@
this.$message.info('宸插彇娑堝垹闄�')
})
},
+
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
this.dialogForm.code = ''
@@ -498,6 +702,7 @@
this.dialogForm.enable = 'Y'
this.dialogForm.description = ''
this.tableDataDialog = []
+ this.getDeviceCheckItemSelect()
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -506,8 +711,21 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
+ if (this.tableDataDialog.length === 0) {
+ return this.$message.info('璁惧鍏宠仈鐐规椤逛俊鎭笉鑳戒负绌猴紒')
+ }
+
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
+ // this.tableDataDialog.forEach((item, index) => { // 鍘绘帀姝ｅ湪缂栬緫涓旀槸绌篶heckitem_code
+ // if (item.isVisible === 1 && item.checkitem_code === '') {
+ // this.tableDataDialog.splice(index, 1)
+ // }
+ // })
+
+ this.tableDataDialog.filter(item => item.checkitem_code !== '')
+
let Data = []
// 鏁扮粍涓璞＄浉鍚岀殑鍘婚噸
Data = this.tableDataDialog.filter((currentValue, currentIndex, selfArr) => {
@@ -516,7 +734,7 @@
Data.forEach((item, index) => {
item.checkitem_seq = index + 1
})
- console.log(Data, 999)
+
const data = {
'code': this.dialogForm.code,
'name': this.dialogForm.name,
@@ -524,12 +742,13 @@
'description': this.dialogForm.description,
'Data': Data
}
- console.log(data, 111)
+
AddUpdateDeviceCheckStandArd(data, this.operation === 'add' ? 'Add' : 'Update').then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getDeviceCheckStandArdSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
@@ -539,16 +758,12 @@
},
selectChange(val, row) {
- row.chkdesc = this.checkItemSelectArr.find(item => {
+ const res = this.checkItemSelectArr.find(item => {
return item.code === val || item.name === val
- }).description
-
- row.checkitem_code = this.checkItemSelectArr.find(item => {
- return item.code === val || item.name === val
- }).code
- row.checkitem_name = this.checkItemSelectArr.find(item => {
- return item.code === val || item.name === val
- }).name
+ })
+ row.checkitem_descr = res.description
+ row.checkitem_code = res.code
+ row.checkitem_name = res.name
},
// 鏂板琛�
addRow() {
@@ -565,17 +780,30 @@
this.tableDataDialog.push({
checkitem_code: '',
checkitem_name: '',
- chkdesc: '',
+ checkitem_descr: '',
isscan: 'Y',
cycle: 'D',
isVisible: 1
})
+
+ this.checkItemIsCancel = false
},
editRow(row) {
- this.tableDataDialogSelected.forEach((item, index) => {
- if (item === row.checkitem_code) {
- this.tableDataDialogSelected.splice(index, 1)
+ let flag = false
+ this.tableDataDialog.forEach((item, index) => {
+ if (item.isVisible === 1) {
+ flag = true
}
+ })
+ if (flag) {
+ return this.$message.info('璇峰厛纭鎴栧彇娑堝叾瀹冭锛�')
+ }
+
+ this.checkItemIsCancel = false
+ this.checkItemSelectArr.splice(0, 0, {
+ code: row.checkitem_code,
+ name: row.checkitem_name,
+ description: row.checkitem_descr
})
this.tableDataDialog.forEach((item, index) => {
@@ -583,7 +811,7 @@
this.tableDataDialog.splice(index, 1, {
checkitem_code: row.checkitem_code,
checkitem_name: row.checkitem_name,
- chkdesc: row.chkdesc,
+ checkitem_descr: row.checkitem_descr,
isscan: row.isscan,
cycle: row.cycle,
isVisible: 1
@@ -592,31 +820,44 @@
})
},
delRow(row) {
+ this.checkItemSelectArr.splice(0, 0, {
+ code: row.checkitem_code,
+ name: row.checkitem_name,
+ description: row.checkitem_descr
+ })
this.tableDataDialog.forEach((item, index) => {
if (item.checkitem_code === row.checkitem_code) {
this.tableDataDialog.splice(index, 1)
}
})
-
- this.tableDataDialogSelected.forEach((item, index) => {
- if (item === row.checkitem_code) {
- this.tableDataDialogSelected.splice(index, 1)
+ },
+ saveRow(row) {
+ if (row.checkitem_code === '' && row.checkitem_name === '') {
+ return this.$message.info('鐐规閮ㄤ綅涓嶈兘涓虹┖锛�')
+ }
+ row.isVisible = 0
+ this.checkItemSelectArr.forEach((item, index) => {
+ if (item.code === row.checkitem_code) {
+ this.checkItemSelectArr.splice(index, 1)
}
})
},
- saveRow(row) {
- if (this.tableDataDialogSelected.includes(row.checkitem_code)) {
- return this.$message.info('鐐规閮ㄤ綅涓嶈兘閫夋嫨鐩稿悓锛�')
- }
- this.tableDataDialogSelected.push(row.checkitem_code)
- row.isVisible = 0
- console.log(this.tableDataDialog)
- },
cancelRow(row) {
- console.log(row, 111)
+ // this.checkItemSelectArr.forEach((item, index) => {
+ // if (item.code === row.checkitem_code) {
+ if (this.checkItemIsCancel) {
+ this.checkItemSelectArr.splice(0, 0, {
+ code: row.checkitem_code,
+ name: row.checkitem_name,
+ description: row.checkitem_descr
+ })
+ }
+ this.JYIsCancel = true
+ // }
+ // })
+
this.tableDataDialog.forEach((item, index) => {
if (item.checkitem_code === row.checkitem_code && item.isVisible === 1) {
- console.log(item)
row.isVisible = 0
this.tableDataDialog.splice(index, 1)
}
@@ -626,11 +867,248 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 195
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
+ },
+ // 鍏宠仈璁惧
+ checkeqpClick(row) {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ this.dialogFormEqp.name = row.name
+ this.dialogFormEqp.code = row.code
+
+ DeviceCheckStanedAssociationEqp({ checkstand_code: row.code }).then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+ this.dialogFormEqp.eqpAll = res.data.filter(item => item.children.length > 0)
+
+ if (this.dialogFormEqp.eqpAll.length > 0) {
+ this.dialogFormEqp.eqpAll.forEach((item, index) => {
+ this.dialogFormEqp.eqpArr.push({
+ code: item.code,
+ name: item.name,
+ type: item.type,
+ isSelected1: index === 0,
+ isSelected2: item.flag === 'Y'
+ })
+ if (item.flag === 'Y') {
+ this.$nextTick(() => {
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ this.dialogFormEqp.eqpCodeSelectedArr.push(it.code)
+ }
+ })
+ }
+ })
+ this.dialogFormEqp.eqpAll[0].name = '鍏ㄩ儴'
+ this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[0]]
+ }
+
+ this.dialogVisibleEqp = true
+
+ this.$nextTick(() => { // 鏍戝舰鍥炴樉
+ this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
+ })
+ }, 1000)
+ } else {
+ loading.close()
+ }
+ })
+ },
+ // 鍏宠仈璁惧瀵硅瘽妗嗗叧闂�
+ handleCloseEqp() {
+ this.$refs.epqTree.setCheckedKeys([])
+ this.dialogFormEqp.code = ''
+ this.dialogFormEqp.name = ''
+ this.dialogFormEqp.eqpAll = []
+ this.dialogFormEqp.eqpArr = []
+ this.dialogFormEqp.eqpTree = []
+ this.dialogFormEqp.eqpCodeSelectedArr = []
+ },
+ // 澶х洅瀛愮偣鍑�
+ myCheckboxClick(val) {
+ this.dialogFormEqp.eqpArr.forEach((item, index) => {
+ item.isSelected1 = item.code === val.code
+ if (item.code === val.code) {
+ this.dialogFormEqp.eqpAll[index].name = '鍏ㄩ儴'
+ this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[index]]
+ }
+ })
+ this.$nextTick(() => { // 鏍戝舰鍥炴樉
+ this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
+ })
+ },
+ // 灏忕洅瀛愮偣鍑�
+ myCheckboxInputClick(val) {
+ console.log(val)
+ val.isSelected2 = !!val.isSelected2
+ if (val.isSelected2) { // 浠庢病閫変腑鍒伴�変腑
+ console.log('浠庢病閫変腑鍒伴�変腑')
+ this.dialogFormEqp.eqpAll.forEach((item, index) => {
+ if (item.code === val.code) {
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ this.dialogFormEqp.eqpCodeSelectedArr.push(it.code)
+ })
+ }
+ }
+ })
+ console.log(this.dialogFormEqp.eqpCodeSelectedArr, 1)
+ this.$nextTick(() => { // 鏍戝舰鍥炴樉
+ this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
+ })
+ } else { // 浠庨�変腑鍒版病閫変腑
+ console.log('浠庨�変腑鍒版病閫変腑')
+ const temp = []
+ this.dialogFormEqp.eqpAll.forEach((item, index) => {
+ if (item.code === val.code) {
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ temp.push(it.code)
+ })
+ }
+ }
+ })
+ this.dialogFormEqp.eqpCodeSelectedArr = [...this.dialogFormEqp.eqpCodeSelectedArr].filter(x => [...temp].every(y => y !== x))
+ this.$nextTick(() => { // 鏍戝舰鍥炴樉
+ this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
+ })
+ }
+ console.log(this.dialogFormEqp.eqpCodeSelectedArr, 999)
+ },
+ // 鏍戝舰澶嶉�夋鐐瑰嚮浜嬩欢
+ checkBoxClick(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys }) {
+ let checkedFatherCode = '' // 鎵惧埌 checkedFatherCode 鐖禼ode鍊�
+ console.log(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys })
+ this.dialogFormEqp.eqpAll.forEach((item, index) => {
+ if (item.code === obj.code) {
+ checkedFatherCode = item.code
+ }
+ if (item.children && item.children.length > 0) {
+ item.children.forEach((it, ind) => {
+ if (it.code === obj.code) {
+ checkedFatherCode = item.code
+ }
+ })
+ }
+ })
+ console.log(checkedFatherCode, 1)
+
+ // 1.绗竴绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓嶄负闆� 鍏ㄥ彾 涓嶄负闆�
+ if (halfCheckedKeys.length !== 0 && checkedKeys.length !== 0) {
+ console.log('// 1.绗竴绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓嶄负闆� 鍏ㄥ彾 涓嶄负闆�')
+ this.dialogFormEqp.eqpArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ console.log(item.code, 777)
+ this.dialogFormEqp.eqpArr[index].isSelected2 = true
+ this.$nextTick(() => {
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+ this.dialogFormEqp.eqpCodeSelectedArr.forEach((item, index) => {
+ if (item === obj.code) {
+ this.dialogFormEqp.eqpCodeSelectedArr.splice(index, 1)
+ }
+ })
+ checkedKeys.forEach(item => {
+ this.dialogFormEqp.eqpCodeSelectedArr.push(item)
+ })
+ this.dialogFormEqp.eqpCodeSelectedArr = [...new Set(this.dialogFormEqp.eqpCodeSelectedArr)]
+ }
+ console.log(this.dialogFormEqp.eqpCodeSelectedArr, 666)
+ // 2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂
+ if (halfCheckedKeys.length === 0 && checkedKeys.length === 0) {
+ console.log('// 2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂')
+ const temp = []
+ this.dialogFormEqp.eqpArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ this.dialogFormEqp.eqpArr[index].isSelected2 = false
+ this.$nextTick(() => {
+ $('input:checkbox').eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+ this.dialogFormEqp.eqpAll.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ temp.push(it.code)
+ })
+ }
+ }
+ })
+ this.dialogFormEqp.eqpCodeSelectedArr = [...this.dialogFormEqp.eqpCodeSelectedArr].filter(x => [...temp].every(y => y !== x))
+ }
+
+ // 3.绗笁绉嶇鎯呭喌褰撴爲褰� 鍗婂彾 涓洪浂 鍏ㄥ彾 涓嶄负闆�
+ if (halfCheckedKeys.length === 0 && checkedKeys.length !== 0) {
+ console.log('// 3.绗笁绉嶇鎯呭喌褰撴爲褰� 鍗婂彾 涓洪浂 鍏ㄥ彾 涓嶄负闆�')
+ this.dialogFormEqp.eqpArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ this.dialogFormEqp.eqpArr[index].isSelected2 = true
+ this.$nextTick(() => {
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+
+ this.dialogFormEqp.eqpAll.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ this.dialogFormEqp.eqpCodeSelectedArr.push(it.code)
+ })
+ }
+ }
+ })
+ }
+ },
+ // 鍙栨秷浜嬩欢
+ eqpDialogVisibleCancel() {
+ this.dialogVisibleEqp = false
+ },
+ // 纭浜嬩欢
+ eqpDialogVisibleConfirm() {
+ // console.log(this.dialogFormEqp.eqpCodeSelectedArr, 888)
+ // this.dialogVisibleEqp = false
+ this.$store.state.app.buttonIsDisabled = true
+ const data = []
+ this.dialogFormEqp.eqpAll.forEach((item, index) => {
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ if (this.dialogFormEqp.eqpCodeSelectedArr.includes(it.code)) {
+ data.push({
+ name: it.name,
+ code: it.code
+ })
+ }
+ })
+ }
+ })
+
+ SaveDeviceCheckStanedAssociationEqp(data, this.dialogFormEqp.code).then(res => {
+ if (res.code === '200') {
+ this.dialogVisibleEqp = false
+ this.$message.success('鍏宠仈鎴愬姛锛�')
+ this.getDeviceCheckStandArdSearch()
+ this.$store.state.app.buttonIsDisabled = false
+ }
+ })
}
}
}
@@ -639,6 +1117,77 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
+
+.dialogVisibleEqp {
+ .myCheckboxGroup {
+ display: flex;
+ flex-wrap: wrap;
+
+ .myCheckbox {
+ //border: 1px solid $main_color;
+ border: 1px solid #eee;
+ display: flex;
+ min-width: 100px;
+ padding: 10px;
+ margin: 10px 30px 0 0;
+ border-radius: 5px;
+ cursor: default;
+ position: relative;
+
+ .myCheckboxInput {
+ margin: 1px 5px 0 0;
+ cursor: pointer;
+ }
+
+ .myCheckboxInputLabel {
+ position: absolute;
+ left: 29px;
+ padding: 5px;
+ top: 6px;
+ color: transparent;
+
+ }
+
+ }
+
+ //.myCheckbox{
+ // border: 1px solid $main_color;
+ //}
+
+ input[type=checkbox] {
+ cursor: pointer;
+ position: relative;
+ width: 14px;
+ height: 14px;
+ font-size: 14px;
+ }
+
+ input[type=checkbox]::after {
+ position: absolute;
+ top: 0;
+ //color: rgb(130, 35, 35);
+ color: $main_color;
+ width: 14px;
+ height: 14px;
+ display: inline-block;
+ visibility: visible;
+ padding-left: 0px;
+ text-align: center;
+ content: ' ';
+ border-radius: 3px
+ }
+
+ input[type=checkbox]:checked::after {
+ //content: "鉁�";
+ content: "鈭�";
+ color: #fff;
+ font-size: 12px;
+ font-weight: bold;
+ background-color: $main_color;
+ }
+ }
+}
+
::v-deep .el-button--text {
font-size: 14px;
cursor: pointer;
@@ -734,13 +1283,31 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-::v-deep .el-select__caret{
+
+::v-deep .el-select__caret {
display: flex;
align-items: center;
justify-content: center;
}
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
</style>
<style>
+.osloading {
+ font-size: 26px !important;
+}
+
+.el-loading-text {
+ font-size: 26px !important;
+}
.el-table .custom-row {
background: #f8f8fa;
--
Gitblit v1.9.3