From a1917eca0b4f0fabf9f13648a840c2be8e2bf7f9 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 20 九月 2023 15:41:26 +0800
Subject: [PATCH] modified: src/components/view/standard-table/target.vue modified: src/components/view/standard.vue
---
src/components/view/record-content.vue | 282 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 153 insertions(+), 129 deletions(-)
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index 62ecc41..ac59e21 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -1,112 +1,3 @@
-<style scoped>
- .title .el-button {
- height: 32px;
- border: 1px solid rgba(190, 190, 190, 0.44);
- box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
- padding: 0 12px;
- }
-
- .title {
- margin-bottom: 10px;
- padding: 0 20px;
- }
-
- .title * {
- font-size: 16px;
- }
-
- .choose {
- padding: 21px 24px;
- display: flex;
- align-items: center;
- background-color: #fff;
- border-bottom: 3px solid rgb(245, 247, 251);
- }
-
- .choose * {
- font-size: 14px;
- }
-
- .choose .el-button {
- height: 32px;
- border: 1px solid rgba(190, 190, 190, 0.44);
- box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
- padding: 0 12px;
- }
-
- .thing {
- width: 100%;
- height: calc(100% - 120px);
- background-color: #fff;
- display: flex;
- }
-
- .thing .left {
- width: 295px;
- height: calc(100% - 20px);
- border-right: 3px solid rgb(245, 247, 251);
- padding: 16px;
- }
-
- .thing .left .custom-tree-node span {
- font-size: 14px;
- }
-
- .thing .left .custom-tree-node {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: space-between;
- font-size: 14px;
- padding-right: 8px;
- }
-
- .node_i {
- color: orange;
- }
-
- .el-icon-delete {
- display: none;
- color: #004EA2;
- }
-
- .custom-tree-node:hover .el-icon-delete {
- display: inline;
- }
-
- .thing .right {
- width: calc(100% - 305px);
- height: calc(100% - 25px);
- overflow: hidden;
- padding: 10px;
- }
-
- .table_do {
- color: #004ea0;
- cursor: pointer;
- }
-</style>
-<style>
- .record_content .title .el-button * {
- font-size: 14px;
- }
-
- .record_content .title .el-button--default {
- color: #004EA2;
- }
-
- .record_content .thing .left .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
- background: rgba(58, 124, 253, 0.2);
- color: #004EA2;
- }
-
- .record_content .el-tree-node__content {
- height: 30px;
- border-radius: 2px;
- }
-</style>
-
-
<template>
<div class="record_content">
<div class="title">
@@ -141,13 +32,12 @@
<div class="left">
<el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable @input="query"></el-input>
<el-tree :data="list" ref="tree"
- style="height: 500px;overflow-y: auto;"
:props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
@node-click="handleNodeClick" highlight-current
: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.cord }}{{ data.name }}</span>
+ {{ data.code }}{{ data.name }}</span>
<!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
</el-button> -->
@@ -195,8 +85,6 @@
<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.techFather"
- placeholder="璇烽�夋嫨"
<el-select v-model="edit.techFather"
placeholder="璇烽�夋嫨"
disabled
@@ -252,12 +140,14 @@
</span>
</el-dialog>
<!-- 鏂板寮圭獥 -->
- <el-dialog title="鐢熶骇璁板綍鏂板" :visible.sync="dialogVisible" width="35%">
+ <el-dialog title="鐢熶骇璁板綍鏂板" :visible.sync="dialogVisible" :rules="Rules"
+ ref="ruleForm" width="35%">
<div>
<el-form ref="form" :model="form" label-width="80px">
- <el-form-item label="绫诲瀷">
+ <el-form-item label="绫诲瀷" prop="type">
<template>
- <el-select v-model="form.type" @change="edittype" placeholder="璇烽�夋嫨" style="width: 480px;">
+ <el-select v-model="form.type"
+ @change="edittype" placeholder="璇烽�夋嫨" style="width: 100%;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -265,11 +155,11 @@
</el-select>
</template>
</el-form-item>
- <el-form-item label="宸ュ簭">
+ <el-form-item label="宸ュ簭" prop="work">
<template>
<el-select v-model="form.work"
@change="workevent"
- placeholder="璇烽�夋嫨" style="width: 480px;">
+ placeholder="璇烽�夋嫨" style="width: 100%;">
<el-option
v-for="item in process"
:key="item.name"
@@ -279,9 +169,9 @@
</el-select>
</template>
</el-form-item>
- <el-form-item label="宸ヨ壓鍚嶇О">
+ <el-form-item label="宸ヨ壓鍚嶇О" prop="name">
<template>
- <el-select v-model="form.craft" placeholder="璇烽�夋嫨" style="width: 480px;">
+ <el-select v-model="form.craft" placeholder="璇烽�夋嫨" style="width: 100%;">
<el-option
v-for="item in craftapi"
:key="item.id"
@@ -291,19 +181,19 @@
</el-select>
</template>
</el-form-item>
- <el-form-item label="璁板綍">
+ <el-form-item label="璁板綍" prop="record">
<el-input v-model="form.record"></el-input>
</el-form-item>
<el-form-item label="澶囨敞">
<el-input v-model="form.remarks"></el-input>
</el-form-item>
- <el-form-item label="鍗曚綅">
+ <el-form-item label="鍗曚綅" prop="unit">
<el-input v-model="form.unit"></el-input>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="add">纭� 瀹�</el-button>
+ <el-button type="primary" @click="add(form)">纭� 瀹�</el-button>
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -370,7 +260,14 @@
<script>
export default {
data() {
- return {
+ var checktype = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('绫诲瀷涓嶈兘涓虹┖'));
+ }else{
+ return callback
+ }
+ };
+ return {
search: {
type: 0,
technology: null
@@ -387,11 +284,17 @@
remarks:'',
unit:'',
},
+ Rules:{
+ type:{validator:checktype,required:true,message:'绫诲瀷涓嶈兘涓虹┖',trigger:'change'},
+ work:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
+ name:{required:true,message:'宸ヨ壓涓嶈兘涓虹┖',trigger:'change'},
+ record:{required:true,message:'璁板綍涓嶈兘涓虹┖',trigger:'blur'},
+ unit:{required:true,message:'鍗曚綅涓嶈兘涓虹┖',trigger:'blur'},
+ },
modifyVisible:false,
dialogVisible:false,
process: {},
list: [],
- checkTreeNode: {},
tableData: [],
upIndex: 0,
selects: [],
@@ -431,7 +334,6 @@
this.selectAllleft()
},
edittype(val) {
- // this.typeselect = ''
this.typeselect = val
this.chooseTechFath()
},
@@ -468,12 +370,21 @@
"Content-Type": "application/json"
}
}
- )
+ ).then(res =>{
+ this.selectjilu()
+ })
},
- add() {
+ add(formName) {
this.dialogVisible = false
this.addRecord()
- this.selectjilu()
+ // this.$refs[formName].validate((valid) => {
+ // if (valid) {
+ // alert('submit!');
+ // } else {
+ // console.log('error submit!!');
+ // return false;
+ // }
+ // });
this.form = {};
},
query() {
@@ -497,6 +408,7 @@
console.log(one);
let name=one.children[0].id
console.log(name);
+ this.checkTreeNode.id = name
this.selectjiluStart(name)
this.selectDataList();
});
@@ -512,6 +424,7 @@
},
//selectjilu checkTreeNode
selectjilu() {
+ console.log(this.checkTreeNode.id);
this.$axios.get(this.$api.url.selectjilu,{
params:{id:this.checkTreeNode.id}
}).then(res => {
@@ -657,3 +570,114 @@
}
}
</script>
+
+<style scoped>
+ .title .el-button {
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
+ }
+
+ .title {
+ margin-bottom: 10px;
+ padding: 0 20px;
+ }
+
+ .title * {
+ font-size: 16px;
+ }
+
+ .choose {
+ padding: 21px 24px;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ border-bottom: 3px solid rgb(245, 247, 251);
+ }
+
+ .choose * {
+ font-size: 14px;
+ }
+
+ .choose .el-button {
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
+ }
+
+ .thing {
+ width: 100%;
+ height: calc(100% - 120px);
+ background-color: #fff;
+ display: flex;
+ }
+
+ .thing .left {
+ width: 295px;
+ height: calc(100% - 20px);
+ border-right: 3px solid rgb(245, 247, 251);
+ padding: 16px;
+ overflow-y: auto;
+ }
+
+ .thing .left .custom-tree-node span {
+ font-size: 14px;
+ }
+
+ .thing .left .custom-tree-node {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 14px;
+ padding-right: 8px;
+ }
+
+ .node_i {
+ color: orange;
+ }
+
+ .el-icon-delete {
+ display: none;
+ color: #004EA2;
+ }
+
+ .custom-tree-node:hover .el-icon-delete {
+ display: inline;
+ }
+
+ .thing .right {
+ width: calc(100% - 305px);
+ height: calc(100% - 25px);
+ overflow: hidden;
+ padding: 10px;
+ }
+
+ .table_do {
+ color: #004ea0;
+ cursor: pointer;
+ }
+</style>
+<style>
+ .record_content .title .el-button * {
+ font-size: 14px;
+ }
+
+ .record_content .title .el-button--default {
+ color: #004EA2;
+ }
+
+ .record_content .thing .left .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+ background: rgba(58, 124, 253, 0.2);
+ color: #004EA2;
+ }
+
+ .record_content .el-tree-node__content {
+ height: 30px;
+ border-radius: 2px;
+ }
+</style>
+
+
--
Gitblit v1.9.3