Merge branch 'dragTerm1025' into test

# Conflicts:
#	src/components/knowledgeExtra/RuleManager.vue

src/components/knowledgeExtra/RuleManager.vue

@@ -56,7 +56,7 @@
             <span>{{scope.row.parDescription}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="parRuleType" label="规则类型" width="150">
+        <el-table-column prop="parRuleType" label="规则类型" width="160">
           <template slot-scope="scope">{{statusTrans(scope.row.parRuleType)}}</template>
         </el-table-column>
         <el-table-column prop="parConceptName" label="医学标准术语" width="180">
@@ -73,7 +73,7 @@
             <span>{{scope.row.parConceptName}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="parLibTypeName" label="术语类型" width="180"></el-table-column>
+        <el-table-column prop="parLibTypeName" label="术语类型" width="190"></el-table-column>
         <el-table-column prop="parHasSub" label="有无子条件" width="100">
           <template slot-scope="scope">{{scope.row.parHasSub == '0'?'无':'有'}}</template>
         </el-table-column>
@@ -98,7 +98,7 @@
             >{{scope.row.modifierName}}</span>
           </template>
         </el-table-column> -->
-        <el-table-column prop="gmtModified" label="操作时间" width="180"></el-table-column>
+        <el-table-column prop="gmtModified" label="操作时间" width="190"></el-table-column>
         <el-table-column label="操作" width="180" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="editData(scope.row.parId)">修改</el-button>