From 9ddf303ca99059fac2d6b83829f2d39c04d1cf5f Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期三, 13 九月 2023 18:04:20 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before --- src/components/view/self-inspection.vue | 66 ++++++++++++++++++++++++++++----- 1 files changed, 56 insertions(+), 10 deletions(-) diff --git a/src/components/view/self-inspection.vue b/src/components/view/self-inspection.vue index e52bfac..55b8cbc 100644 --- a/src/components/view/self-inspection.vue +++ b/src/components/view/self-inspection.vue @@ -141,15 +141,15 @@ <div class="thing"> <div class="left"> <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable @input="(val)=>$refs.tree.filter(val)"></el-input> - <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all + <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen" @node-collapse="nodeClose" :filter-node-method="filterNode" :key="upIndex"> <div class="custom-tree-node" slot-scope="{ node, data }"> <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i> {{data.code}} {{ data.name }}</span> - <el-button type="text" size="mini" @click.stop="remove(node, data)"> + <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)"> <i class="el-icon-delete"></i> - </el-button> + </el-button> --> </div> </el-tree> </div> @@ -216,7 +216,7 @@ <el-form ref="form" :model="form" label-width="80px"> <el-form-item label="绫诲瀷"> <template> - <el-select v-model="form.value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;"> + <el-select v-model="form.value" placeholder="璇烽�夋嫨" @change="edittype" style="width: 480px;"> <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option> <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option> <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option> @@ -228,7 +228,7 @@ <template> <el-select v-model="form.procedure" @change="workevent" - placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;"> + placeholder="璇烽�夋嫨" style="width: 480px;"> <el-option v-for="item in process" :key="item.name" @@ -242,7 +242,7 @@ <el-col :span="10"> <el-form-item label="宸ヨ壓鍚嶇О"> <template> - <el-select v-model="form.name" placeholder="璇烽�夋嫨绫诲瀷" style="width: 180px;"> + <el-select v-model="form.name" placeholder="璇烽�夋嫨" style="width: 180px;"> <el-option v-for="item in craftapi" :key="item.id" @@ -382,7 +382,7 @@ product: [], list: [], checkTreeNode: { - id:2, + id:'', }, tableData: [], upIndex: 0, @@ -406,6 +406,22 @@ this.selectAllSelf() }, methods: { + selectDataList() { + this.list.forEach(a => { + a.code = '[1]' + if (a.children != undefined) { + a.children.forEach(b => { + b.code = '[2]' + if (b.children != undefined) { + b.children.forEach(c => { + c.code = '[3]' + }) + } + }) + } + }) + this.upIndex++ + }, //鍒犻櫎 delSelfcheck() { console.log(this.upData.id); @@ -426,9 +442,10 @@ ids:this.delete }) }, + //缂栬緫 + writeRecordById() { - - + }, //鏂板 add() { this.dialogVisible = false @@ -473,6 +490,11 @@ console.log(this.typeselect); this.selectAllleft() }, + edittype(val) { + // this.typeselect = '' + this.typeselect = val + this.chooseTechFath() + }, //涓讳綋宸� selectAllleft() { this.$axios.get(this.$api.url.selectAllleft,{ @@ -480,9 +502,33 @@ }).then(res => { this.list = res.data; console.log(this.list); + this.selectDataList() + this.$nextTick(() => { + this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓� + }) + console.log("==========="); + console.log(this.list); + let one=this.list.filter(item=>{ + return item.children.length>0 + })[0] + console.log(one); + let id =one.children[0].id + console.log(id); + this.selectAllSelfStart(id) + this.selectDataList(); + console.log("==========="); }) }, - //selectAllSelf checkTreeNode + //榛樿 + selectAllSelfStart(id) { + this.$axios.get(this.$api.url.selectAllSelf,{ + params:{id:id} + }).then(res => { + this.tableData = res.data; + console.log(this.tableData); + }) + }, + //鍙� selectAllSelf() { this.$axios.get(this.$api.url.selectAllSelf,{ params:{id:this.checkTreeNode.id} -- Gitblit v1.9.3