Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

src/components/knowledgeExtra/AddNewRule.vue

@@ -20,7 +20,7 @@
                                     :value="item.id">
                             </el-option>
                         </el-select>
-                        <span class="tip-text">注：更改术语类型，将会清空已填写的规则内容~</span>
+                        <span class="tip-text">注：更改规则类型，将会清空已填写的规则内容~</span>
                     </el-form-item>
                     <el-form-item label="规则术语类型：" prop="parLenCode">
                         <el-select v-model="form.parLenCode"
@@ -140,8 +140,8 @@
                     parHasSub:[{ required: true, message: '请选择有无子条件',trigger: ['change'] }],
                     parMsg:[{ required: true, message: '请输入附加信息',trigger: ['change'] },{
                         validator: (rule,value,callback)=>{
-                            if(value.length>300){
-                                callback(new Error('附加信息不能超过300字'));
+                            if(value.length>100){
+                                callback(new Error('附加信息不能超过100字'));
                             }else{
                                 callback();
                             }}, trigger: 'change'
@@ -181,7 +181,7 @@
                 this.subRuleMaxNum=obj.number;
             },
             'form.parConceptId':function(val){
-                if(this.checkFirstPlace) {
+                if(val&&this.checkFirstPlace&&this.conceptList) {
                     this.firstPlace = this.conceptList.find((it) => it.conceptId === val);
                     this.firstPlace['checkedType']=this.ruleTermCodeStr;
                 }else{
@@ -318,7 +318,7 @@
                         subMinValue:'',
                         subEqValue:'',
                     };
-                }console.log(temp)
+                }
                 this.subGroups.push([temp]);
             },
             delGroup(i){
@@ -383,7 +383,7 @@
                     _this.form.klRuleInfoSaveSub = _this.form.parHasSub?_this.formatGroups():undefined;
                     let params = _this.form;
                     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,parStatus:_this.isCopy?1:_this.form.parStatus})
                     }
                     console.log(params)
                     _this.saveRule(params);

src/components/knowledgeExtra/RuleManager.vue

@@ -128,7 +128,7 @@
                         <span style="margin:0 3px;">|</span>
                         <el-button type="text" size="small" @click="editData(scope.row.parId,true)">复制</el-button>
                         <span style="margin:0 3px;">|</span>
-                        <el-button type="text" size="small" :class="scope.row.parStatus === 0?'':'delete'" @click="showDelDialog(scope.row)">{{scope.row.parStatus === 0?'启用':'禁用'}}</el-button>
+                        <el-button type="text" size="small" :class="scope.row.parStatus === 0?'':'unvailable'" @click="showDelDialog(scope.row)">{{scope.row.parStatus === 0?'启用':'禁用'}}</el-button>
                         <span style="margin:0 3px;">|</span>
                         <el-button type="text" size="small" class="delete" @click="showDelDialog(scope.row,1)">删除</el-button>
                     </template>
@@ -233,7 +233,7 @@
                     this.ruleTypeList = typeListData;
                     return;
                 }
