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

This commit is contained in:
wanglei
2021-12-03 18:39:38 +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">
<ai-open-data type="departmentName" :openid="item.createUnitName"></ai-open-data> <ai-open-data v-if="item.createUnitName" type="departmentName" :openid="item.createUnitName"></ai-open-data>
<ai-open-data type="username" :openid="item.createUserName"></ai-open-data> <ai-open-data v-if="item.createUserName" 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>
@@ -107,7 +107,7 @@ export default {
isShow: false isShow: false
} }
}, },
mounted() { created() {
this.injectJWeixin(['sendChatMessage', 'selectEnterpriseContact']) this.injectJWeixin(['sendChatMessage', 'selectEnterpriseContact'])
this.$dict.load(['questionnaireStatus', 'questionnaireType', 'questionnaireFieldType']).then(() => { this.$dict.load(['questionnaireStatus', 'questionnaireType', 'questionnaireFieldType']).then(() => {
this.getList() this.getList()