From 437b40045ce48b28e2817b0f9f9998d3a881ebe1 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 05 九月 2023 16:39:02 +0800
Subject: [PATCH] modified: src/components/experiment/template_testReport/index.vue modified: src/utils/GlobalClickMixin.js modified: src/views/experiment/passRateStatistics/index.vue modified: src/views/experiment/planAssignments/plan.vue modified: src/views/laboratory/measure/index.vue modified: src/views/laboratory/personnel/index.vue modified: src/views/standardLibrary/index.vue
---
src/views/standardLibrary/index.vue | 64 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index d476cc5..9dea403 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>
@@ -144,6 +144,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 = "";
@@ -331,6 +366,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,8 +406,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;
@@ -393,7 +442,6 @@
});
}
});
- console.log(this.tableData);
},
// 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
// 鍏ㄩ��/鍙栨秷閫夋搷浣�
--
Gitblit v1.9.3