From 5535157ce811a29c4e3c68148fd110c9c5a4137b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 05 九月 2023 16:39:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/standardLibrary/index.vue | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index 3b65eea..d436ee8 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -2,10 +2,10 @@
<div class="standard-library-main">
<div class="content-main">
<div class="library-bom" style="width: 300px">
- <el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
+ <el-input clearable v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
<el-button type="text">鍏ㄩ儴</el-button>
<el-tree ref="tree" style="width: 100%" class="filter-tree" :data="standardTree" :props="defaultProps"
- node-key="id" highlight-current default-expand-all :filter-node-method="filterNode"
+ node-key="id" :highlight-current="true" :default-expand-all="true" :filter-node-method="filterNode"
:render-content="renderContent" @node-click="nodeClick" />
</div>
<div class="library-table" style="width: 80%">
@@ -65,22 +65,22 @@
<el-dialog class="addTree" title="娣诲姞鏍囧噯鎸囨爣" width="28%" :visible.sync="addTreeFormVisible">
<el-form v-model="addTreeForm" label-position="top">
<el-form-item label="鏍囧噯绫诲瀷">
- <el-cascader v-model="addTreeForm.addTypeArr" :options="formTypeOptions"
+ <el-cascader v-model="addTreeForm.addTypeArr" :options="formTypeOptions"
:props="{ ...defaultProps, checkStrictly: true }" clearable @change="changeCascader"/>
</el-form-item>
<el-form-item v-show="addTreeForm.addTypeArr.length < 2" label="鐗╂枡鍚嶇О">
- <el-input v-model="addTreeForm.materialName" />
+ <el-input @change="changeSample" v-model="addTreeForm.materialName" />
</el-form-item>
<el-form-item v-show="addTreeForm.addTypeArr.length < 3" label="鎵ц鏍囧噯">
- <el-input v-model="addTreeForm.standardName" />
+ <el-input v-model="addTreeForm.standardName" />
</el-form-item>
<el-form-item v-show="addTreeForm.addTypeArr.length < 4" label="瑙勬牸鍨嬪彿">
- <el-input v-model="addTreeForm.specificationsName" />
+ <el-input v-model="addTreeForm.specificationsName" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="subAddTreeForm">纭� 瀹�</el-button>
- <el-button @click="addTreeFormVisible = false">鍙� 娑�</el-button>
+ <el-button @click="clear">鍙� 娑�</el-button>
</div>
</el-dialog>
</div>
@@ -108,6 +108,7 @@
export default {
data() {
return {
+ filterNodeData: [],
options: [],
versionValue: "",
deleteList: [],
@@ -144,6 +145,41 @@
},
mounted() {},
methods: {
+ clear(){
+ this.addTreeFormVisible = false;
+ this.addTreeForm.addTypeArr=[];
+ this.addTreeForm.specificationsName='';
+ this.addTreeForm.materialName=''
+ this.addTreeForm.standardName=''
+ },
+ changeSample(){
+ // console.log(this.standardTree);
+ // console.log(this.addTreeForm);
+ // console.log(this.addTreeForm.addTypeArr.length);
+ let selectType=this.standardTree.filter(item=>{
+ return item.id===this.addTreeForm.addTypeArr[0]
+ })[0];
+ if(this.addTreeForm.addTypeArr.length==1){
+ let samples=selectType.children.filter(item=>{
+ return item.name===this.addTreeForm.materialName
+ })[0]
+ if(samples===undefined||samples===[]){
+ this.$message({
+ message: '璇峰厛鍦ㄥ熀纭�鏁版嵁涓坊鍔犺銆�'+this.addTreeForm.materialName+'銆戞牱鍝�',
+ type: 'warning'
+ });
+ return false;
+ }
+ }
+ return true
+ },
+ oneSize(){},
+ twoSize(){
+ return true;
+ },
+ threeSize(){
+ return true;
+ },
async initSelect() {
this.options = [];
this.versionValue = "";
@@ -189,7 +225,7 @@
})
.catch(() => {});
},
- filterNode(value, data) {
+ filterNode(value, data,node) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
@@ -242,6 +278,7 @@
//TODO handle the exception
}
});
+
},
getDefault(arr, index) {
for (const item of arr) {
@@ -331,6 +368,17 @@
);
},
async subAddTreeForm() {
+ if(this.addTreeForm.addTypeArr.length==0){
+ this.$message({
+ message: '璇峰厛閫夋嫨鏍囧噯绫诲瀷锛�',
+ type: 'warning'
+ });
+ return
+ }
+ let handelerSample=this.changeSample()
+ if(!handelerSample){
+ return;
+ }
let res = null;
try {
switch (this.addTreeForm.addTypeArr.length) {
@@ -360,6 +408,11 @@
this.addTreeFormVisible = false;
this.getStandardTree();
this.getTableByClick(this.selectData, this.versionValue);
+ this.addTreeForm.addTypeArr=[];
+ this.addTreeForm.specificationsName=''
+ this.addTreeForm.materialName=''
+ this.addTreeForm.standardName=''
+ // console.log(this.addTreeForm);
},
changeCascader(data) {
this.addTreeForm.addTypeArr = data;
@@ -380,8 +433,11 @@
});
},
selectDataList() {
+ let i=0
this.tableData.forEach((a) => {
+ a.id="0"+i
a.code = "[1]";
+ i++;
if (a.children != undefined) {
a.children.forEach((b) => {
b.code = "[2]";
--
Gitblit v1.9.3