!134 修复敏感词表格的”创建时间“列内容错误，以及在”标签“列的标签之间增加空格

Merge pull request !134 from dearliuliu0522/dev

!134 修复敏感词表格的”创建时间“列内容错误，以及在”标签“列的标签之间增加空格
Merge pull request !134 from dearliuliu0522/dev
芋道源码 · Gitee
2 parents 9ee501d8 c348fc2a
Showing 2 changed files with 12 additions and 3 deletions
yudao-ui-admin/src/views/system/dict/index.vue
yudao-ui-admin/src/views/system/sensitiveWord/index.vue
@@ -75,7 +75,7 @@
           <el-input v-model="form.name" placeholder="请输入字典名称" />
         </el-form-item>
         <el-form-item label="字典类型" prop="type">
-          <el-input v-model="form.type" placeholder="请输入字典类型" />
+          <el-input :disabled="typeof form.id !== 'undefined'" v-model="form.type" placeholder="请输入字典类型" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
@@ -53,14 +53,17 @@
       </el-table-column>
       <el-table-column label="描述" align="center" prop="description"/>
       <el-table-column label="标签" align="center" prop="tags">
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <el-tag :disable-transitions="true" v-for="(tag, index) in scope.row.tags" :index="index">
             {{ tag }}
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -324,3 +327,9 @@ export default {
   }
 };
 </script>
+
+<style rel="stylesheet/scss" lang="scss">
+  .el-tag+.el-tag {
+    margin-left: 10px;
+  }
+</style>