-                api.getTypesList({}).then((res) => {
+                api.getTypesList({planCode:'rule'}).then((res) => {
                     if (res.data.code == '0') {
                         const data = res.data.data;
                         this.ruleTypeList = data;
@@ -442,4 +442,10 @@
     #upFile{
         display: none !important;
     }
+    .unvailable{
+        color: #FE7D3D;
+        &:hover{
+            color: #f19061;
+        }
+    }
 </style>

src/components/knowledgeExtra/SubConditions.vue

@@ -56,7 +56,7 @@
             </el-form-item>
             <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最大值：">
                 <div class="select-item clearfix">
-                    <el-col :span="4">
+                    <el-col :span="2">
                         <el-form-item prop="subMaxOperator">
                             <el-select v-model="groupData.subMaxOperator"
                                        placeholder="请选择"
@@ -70,12 +70,12 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
+                    <el-col :span="2">
                         <el-form-item prop="subMaxValue">
-                            <el-input-number controls-position="right" type="text" v-model="groupData.subMaxValue" placeholder="填写数值"/>
+                            <el-input type="text" v-model="groupData.subMaxValue" placeholder="填写数值"/>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
+                    <el-col :span="2">
                         <el-form-item prop="subMaxUnit">
                             <el-input  type="text" v-model="groupData.subMaxUnit" placeholder="填写单位"/>
                         </el-form-item>
@@ -84,7 +84,7 @@
             </el-form-item>
             <el-form-item class="min-margin" v-if="groupData.dataType==='1'" label="最小值：">
                 <div class="select-item clearfix">
-                    <el-col :span="4">
+                    <el-col :span="2">
                         <el-form-item prop="subMinOperator">
                             <el-select v-model="groupData.subMinOperator"
                                        placeholder="请选择"
@@ -98,12 +98,12 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
-                        <el-form-item prop="subMaxValue">
-                            <el-input-number controls-position="right" type="text" v-model="groupData.subMinValue" placeholder="填写数值"/>
+                    <el-col :span="2">
+                        <el-form-item prop="subMinValue">
+                            <el-input type="text" v-model="groupData.subMinValue" placeholder="填写数值"/>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="4">
+                    <el-col :span="2">
                         <el-form-item prop="subMinUnit">
                             <el-input  type="text" v-model="groupData.subMinUnit" placeholder="填写单位"/>
                         </el-form-item>
@@ -156,7 +156,9 @@
                     dataType:[{ required: true, message: '请选择类型',trigger: ['change'] }],
                     subMaxOperator:[{
                         validator: (rule,value,callback)=>{
-                            if((!value)&&this.groupData.subMinOperator===''){
+                            const {subMaxValue,subMinOperator,subMinValue}=this.groupData;
+                            const val=value+subMinOperator+subMinValue+subMaxValue;
+                            if(!val||(!value&&subMaxValue!=='')){
                                 callback(new Error('最大值和最小值至少完整填写一个，单位不必填'));
                             }else{
                                 callback();
@@ -164,8 +166,36 @@
                     }],
                     subMinOperator:[{
                         validator: (rule,value,callback)=>{
-                            if((!value)&&this.groupData.subMaxOperator===''){
+                            const {subMaxValue,subMaxOperator,subMinValue}=this.groupData;
+                            const val=value+subMaxOperator+subMinValue+subMaxValue;
+                            if(!val||(!value&&subMinValue!=='')){
+                                callback(new Error('最大值和最小值至少完整填写一个，单位不必填'));
+                            }else{
+                                callback();
+                            }}, trigger: 'blur'
+                    }],
+                    subMaxValue:[{
+                        validator: (rule,value,callback)=>{
+                            const {subMaxOperator,subMinOperator,subMinValue}=this.groupData;
+                            const val=value+subMaxOperator+subMinValue+subMinOperator;
+                            const isNum=/^\d+$/.test(value);
+                            if(!val){
+                                callback(new Error('最大值和最小值至少完整填写一个，单位不必填'));
+                            }else if(value!==''&&!isNum){
+                                callback(new Error('只能输入数字'));
+                            }else{
+                                callback();
+                            }}, trigger: 'blur'
+                    }],
+                    subMinValue:[{
+                        validator: (rule,value,callback)=>{
+                            const {subMaxValue,subMinOperator,subMaxOperator}=this.groupData;
+                            const val=value+subMaxOperator+subMaxValue+subMinOperator;
+                            const isNum=/^\d+$/.test(value);
+                            if(!val){
                                 callback(new Error('最大值和最小值至少完整填写一个，单位不必填'));
+                            }else if(value!==''&&!isNum){
+                                callback(new Error('只能输入数字'));
                             }else{
                                 callback();
                             }}, trigger: 'blur'