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

src/apps/AppAskForm/components/List.vue

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