Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
wanglei
2021-12-03 14:17:55 +08:00

View File

@@ -11,8 +11,8 @@
<div class="form-item__left"> <div class="form-item__left">
<h2>{{ item.title }}</h2> <h2>{{ item.title }}</h2>
<div class="form-item__left--info"> <div class="form-item__left--info">
<span>{{ item.createUserName }}</span> <ai-open-data type="departmentName" :openid="item.createUnitName"></ai-open-data>
<span>{{ item.createUnitName }}</span> <ai-open-data type="username" :openid="item.createUserName"></ai-open-data>
<span>{{ item.createTime.substr(0, item.createTime.length - 3) }}</span> <span>{{ item.createTime.substr(0, item.createTime.length - 3) }}</span>
<span>{{ $dict.getLabel('questionnaireType', item.type) }}</span> <span>{{ $dict.getLabel('questionnaireType', item.type) }}</span>
</div> </div>
@@ -86,11 +86,12 @@
import {mapActions} from 'vuex' import {mapActions} from 'vuex'
import AiTopFixed from "../../../components/AiTopFixed"; import AiTopFixed from "../../../components/AiTopFixed";
import AiEmpty from "../../../components/AiEmpty"; import AiEmpty from "../../../components/AiEmpty";
import AiOpenData from "../../../components/AiOpenData";
export default { export default {
name: 'formList', name: 'formList',
label: '表单列表', label: '表单列表',
components: {AiEmpty, AiTopFixed}, components: {AiEmpty, AiTopFixed, AiOpenData},
data() { data() {
return { return {
search: { search: {
@@ -448,7 +449,7 @@ export default {
color: #999; color: #999;
font-size: 20px; font-size: 20px;
span { span, div {
position: relative; position: relative;
margin-right: 24px; margin-right: 24px;