From 4beefba67c39fc863b849e312b86d8f51a89005f Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 08 九月 2023 17:15:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/record-content.vue | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index 12b98b3..a5b230f 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -114,7 +114,7 @@
<el-col :span="12" style="line-height: 32px;">璁板綍鍐呭缁存姢</el-col>
<el-col :span="12" style="text-align: right;">
<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="addend">鏂板</el-button>
- <el-button icon="el-icon-edit-outline" @click="modify">淇敼</el-button>
+ <!-- <el-button icon="el-icon-edit-outline" @click="modify">淇敼</el-button> -->
<el-button icon="el-icon-delete" @click="dels">鍒犻櫎</el-button>
</el-col>
</el-row>
@@ -144,9 +144,9 @@
<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>
@@ -157,7 +157,7 @@
</el-table-column>
<el-table-column type="index" label="搴忓彿" width="70">
</el-table-column>
- <el-table-column prop="name" label="鍚嶇О">
+ <el-table-column prop="name" label="璁板綍鍐呭">
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅">
</el-table-column>
@@ -178,7 +178,7 @@
<el-col :span="4" style="font-size: 14px;text-align: right;">绫诲瀷:</el-col>
<el-col :span="16" :offset="1">
<template>
- <el-select v-model="edit.type" placeholder="璇烽�夋嫨绫诲瀷" style="width: 310px;">
+ <el-select v-model="edit.type" placeholder="璇烽�夋嫨" style="width: 310px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -192,7 +192,7 @@
<el-col :span="16" :offset="1">
<template>
<el-select v-model="edit.techFather"
- placeholder="璇烽�夋嫨绫诲瀷"
+ placeholder="璇烽�夋嫨"
@change="workevent"
style="width: 310px;">
<el-option
@@ -209,7 +209,7 @@
<el-col :span="4" style="font-size: 14px;text-align: right;">宸ヨ壓:</el-col>
<el-col :span="16" :offset="1">
<template>
- <el-select v-model="edit.techName" placeholder="璇烽�夋嫨绫诲瀷" style="width: 310px;">
+ <el-select v-model="edit.techName" placeholder="璇烽�夋嫨" style="width: 310px;">
<el-option
v-for="item in craftapi"
:key="item.id"
@@ -221,7 +221,7 @@
</el-col>
</el-row>
<el-row style="line-height: 46px;">
- <el-col :span="4" style="font-size: 14px;text-align: right;">鍚嶇О:</el-col>
+ <el-col :span="4" style="font-size: 14px;text-align: right;">璁板綍鍐呭:</el-col>
<el-col :span="16" :offset="1">
<el-input v-model="upData.name" size="small" clearable></el-input>
</el-col>
@@ -250,7 +250,7 @@
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="form.type" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <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>
@@ -262,7 +262,7 @@
<template>
<el-select v-model="form.work"
@change="workevent"
- placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ placeholder="璇烽�夋嫨" style="width: 480px;">
<el-option
v-for="item in process"
:key="item.name"
@@ -274,7 +274,7 @@
</el-form-item>
<el-form-item label="宸ヨ壓鍚嶇О">
<template>
- <el-select v-model="form.craft" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <el-select v-model="form.craft" placeholder="璇烽�夋嫨" style="width: 480px;">
<el-option
v-for="item in craftapi"
:key="item.id"
@@ -307,7 +307,7 @@
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <el-select v-model="value" placeholder="璇烽�夋嫨" style="width: 480px;">
<el-option
v-for="item in options"
:key="item.value"
@@ -319,7 +319,7 @@
</el-form-item>
<el-form-item label="宸ュ簭">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <el-select v-model="value" placeholder="璇烽�夋嫨" style="width: 480px;">
<el-option
v-for="item in options"
:key="item.value"
@@ -331,7 +331,7 @@
</el-form-item>
<el-form-item label="宸ヨ壓鍚嶇О">
<template>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲瀷" style="width: 480px;">
+ <el-select v-model="value" placeholder="璇烽�夋嫨" style="width: 480px;">
<el-option
v-for="item in options"
:key="item.value"
@@ -366,8 +366,7 @@
return {
search: {
type: 0,
- name: 2,
- technology: 2
+ technology: null
},
options:[],
value:{},
@@ -393,7 +392,7 @@
typeselect:0,
upDia: false,
checkTreeNode:{
- id:2,
+ id:1,
},
upData:{},
edit:{
@@ -581,6 +580,7 @@
this.tableData.splice(index,1)
this.upData.id = rows.id
this.delQueById()
+ this.selectjilu()
},
upContent(ob) {
--
Gitblit v1.9.3