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

@@ -6,26 +6,26 @@
     <div class="body">
       <template v-if="list.length">
         <div class="card" v-for="(item,index) in list" :key="index" @click="handleClick(item)">
-          <header>{{item.title}}</header>
+          <header>{{ item.title }}</header>
           <u-row justify="between">
             <div class="time">
-              <span>{{item.startTime|formatTime}}</span>
+              <span>{{ item.startTime|formatTime }}</span>
-              <span>{{item.startTime|formatDate(0)}}年{{item.startTime|formatDate(1)}}月{{item.startTime|formatDate(2)}}日 周{{item.startTime|formatWeek}}</span>
+              <span>{{ item.startTime|formatDate(0) }}年{{ item.startTime|formatDate(1) }}月{{ item.startTime|formatDate(2) }}日 周{{ item.startTime|formatWeek }}</span>
             </div>
             <div class="arrow"></div>
             <div class="time">
-              <span>{{item.endTime|formatTime}}</span>
+              <span>{{ item.endTime|formatTime }}</span>
-              <span>{{item.endTime|formatDate(0)}}年{{item.endTime|formatDate(1)}}月{{item.endTime|formatDate(2)}}日 周{{item.endTime|formatWeek}}</span>
+              <span>{{ item.endTime|formatDate(0) }}年{{ item.endTime|formatDate(1) }}月{{ item.endTime|formatDate(2) }}日 周{{ item.endTime|formatWeek }}</span>
             </div>
           </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">
             <span>会议地点：</span>
-            <span>{{item.address}}</span>
+            <span>{{ item.address }}</span>
           </u-row>
           <div class="tag" :style="{background:'url(' + tag(item.status) + ')'}"></div>
         </div>
@@ -39,13 +39,14 @@
 </template>
 
 <script>
-  import AiTopFixed from "../../../components/AiTopFixed";
+import AiTopFixed from "../../../components/AiTopFixed";
-  import AiBack from "../../../components/AiBack";
+import AiBack from "../../../components/AiBack";
-  import AiEmpty from "../../../components/AiEmpty";
+import AiEmpty from "../../../components/AiEmpty";
+import AiOpenData from "../../../components/AiOpenData";
 
-  export default {
+export default {
   name: "belongToMe",
-    components: {AiTopFixed, AiBack, AiEmpty},
+  components: {AiOpenData, AiTopFixed, AiBack, AiEmpty},
   data() {
     return {
       index: 0,
@@ -69,7 +70,7 @@
     this.getList()
   },
   methods: {
-      emitReachBottom(){
+    emitReachBottom() {
       this.current = this.current + 1;
       this.getList()
     },
@@ -121,11 +122,11 @@
       return "日一二三四五六".charAt(new Date(date.split(" ")[0]).getDay())
     },
   }
-  }
+}
 </script>
 
 <style lang="scss" scoped>
-  .belong-to-me {
+.belong-to-me {
   min-height: 100%;
   background-color: #F5F5F5;
 
@@ -226,5 +227,5 @@
       }
     }
   }
-  }
+}
 </style>