From 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 16:47:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/standardLibrary/index.vue | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 28 deletions(-)
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index 2f37add..d4e3125 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -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>
@@ -132,6 +132,7 @@
formTypeOptions: [],
addTreeForm: {
addTypeArr: [],
+ specificationsName: ""
}
};
},
@@ -145,6 +146,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 = "";
@@ -310,29 +346,24 @@
}) {
// 鍒ゆ柇鏄惁鏄埗鑺傜偣鎴栨枃浠跺す
const isFolder = "children" in data;
- return ( <
- span class = "tree-node" > {
- isFolder ? ( <
- i class = {
- node.expanded ?
- "el-icon-folder-opened blue-folder" : "el-icon-folder blue-folder"
- } >
- <
- /i>
- ) : ( <
- i class = "el-icon-document blue-folder" > < /i>
- )
- } <
- div class = "tree-lable" > [{
- node.level
- }] {
- data.name
- } <
- /div> < /
- span >
+ return ( <span class="tree-node"> {
+ isFolder ? ( <i class = {node.expanded ?"el-icon-folder-opened blue-folder" : "el-icon-folder blue-folder"} ></i>
+ ) : ( <i class = "el-icon-document blue-folder" > </i>)
+ } <div class = "tree-lable" > [{node.level}] {data.name} </div> </span>
);
},
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) {
@@ -362,8 +393,11 @@
this.addTreeFormVisible = false;
this.getStandardTree();
this.getTableByClick(this.selectData, this.versionValue);
- this.addTreeForm=null
- this.addTreeForm.addTypeArr=[]
+ this.addTreeForm.addTypeArr=[];
+ this.addTreeForm.specificationsName=''
+ this.addTreeForm.materialName=''
+ this.addTreeForm.standardName=''
+ // console.log(this.addTreeForm);
},
changeCascader(data) {
this.addTreeForm.addTypeArr = data;
@@ -395,7 +429,6 @@
});
}
});
- console.log(this.tableData);
},
// 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
// 鍏ㄩ��/鍙栨秷閫夋搷浣�
--
Gitblit v1.9.3