Переглянути джерело

7384,7379,操作符限制

zhouna 4 роки тому
батько
коміт
b58d0e584e

+ 6 - 1
src/components/knowledgeExtra/AddNewRule.vue

@@ -339,6 +339,10 @@
                 this.$refs['form'].validate((valid) => {
                 this.$refs['form'].validate((valid) => {
                     if (valid) {
                     if (valid) {
                         const groupsRef = this.$refs['groups'];
                         const groupsRef = this.$refs['groups'];
+                        if(!groupsRef||groupsRef.length===0){
+                            callBack();
+                            return;
+                        }
                         let groupRef=null,goOn=true;
                         let groupRef=null,goOn=true;
                         for(let i=0;i<groupsRef.length;i++){
                         for(let i=0;i<groupsRef.length;i++){
                             groupRef=groupsRef[i].$refs['group'];
                             groupRef=groupsRef[i].$refs['group'];
@@ -361,12 +365,13 @@
             confirm(){
             confirm(){
                 const _this=this;
                 const _this=this;
                 this.validateForms(function(){
                 this.validateForms(function(){
-                    _this.form.klRuleByIdSub=undefined;
+                    delete _this.form.klRuleByIdSub;
                     _this.form.klRuleInfoSaveSub = _this.form.parHasSub?_this.formatGroups():undefined;
                     _this.form.klRuleInfoSaveSub = _this.form.parHasSub?_this.formatGroups():undefined;
                     let params = _this.form;
                     let params = _this.form;
                     if(_this.parId){//修改/复制
                     if(_this.parId){//修改/复制
                         params = Object.assign({},_this.form,{parId:_this.isCopy?undefined:_this.parId})
                         params = Object.assign({},_this.form,{parId:_this.isCopy?undefined:_this.parId})
                     }
                     }
+                    console.log(params)
                     _this.saveRule(params);
                     _this.saveRule(params);
                 });
                 });
             },
             },

+ 9 - 7
src/components/knowledgeExtra/SubConditions.vue

@@ -54,7 +54,7 @@
                     </el-option>
                     </el-option>
                 </el-select>
                 </el-select>
             </el-form-item>
             </el-form-item>
-            <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最大值:" required>
+            <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最大值:">
                 <div class="select-item clearfix">
                 <div class="select-item clearfix">
                     <el-col :span="4">
                     <el-col :span="4">
                         <el-form-item prop="subMaxOperator">
                         <el-form-item prop="subMaxOperator">
@@ -62,7 +62,7 @@
                                        placeholder="请选择"
                                        placeholder="请选择"
                                        size="small">
                                        size="small">
                                 <el-option
                                 <el-option
-                                        v-for="item in operTypeList"
+                                        v-for="item in operMaxList"
                                         :key="item.key"
                                         :key="item.key"
                                         :label="item.name"
                                         :label="item.name"
                                         :value="item.key">
                                         :value="item.key">
@@ -82,7 +82,7 @@
                     </el-col>
                     </el-col>
                 </div>
                 </div>
             </el-form-item>
             </el-form-item>
-            <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最小值:" required>
+            <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最小值:">
                 <div class="select-item clearfix">
                 <div class="select-item clearfix">
                     <el-col :span="4">
                     <el-col :span="4">
                         <el-form-item prop="subMinOperator">
                         <el-form-item prop="subMinOperator">
@@ -90,7 +90,7 @@
                                        placeholder="请选择"
                                        placeholder="请选择"
                                        size="small">
                                        size="small">
                                 <el-option
                                 <el-option
-                                        v-for="item in operTypeList"
+                                        v-for="item in operMinList"
                                         :key="item.name"
                                         :key="item.name"
                                         :label="item.name"
                                         :label="item.name"
                                         :value="item.name">
                                         :value="item.name">
@@ -132,12 +132,13 @@
             return {
             return {
                 baseTermTypeList:[],
                 baseTermTypeList:[],
                 typeList:[],
                 typeList:[],
-                operTypeList:[{name:'>',key:'>'},
-                    {name:'>=',key:'>='},
-                    {name:'<',key:'<'},
+                operMaxList:[
                     {name:'<=',key:'<='},
                     {name:'<=',key:'<='},
                     {name:'=',key:'='},
                     {name:'=',key:'='},
                 ],
                 ],
+                operMinList:[{name:'>',key:'>'},
+                    {name:'>=',key:'>='},
+                ],
                 dataTypes:[{id:'1',name:'数值类型'},{id:'2',name:'文本类型'}],
                 dataTypes:[{id:'1',name:'数值类型'},{id:'2',name:'文本类型'}],
                 conceptList:[],
                 conceptList:[],
                 rules:{
                 rules:{
@@ -199,6 +200,7 @@
         },
         },
         methods:{
         methods:{
             dataTypeChange(val){
             dataTypeChange(val){
+                this.groupData.subEqOperator=val==='2'?'=':undefined;
                 this.groupData.dataType=val;
                 this.groupData.dataType=val;
                 this.clearNumText();
                 this.clearNumText();
             },
             },