From 7d0a954d23d21c0cdaff6ed20ad7291b3dbf889a Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 30 六月 2022 17:45:39 +0800
Subject: [PATCH] 1.完成制造模型（工序定义）页面开发
---
src/views/xtsz/bmgz.vue | 153 +++++++-----
src/views/zzmx/gxdy.vue | 559 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 642 insertions(+), 70 deletions(-)
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index f6517c7..2e6270d 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -68,7 +68,7 @@
/>
<el-table-column
prop="prefix"
- label="鍓嶇紑"
+ label="鍥哄畾瀛楃"
sortable="custom"
>
<template slot-scope="{row}">
@@ -132,12 +132,12 @@
>
<el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="鍥哄畾瀛楃" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ <el-form-item label="鍥哄畾瀛楃" prop="prefix">
+ <el-input v-model="dialogForm.prefix" style="width: 220px" />
</el-form-item>
- <el-form-item prop="SupUnit" label="鎻愪氦鏃ユ湡">
+ <el-form-item prop="filingdate" label="鎻愪氦鏃ユ湡">
<el-select
- v-model="dialogForm.SupUnit"
+ v-model="dialogForm.filingdate"
style="width: 220px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
@@ -150,12 +150,14 @@
/>
</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="incbit">
+ <!-- @change="handleChange"-->
+ <el-input-number v-model="dialogForm.incbit" :min="1" :max="100" label="鎻忚堪鏂囧瓧" />
+
+ <!-- <el-input v-model="dialogForm.incbit" style="width: 220px" />-->
</el-form-item>
<el-form-item label="缂栫爜棰勮">
- <!-- <el-input v-model="dialogForm.OrgName" style="width: 220px" />-->
- xxxx
+ {{ encodingPre }}
</el-form-item>
</el-form>
@@ -171,9 +173,7 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
-import { EncodingRules } from '@/api/xtsz'
+import { EncodingRules, SaveEncodingRules } from '@/api/xtsz'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -205,30 +205,50 @@
rows: 20 // 姣忛〉澶氬皯鏉�
},
dateType: [
- { label: '骞�', value: 'Y' },
- { label: '鏈�', value: 'M' },
- { label: '鏃�', value: 'D' }
+ { label: '骞存湀鏃�', value: 'YMD' },
+ { label: '骞存湀', value: 'YM' },
+ { label: '骞�', value: 'Y' }
],
total: 10,
tableData: [],
dialogVisible: false,
dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ rightcode: '', // 鍔熻兘缂栫爜
+ rightname: '', // 鍔熻兘鍚嶇О
+ prefix: '', // 鍥哄畾瀛楃
+ filingdate: '', // 鎻愪氦鏃ユ湡
+ incbit: '' // 鑷浣嶆暟
},
operation: '',
+ encodingPre: '', // 缂栫爜棰勮
dialogFormRules: {
// OrgCode: [
// { required: true, validator: validateName, trigger: ['blur', 'change'] }
// ],
- OrgName: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- ]
+ // OrgName: [
+ // { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ // ]
}
+ }
+ },
+ watch: {
+ dialogForm: {
+ handler(newVlaue, oldValue) {
+ const date = new Date()
+ let newDate = ''
+ if (newVlaue.filingdate === 'YMD') {
+ newDate = date.getFullYear() + '' + (date.getMonth() + 1 + '').padStart(2, '0') + '' + (date.getDate() + '').padStart(2, '0')
+ } else if (newVlaue.filingdate === 'YM') {
+ newDate = date.getFullYear() + '' + (date.getMonth() + 1 + '').padStart(2, '0')
+ } else if (newVlaue.filingdate === 'Y') {
+ newDate = date.getFullYear() + ''
+ }
+ this.encodingPre = newVlaue.prefix + '' + newDate + '' + (1 + '').padStart(newVlaue.incbit, '0')
+ },
+ immediate: true,
+ deep: true
}
},
created() {
@@ -243,10 +263,6 @@
const res = await EncodingRules(this.form)
this.tableData = res.data
this.total = res.count
- // this.tableData = [
- // { code: 123, name: 'xxx1' }
- // ]
- // this.total = 10
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -270,10 +286,8 @@
},
// 閲嶇疆
reset() {
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
+ this.form.rightname = ''
+ this.form.prefix = ''
this.getEncodingRules()
},
@@ -288,34 +302,37 @@
this.dialogVisible = true
this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
+ this.dialogForm.rightcode = row.right_code
+ this.dialogForm.rightname = row.right_name
+ this.dialogForm.filingdate = this.dateType.find(item => item.label === row.filingdate).value
+ this.dialogForm.incbit = row.incbit
+ this.dialogForm.prefix = row.prefix
})
},
// 鍒犻櫎鎸夐挳
async del(row) {
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- DeleteOrganization({ orgid: row.code }).then(res => {
- if (res.code === '200') {
- this.$message.success('鍒犻櫎鎴愬姛!')
- this.getEncodingRules()
- }
- })
- }).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
- })
+ // this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // type: 'warning'
+ // }).then(() => {
+ // DeleteOrganization({ orgid: row.code }).then(res => {
+ // if (res.code === '200') {
+ // this.$message.success('鍒犻櫎鎴愬姛!')
+ // this.getEncodingRules()
+ // }
+ // })
+ // }).catch(() => {
+ // this.$message.info('宸插彇娑堝垹闄�')
+ // })
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm.rightcode = ''
+ this.dialogForm.rightname = ''
+ this.dialogForm.filingdate = ''
+ this.dialogForm.incbit = ''
+ this.dialogForm.prefix = ''
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -327,12 +344,15 @@
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')
+ rightcode: this.dialogForm.rightcode,
+ rightname: this.dialogForm.rightname,
+ incbit: this.dialogForm.incbit,
+ // filingdate: this.dialogForm.filingdate,
+ filingdate: this.dateType.find(item => item.value === this.dialogForm.filingdate).label,
+ prefix: this.dialogForm.prefix
}
- AddUpdateOrganization(data).then(res => {
+ console.log(data)
+ SaveEncodingRules(data).then(res => {
if (res.code === '200') {
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
@@ -366,9 +386,11 @@
border: none;
padding: 0 20px;
}
+
::v-deep .el-button--primary:hover {
border: none;
}
+
::v-deep .el-button--info {
height: 30px;
display: flex;
@@ -424,6 +446,7 @@
height: 30px;
line-height: 30px;
}
+
::v-deep .el-input__inner:focus {
border-color: $main_color;
}
@@ -500,18 +523,28 @@
border-color: $main_color;
}
-::v-deep .el-select .el-input__inner:focus{
+::v-deep .el-select .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
color: $main_color;
}
-::v-deep .el-checkbox__inner:hover{
+
+::v-deep .el-checkbox__inner:hover {
border-color: $main_color;
}
-::v-deep .el-textarea__inner:focus{
+
+::v-deep .el-textarea__inner:focus {
border-color: $main_color;
}
+::v-deep .el-input-number__decrease,::v-deep .el-input-number__increase {
+ background-color: $main_color;
+ color: #FFFFFF;
+ line-height: 31px;
+ height: 31px;
+ margin-top: 3px;
+}
+
</style>
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index d377590..c1ff956 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -105,6 +105,16 @@
sortable="custom"
/>
<el-table-column
+ prop="enable"
+ label="鍚敤鐘舵��"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.enable==='Y'">鏄�</div>
+ <div v-if="row.enable==='N'">鍚�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
sortable="custom"
@@ -157,6 +167,7 @@
/>
</div>
+ <!--鏂板淇敼瀵硅瘽妗�-->
<el-dialog
:title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
@@ -214,6 +225,116 @@
</div>
</span>
</el-dialog>
+
+ <!-- 鍏宠仈宸ヤ綔绔欏璇濇-->
+ <el-dialog
+ title="鍏宠仈宸ヤ綔绔�"
+ :visible.sync="workDialogVisible"
+ width="50%"
+ top="15vh"
+ :close-on-click-modal="false"
+ class="workDialogVisible"
+ @closed="workHandleClose"
+ @close="workHandleClose"
+ >
+ <!-- @opened="handleOpenedRoles"-->
+
+ <div>
+ <i class="el-icon-s-comment" style="color:#42b983;" /> 宸ュ簭鍚嶇О锛歿{ workDialogForm.stepname }}
+ </div>
+ <el-divider />
+ <div>
+ <div style="margin-bottom:20px">
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ヤ綔绔欓泦鍚堬細
+ </div>
+ <div class="myCheckboxGroup">
+ <div
+ v-for="item in workDialogForm.workGatherArr"
+ :key="item.code"
+ :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ class="myCheckbox"
+ @click="myCheckboxClick(item)"
+ >
+ <input
+ class="myCheckboxInput"
+ type="checkbox"
+ :value="item.code"
+ name="gather"
+ :style="{color:item.isSelected2?'#42b983':'#fff'}"
+ @click="myCheckboxInputClick(item)"
+ >{{ item.name }}
+ <!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
+ <!-- onClick="event.cancelBubble = true"-->
+ </div>
+ </div>
+ </div>
+ <el-divider />
+ <div>
+ <div style="margin-bottom:20px">
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ヤ綔绔欙細
+ </div>
+ <el-tree
+ ref="workTree"
+ :data="workDialogForm.workTreeArr"
+ show-checkbox
+ node-key="code"
+ default-expand-all
+ :props="workTreeDefaultProps"
+ @check="checkBoxClick"
+ />
+ <!-- @check-change="checkChange"-->
+
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="workDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="workDialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ <!-- 鍏宠仈缂洪櫡瀵硅瘽妗�-->
+ <el-dialog
+ title="宸ュ簭鍏宠仈缂洪櫡"
+ :visible.sync="defectDialogVisible"
+ width="50%"
+ top="15vh"
+ :close-on-click-modal="false"
+ class="defectDialogVisible"
+ @closed="defectHandleClose"
+ @close="defectHandleClose"
+ >
+ <!-- @opened="handleOpenedRoles"-->
+
+ <div style="margin-bottom: 20px">
+ <i class="el-icon-s-comment" style="color:#42b983;" /> 宸ュ簭鍚嶇О锛歿{ defectTreeName }}
+ </div>
+
+ <div>
+ <!-- <div style="margin-bottom:20px">-->
+ <!-- <i class="el-icon-s-operation" style="color:#42b983;" /> 宸ヤ綔绔欙細-->
+ <!-- </div>-->
+ <el-tree
+ ref="defectTree"
+ :data="defectTree"
+ show-checkbox
+ node-key="code"
+ style="height: 400px;"
+ default-expand-all
+ :props="workTreeDefaultProps"
+ />
+ <!-- @check="checkBoxClick"-->
+ <!-- @check-change="checkChange"-->
+
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="defectDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="defectDialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
</div>
</template>
@@ -221,7 +342,15 @@
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
-import { AddUpdateStep, DeleteStep, StepSearch } from '@/api/zzmx'
+import {
+ AddUpdateStep,
+ DeleteStep, SaveStepAssociationDefect,
+ SaveStepAssociationEqp,
+ StepAssociationDefect,
+ StepAssociationEqp,
+ StepSearch
+} from '@/api/zzmx'
+import $ from 'jquery'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -268,7 +397,7 @@
tableData: [],
dialogVisible: false,
dialogForm: {
- 'idid': '',
+ 'id': '',
'stepcode': '',
'stepname': '',
'steptypecode': '',
@@ -290,8 +419,26 @@
enable: [
{ required: true, message: '璇烽�夋嫨鐘舵��', trigger: ['blur', 'change'] }
]
-
- }
+ },
+ workDialogVisible: false,
+ workDialogForm: {
+ stepcode: '', // 宸ュ簭缂栫爜
+ stepname: '', // 宸ュ簭鍚嶇О
+ workArr: [], // 宸ヤ綔绔欐墍鏈夋暟缁�
+ workGatherArr: [], // 宸ヤ綔绔欓泦鍚堟暟缁�
+ workCodeSelectedGatherArr: [], // 宸ヤ綔绔欓�変腑闆嗗悎鐨刢ode鏁扮粍
+ workTreeArr: [], // 宸ヤ綔绔欐爲鏁扮粍
+ workTreeSelectedArr: []// 宸ヤ綔绔欐爲閫変腑鐨勬暟缁刢ode闆嗗悎
+ },
+ workTreeDefaultProps: {
+ value: 'code',
+ label: 'name',
+ children: 'children'
+ },
+ defectDialogVisible: false,
+ defectTreeCode: '',
+ defectTreeName: '',
+ defectTree: []
}
},
@@ -421,14 +568,337 @@
},
/* 鍏宠仈宸ヤ綔绔欐ā鍧�*/
// 鍏宠仈宸ヤ綔绔欑偣鍑�
- workClick(row) {
+ async workClick(row) {
+ this.workDialogVisible = true
+ this.workDialogForm.stepcode = row.stepcode
+ this.workDialogForm.stepname = row.stepname
+ const { data: res } = await StepAssociationEqp({ stepcode: this.workDialogForm.stepcode })
+ this.workDialogForm.workArr = res
+ let workGatherArr = []
+ if (row.flwtype === 'W') { // 澶栧崗鎯呭喌涓�
+ workGatherArr = this.workDialogForm.workArr.filter(item => item.type === 'W')
+ } else if (row.flwtype === 'Z') { // 鑷埗鎯呭喌涓�
+ workGatherArr = this.workDialogForm.workArr.filter(item => item.type === 'E')
+ } else { // 鑷埗锛嬪鍗�
+ workGatherArr = this.workDialogForm.workArr
+ }
+ // this.workDialogForm.workArr[1].children = []
+ const nodeKey = []// 闇�瑕佹爲褰㈡暟鏄剧殑鍊�
+ workGatherArr.forEach((item, index) => {
+ this.workDialogForm.workGatherArr.push({
+ isSelected1: index === 0,
+ isSelected2: item.flag === 'Y',
+ code: item.code,
+ name: item.name,
+ type: item.type,
+ flag: item.flag
+ })
+ if (item.flag === 'Y' && item.children && item.children.length > 0) {
+ this.$nextTick(() => {
+ $("input[name='gather']").eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ nodeKey.push(it.code)
+ }
+ })
+ }
+ if (index === 0) {
+ if (item.children && item.children.length > 0) {
+ this.workDialogForm.workTreeArr = this.workDialogForm.workArr.filter(it => it.code === item.code)
+ this.workDialogForm.workTreeArr[0].name = '鍏ㄩ儴'
+ }
+ }
+ // item.flag === 'Y'&&item
+ })
+ console.log(nodeKey, 1)
+ this.$refs.workTree.setCheckedKeys(nodeKey)
+ this.workDialogForm.workTreeSelectedArr = nodeKey
+ console.log(this.workDialogForm.workGatherArr, 6)
+ console.log(this.workDialogForm.workTreeArr, 7)
},
+ // 澶х洅瀛愮偣鍑讳簨浠�
+ myCheckboxClick(val) {
+ console.log(val.code, 3)
+ // 鐐瑰嚮涓嶅悓鐨勭洅瀛愯繘琛岄�変腑鏍峰紡鍒囨崲
+ this.workDialogForm.workGatherArr.find(item => {
+ item.isSelected1 = item.code === val.code
+ })
+ this.workDialogForm.workTreeArr = this.workDialogForm.workArr.filter(item => item.code === val.code)
+ if (this.workDialogForm.workTreeArr[0].children && this.workDialogForm.workTreeArr[0].children.length > 0) {
+ this.workDialogForm.workTreeArr[0].name = '鍏ㄩ儴'
+ } else {
+ this.workDialogForm.workTreeArr = []
+ }
+ console.log(this.workDialogForm.workTreeArr, 8)
+ },
+ // 灏忕洅瀛愮偣鍑讳簨浠�
+ myCheckboxInputClick(val) {
+ val.isSelected2 = !val.isSelected2
+ console.log(val.code, 1)
+ this.workDialogForm.workCodeSelectedGatherArr = [...new Set(this.workDialogForm.workCodeSelectedGatherArr)]
+ // 1.绗竴绉嶆儏鍐� 灏忕洅瀛愪粠娌￠�変腑鍒伴�変腑
+ if (val.isSelected2) {
+ console.log('1.绗竴绉嶆儏鍐� 灏忕洅瀛愪粠娌￠�変腑鍒伴�変腑')
+ this.workDialogForm.workCodeSelectedGatherArr.push(val.code)
+
+ this.workDialogForm.workArr.forEach((item, index) => {
+ if (item.code === val.code) {
+ item.flag = 'Y'
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ it.flag = 'Y'
+ this.workDialogForm.workTreeSelectedArr.push(it.code)
+ })
+ }
+ }
+ })
+ }
+
+ // 2.绗簩绉嶆儏鍐� 灏忕洅瀛愪粠閫変腑鍒版病閫変腑
+ if (!val.isSelected2) {
+ console.log('2.绗簩绉嶆儏鍐� 灏忕洅瀛愪粠閫変腑鍒版病閫変腑')
+ this.workDialogForm.workCodeSelectedGatherArr = this.workDialogForm.workCodeSelectedGatherArr.filter(item => item !== val.code)
+ this.workDialogForm.workArr.forEach((item, index) => {
+ if (item.code === val.code) {
+ item.flag = 'N'
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ it.flag = 'N'
+ this.workDialogForm.workTreeSelectedArr.forEach((i, ind) => {
+ if (i === it.code) {
+ this.workDialogForm.workTreeSelectedArr.splice(ind, 1)
+ }
+ })
+ })
+ }
+ }
+ })
+ }
+ this.workDialogForm.workCodeSelectedGatherArr = [...new Set(this.workDialogForm.workCodeSelectedGatherArr)]
+
+ console.log(this.workDialogForm.workCodeSelectedGatherArr, 2)
+ console.log(this.workDialogForm.workTreeSelectedArr, 23)
+ // this.$refs.workTree.setCheckedKeys(this.workDialogForm.workCodeSelectedGatherArr)
+ this.$refs.workTree.setCheckedKeys(this.workDialogForm.workTreeSelectedArr)
+ },
+ // 鏍戝舰涓� 妗嗛�変腑
+ checkBoxClick(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys }) {
+ console.log(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys })
+
+ let checkedFatherCode = '' // 鎵惧埌 checkedFatherCode 鐖禼ode鍊�
+ this.workDialogForm.workArr.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
+ }
+ })
+ }
+ })
+
+ // 1.绗竴绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓洪浂
+ if (checkedKeys.length === 0 && halfCheckedKeys.length === 0) {
+ console.log('1.绗竴绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓洪浂')
+ console.log(obj.code, 10)
+ // this.workDialogForm.workCodeSelectedGatherArr = this.workDialogForm.workCodeSelectedGatherArr.filter(item => item !== obj.code)
+
+ this.workDialogForm.workGatherArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ this.workDialogForm.workGatherArr[index].isSelected2 = false
+
+ // item.isSelected1 = item.code === checkedFatherCode
+ this.workDialogForm.workCodeSelectedGatherArr = this.workDialogForm.workCodeSelectedGatherArr.filter(it => it !== checkedFatherCode)
+ this.$nextTick(() => {
+ // console.log($("input[name='gather']"))
+ $("input[name='gather']").eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+
+ this.workDialogForm.workArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ item.flag = 'N'
+ if (item.children && item.children.length > 0) {
+ item.children.forEach((it) => {
+ it.flag = 'N'
+ this.workDialogForm.workTreeSelectedArr.forEach((i, ind) => {
+ if (i === it.code) {
+ this.workDialogForm.workTreeSelectedArr.splice(ind, 1)
+ }
+ })
+ })
+ }
+ }
+ })
+ console.log(this.workDialogForm.workCodeSelectedGatherArr, 11)
+ console.log(this.workDialogForm.workTreeSelectedArr, 18)
+ }
+
+ // 2.绗簩绉嶆儏鍐� 鍗婂彾涓嶄负闆� 鍏ㄥ彾涓嶄负闆�
+ if (checkedKeys.length !== 0 && halfCheckedKeys.length !== 0) {
+ console.log('2.绗簩绉嶆儏鍐� 鍗婂彾涓嶄负闆� 鍏ㄥ彾涓嶄负闆�')
+ console.log(obj.code, 13)
+ // console.log(this.$refs.workTree, 22)
+
+ this.workDialogForm.workGatherArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ this.workDialogForm.workGatherArr[index].isSelected2 = true
+ // this.workDialogForm.workCodeSelectedGatherArr.push(obj.code)
+ this.$nextTick(() => {
+ $("input[name='gather']").eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+
+ this.workDialogForm.workArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ item.flag = 'Y'
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ if (it.code === obj.code) {
+ console.log(it.code, 21)
+ if (it.flag === 'Y' && it.code === obj.code) {
+ it.flag = 'N'
+ this.workDialogForm.workTreeSelectedArr.forEach((i, ind) => {
+ if (i === it.code) {
+ console.log(i, 333)
+ this.workDialogForm.workTreeSelectedArr.splice(ind, 1)
+ }
+ })
+ } else if (it.flag === 'N' && it.code === obj.code) {
+ it.flag = 'Y'
+ console.log(2222)
+ this.workDialogForm.workTreeSelectedArr.push(it.code)
+ }
+ }
+ })
+ }
+
+ console.log(this.workDialogForm.workTreeSelectedArr, 17)
+
+ // this.$nextTick(() => {
+ // $("input[name='gather']").eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ // })
+ }
+ })
+ }
+
+ // 3.绗笁绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓嶄负闆�
+ if (checkedKeys.length !== 0 && halfCheckedKeys.length === 0) {
+ console.log('3.绗笁绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓嶄负闆�')
+ console.log(obj.code, 12)
+ this.workDialogForm.workGatherArr.forEach((item, index) => {
+ if (item.code === obj.code) {
+ this.workDialogForm.workGatherArr[index].isSelected2 = true
+ this.workDialogForm.workCodeSelectedGatherArr.push(obj.code)
+ this.$nextTick(() => {
+ $("input[name='gather']").eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+
+ this.workDialogForm.workArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ item.flag = 'Y'
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ it.flag = 'Y'
+ this.workDialogForm.workTreeSelectedArr.push(it.code)
+ })
+ }
+ }
+ })
+ }
+ this.workDialogForm.workTreeSelectedArr = [...new Set(this.workDialogForm.workTreeSelectedArr)]
+
+ this.$refs.workTree.setCheckedKeys(this.workDialogForm.workTreeSelectedArr)
+ console.log(this.workDialogForm.workTreeSelectedArr, 14)
+ console.log(this.workDialogForm.workArr, 15)
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ workHandleClose() {
+ this.workDialogForm.workArr = []
+ this.workDialogForm.workGatherArr = []
+ this.workDialogForm.workTreeArr = []
+ this.$refs.workTree.setCheckedKeys([])
+ },
+ // 鍙栨秷
+ workDialogVisibleCancel() {
+ this.workDialogVisible = false
+ },
+ // 纭
+ async workDialogVisibleConfirm() {
+ this.workDialogForm.workTreeSelectedArr = [...new Set(this.workDialogForm.workTreeSelectedArr)]
+ console.log(this.workDialogForm.workTreeSelectedArr, 18)
+ console.log(this.workDialogForm.workArr, 20)
+ const data = []
+ this.workDialogForm.workArr.forEach(item => {
+ if (item.flag === 'Y' && item.children && item.children.length > 0) {
+ item.children.forEach(it => { // 淇濆瓨鎺ュ彛鍙紶鏈�瀛愰」 name浼犵殑鏄痶ype
+ if (it.flag === 'Y') {
+ data.push({ code: it.code, name: it.type })
+ }
+ })
+ }
+ })
+ console.log(data)
+ const res = await SaveStepAssociationEqp(this.workDialogForm.stepcode, data)
+ if (res.code === '200') {
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+ this.workDialogVisible = false
+ }
+ },
/* 鍏宠仈缂洪櫡*/
// 鍏宠仈缂洪櫡鐐瑰嚮
- defectClick(row) {
+ async defectClick(row) {
+ this.defectTreeCode = row.stepcode
+ this.defectTreeName = row.stepname
+ this.defectDialogVisible = true
+ const { data: res } = await StepAssociationDefect({ stepcode: row.stepcode })
+ // this.defectTree = res
+ this.defectTree.push({ code: 'QB', name: '鍏ㄩ儴', children: res, flag: 'N' })
+ console.log(this.defectTree, 6)
+ const nokeKey = []
+ this.defectTree[0].children.forEach(item => {
+ if (item.flag === 'Y') {
+ nokeKey.push(item.code)
+ }
+ })
+ console.log(nokeKey, 2)
+ this.$nextTick(() => {
+ this.$refs.defectTree.setCheckedKeys(nokeKey)
+ })
+ },
+ // 鍏抽棴
+ defectHandleClose() {
+ this.defectTree = []
+ },
+ // 鍙栨秷
+ defectDialogVisibleCancel() {
+ this.defectDialogVisible = false
+ },
+ // 纭
+ async defectDialogVisibleConfirm() {
+ const nodeKey = this.$refs.defectTree.getCheckedKeys()
+ const data = []
+ this.defectTree[0].children.forEach(item => {
+ if (nodeKey.includes(item.code)) {
+ console.log(item.code)
+ data.push({ code: item.code, name: item.name })
+ }
+ })
+ const res = await SaveStepAssociationDefect(this.defectTreeCode, data)
+ if (res.code === '200') {
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+ this.defectDialogVisible = false
+ }
}
}
}
@@ -445,9 +915,11 @@
border: none;
padding: 0 20px;
}
+
::v-deep .el-button--primary:hover {
border: none;
}
+
::v-deep .el-button--info {
height: 30px;
display: flex;
@@ -485,6 +957,70 @@
padding: 20px 100px !important;
}
+.defectDialogVisible {
+ ::v-deep .el-dialog__body {
+ padding: 20px 20px !important;
+ }
+}
+
+.workDialogVisible {
+ ::v-deep .el-dialog__body {
+ padding: 20px 20px !important;
+ }
+
+ .myCheckboxGroup {
+ display: flex;
+ flex-wrap: wrap;
+
+ .myCheckbox {
+ border: 1px solid #eee;
+ display: flex;
+ min-width: 100px;
+ padding: 10px;
+ margin: 10px 30px 0 0;
+ border-radius: 5px;
+ cursor: default;
+
+ .myCheckboxInput {
+ margin: 1px 5px 0 0;
+ cursor: pointer;
+ }
+
+ }
+
+ input[type=checkbox] {
+ cursor: pointer;
+ position: relative;
+ width: 14px;
+ height: 14px;
+ font-size: 14px;
+ }
+
+ input[type=checkbox]::after {
+ position: absolute;
+ top: 0;
+ color: $main_color;
+ width: 14px;
+ height: 14px;
+ display: inline-block;
+ visibility: visible;
+ padding-left: 0;
+ 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-radio__input.is-checked .el-radio__inner {
background-color: $main_color;
border-color: $main_color;
@@ -503,6 +1039,7 @@
height: 30px;
line-height: 30px;
}
+
::v-deep .el-input__inner:focus {
border-color: $main_color;
}
@@ -579,17 +1116,19 @@
border-color: $main_color;
}
-::v-deep .el-select .el-input__inner:focus{
+::v-deep .el-select .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
color: $main_color;
}
-::v-deep .el-checkbox__inner:hover{
+
+::v-deep .el-checkbox__inner:hover {
border-color: $main_color;
}
-::v-deep .el-textarea__inner:focus{
+
+::v-deep .el-textarea__inner:focus {
border-color: $main_color;
}
--
Gitblit v1.9.3