Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen
This commit is contained in:
commit
4ac1ac9647
|
|
@ -82,7 +82,7 @@ export default {
|
||||||
[{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
|
[{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
|
||||||
[{ align: [] }], // 对齐方式
|
[{ align: [] }], // 对齐方式
|
||||||
["clean"], // 清除文本格式
|
["clean"], // 清除文本格式
|
||||||
["link", "image", "video"] // 链接、图片、视频
|
// ["link", "image", "video"] // 链接、图片、视频
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
placeholder: "请输入内容",
|
placeholder: "请输入内容",
|
||||||
|
|
|
||||||
|
|
@ -121,8 +121,8 @@
|
||||||
<tr >
|
<tr >
|
||||||
<td class="table-label"><i class="text-red">*</i> <span >所属组织</span></td>
|
<td class="table-label"><i class="text-red">*</i> <span >所属组织</span></td>
|
||||||
<td class="table-content"><span >{{form.orgFullName}}</span></td>
|
<td class="table-content"><span >{{form.orgFullName}}</span></td>
|
||||||
<td class="table-label"><span >用户类别</span></td>
|
<td class="table-label"><span >用户类别2</span></td>
|
||||||
<td class="table-content"><span >{{form.userType}}</span></td>
|
<td class="table-content"><span >{{form.userType==1?'其它':'系统'}}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr >
|
<tr >
|
||||||
<td class="table-label"><span >用户手机号</span></td>
|
<td class="table-label"><span >用户手机号</span></td>
|
||||||
|
|
|
||||||
|
|
@ -161,7 +161,7 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="内容" prop="articleContent">
|
<el-form-item label="内容" prop="articleContent">
|
||||||
<editor v-model="form.articleContent" :min-height="192"/>
|
<editor v-model="form.articleContent" :min-height="192" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue