Merge remote-tracking branch 'origin/master' into referMaster

src/components/knowledgeExtra/RuleManager.vue

@@ -82,7 +82,7 @@
             <span>{{scope.row.parStatus === 0?'禁用':'启用'}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="modifierName" label="操作人">
+        <!-- <el-table-column prop="modifierName" label="操作人">
           <template slot-scope="scope">
             <el-tooltip
               v-if="scope.row.modifierName&&scope.row.modifierName.length>8"
@@ -97,7 +97,7 @@
               v-if="scope.row.modifierName&&scope.row.modifierName.length<9"
             >{{scope.row.modifierName}}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <el-table-column label="操作" width="180" fixed="right">
           <template slot-scope="scope">

src/components/knowledgeExtra/rules.js

@@ -24,7 +24,11 @@ export const formRules =  {
   parHasSub: [
     { required: true, message: "请选择有无子条件", trigger: ["blur"] }
   ],
-  parMsg: [
+
+}
+
+export const tableRules = {
+  subMsg: [
     { required: true, message: "请输入附加信息", trigger: ["change"] },
     {
       validator: (rule, value, callback) => {
@@ -37,10 +41,18 @@ export const formRules =  {
       trigger: "change"
     }
   ],
-
-}
-
-export const tableRules = {
+  subMsgs: [
+    {
+      validator: (rule, value, callback) => {
+        if (value && value.length > 100) {
+          callback(new Error("附加信息不能超过100字"));
+        } else {
+          callback();
+        }
+      },
+      trigger: "change"
+    }
+  ],
   subDescription: [
     { required: true, message: "请输入基础规则名称", trigger: ["change"] },
     {