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

src/apps/AppAskForm/components/AddForm.vue

@@ -328,7 +328,6 @@ export default {
         }
       })
 
-      this.$loading()
       this.$http.post(`/app/appquestionnairetemplate/addOrUpdate`, {
         ...this.form,
         fields,

src/apps/AppAskForm/formDetail.vue

@@ -23,7 +23,7 @@
           </template>
           <template v-else-if="op.fieldType=='upload'">
             <ai-uploader @list="v=>op.fieldValue=v.map(e=>e.url)" :def="op.fieldValue" :disabled="isResult"
-                         preview/>
+                         preview action="/admin/file/add2"/>
           </template>
           <u-row v-else-if="op.fieldType=='radio'">
             <radio-group @change="({detail})=>op.fieldValue=detail.value">

src/apps/AppMeetingNotice/components/belongToMe.vue

@@ -20,7 +20,7 @@
           </u-row>
           <u-row class="info">
             <span>发起单位：</span>
-            <span>{{item.unitName}}</span>
+            <ai-open-data type="departmentName" :openid="item.unitName"/>
           </u-row>
           <u-gap height="20"></u-gap>
           <u-row class="info">
@@ -42,10 +42,11 @@
 import AiTopFixed from "../../../components/AiTopFixed";
 import AiBack from "../../../components/AiBack";
 import AiEmpty from "../../../components/AiEmpty";
+import AiOpenData from "../../../components/AiOpenData";
 
 export default {
   name: "belongToMe",
-    components: {AiTopFixed, AiBack, AiEmpty},
+  components: {AiOpenData, AiTopFixed, AiBack, AiEmpty},
   data() {
     return {
       index: 0,