From 253b9c48b02d995540b84c1831e54e6baf8a1000 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 08 九月 2023 10:21:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/equipmentmaintain.vue | 162 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 118 insertions(+), 44 deletions(-)
diff --git a/src/components/view/equipmentmaintain.vue b/src/components/view/equipmentmaintain.vue
index 8992125..1b18d0b 100644
--- a/src/components/view/equipmentmaintain.vue
+++ b/src/components/view/equipmentmaintain.vue
@@ -22,33 +22,36 @@
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 560px;">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-select v-model="form.type" placeholder="璇烽�夋嫨绫诲瀷" >
+ <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
+ <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
+ <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
+ <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
</el-select>
</template>
</el-form-item>
<el-row>
<el-col :span="11">
<el-form-item label="宸ュ簭">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ュ簭"></el-input>
+ <template>
+ <el-select v-model="form.work"
+ placeholder="璇烽�夋嫨绫诲瀷" >
+ <el-option
+ v-for="item in process"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </template>
</el-form-item>
</el-col>
- <el-col :span="11" :offset="2">
- <el-form-item label="宸ヨ壓">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ヨ壓"></el-input>
- </el-form-item>
- </el-col>
</el-row>
<el-row>
<el-col :span="11">
- <el-form-item label="涓婄骇">
- <el-input v-model="form.name" placeholder="璇烽�夋嫨涓婄骇"></el-input>
+ <el-form-item label="璁惧">
+ <el-input v-model="form.father" placeholder="璇烽�夋嫨涓婄骇"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -59,7 +62,7 @@
</el-row>
<el-form-item label="鍗曚綅">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ崟浣�" style="width: 220px;"></el-input>
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" style="width: 220px;"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -78,33 +81,44 @@
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 560px;">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-select v-model="form.type" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
+ <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
+ <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
+ <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
</el-select>
</template>
</el-form-item>
<el-row>
<el-col :span="11">
<el-form-item label="宸ュ簭">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ュ簭"></el-input>
+ <template>
+ <el-select v-model="form.father"
+ placeholder="璇烽�夋嫨绫诲瀷" >
+ <el-option
+ v-for="item in process"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </template>
</el-form-item>
</el-col>
- <el-col :span="11" :offset="2">
- <el-form-item label="宸ヨ壓">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ヨ壓"></el-input>
- </el-form-item>
- </el-col>
</el-row>
-
<el-row>
<el-col :span="11">
- <el-form-item label="涓婄骇">
- <el-input v-model="form.name" placeholder="璇烽�夋嫨涓婄骇"></el-input>
+ <el-form-item label="璁惧">
+ <template>
+ <el-select v-model="form.work" placeholder="璇烽�夋嫨绫诲瀷" >
+ <el-option
+ v-for="item in higherlevel"
+ :key="item.name"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </template>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -115,12 +129,12 @@
</el-row>
<el-form-item label="鍗曚綅">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ崟浣�" style="width: 220px;"></el-input>
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" style="width: 220px;"></el-input>
</el-form-item>
- </el-form>
+ </el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button>
+ <el-button type="primary" @click="add">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -135,12 +149,12 @@
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
<el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
</el-select>
- <span>宸ュ簭锛�</span>
+ <!-- <span>宸ュ簭锛�</span>
<el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
<el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
</el-select>
<el-button size="mini"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌ヨ</span></el-button>
+ <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌ヨ</span></el-button> -->
</div>
<div class="thing">
<!-- 涓讳綋宸� -->
@@ -237,25 +251,87 @@
return {
search:{},
value:{},
- TYpe:[],
typeselect:0,
options:[],
process:[],
list: [],
TYpe:'',
selects:'',
- checkTreeNode:[],
- form:{},
+ process:{},
+ options:{},
+ checkTreeNode:{
+ id:2,
+ },
+ form:{
+ type:'',
+ father:'',
+ work:'',
+ name:'',
+ unit:'',
+
+
+ },
modifyevent:false,
dialogVisible:false,
tableData: [],
+ higherlevel:{},
}
},
mounted() {
- this.selectAllleft()
+ this.selectAllleft()
+ this.selectAllTeque()
},
methods:{
+ elForm() {},
+ //鏂板
+ choosePro() {//宸ュ簭
+ this.$axios.get(this.$api.url.choosePro,{
+ params:{techTemId:this.checkTreeNode.id}
+ }).then(res => {
+ this.process = res.data;
+ console.log(this.process);
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+ },
+ chooseDeiv() {//璁惧
+ this.$axios.get(this.$api.url.chooseDeiv,{
+ params:{techTemId:this.checkTreeNode.id}
+ }).then(res => {
+ this.higherlevel = res.data;
+ console.log(this.process);
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+ },
+ //鏂板
+ event(){
+ this.dialogVisible = true
+ this.choosePro()
+ this.chooseDeiv()
+ },
+ //纭
+ add() {
+ this.dialogVisible = false
+ },
+ addQeMode(){
+ this.$axios.get(this.$api.url.addQeMode,{
+ devId:this.form.xxx,
+ techTemId:this.form.xxx,
+ technicalModelId:this.form.xxx,
+ })
+ },
+
+ //缂栬緫
+ childrenClick() {
+ this.modifyevent=true
+ this.chooseTechFath()
+ },
TYpe() {
this.typeselect = val
this.selectAllleft()
@@ -266,6 +342,7 @@
this.selectAllTeque()
},
+
//涓讳綋宸�
selectAllleft() {
this.$axios.get(this.$api.url.selectAllleft,{
@@ -285,9 +362,6 @@
})
},
- event(){
- this.dialogVisible = true
- },
modify(){
this.modifyevent = true
},
--
Gitblit v1.9.3