From df6f203c7a11b5520000dc873c4b08b3cf72fcf7 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 3 Dec 2021 15:21:15 +0800
Subject: [PATCH 1/3] BUG 25122

---
 .../components/belongToMe.vue                 | 337 +++++++++---------
 1 file changed, 169 insertions(+), 168 deletions(-)

diff --git a/src/apps/AppMeetingNotice/components/belongToMe.vue b/src/apps/AppMeetingNotice/components/belongToMe.vue
index 04bf531f..a19b51bc 100644
--- a/src/apps/AppMeetingNotice/components/belongToMe.vue
+++ b/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|formatDate(0)}}年{{item.startTime|formatDate(1)}}月{{item.startTime|formatDate(2)}}日 周{{item.startTime|formatWeek}}</span>
+              <span>{{ item.startTime|formatTime }}</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|formatDate(0)}}年{{item.endTime|formatDate(1)}}月{{item.endTime|formatDate(2)}}日 周{{item.endTime|formatWeek}}</span>
+              <span>{{ item.endTime|formatTime }}</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,192 +39,193 @@
 </template>
 
 <script>
-  import AiTopFixed from "../../../components/AiTopFixed";
-  import AiBack from "../../../components/AiBack";
-  import AiEmpty from "../../../components/AiEmpty";
+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},
-    data() {
-      return {
-        index: 0,
-        current: 1,
-        list: [],
-        status: "加载更多",
-      }
-    },
-    computed: {
-      tabs() {
-        return [
-          {name: "全部"},
-          {name: "未开始"},
-          {name: "进行中"},
-          {name: "已取消"},
-          {name: "已结束"},
-        ]
-      }
-    },
-    created() {
+export default {
+  name: "belongToMe",
+  components: {AiOpenData, AiTopFixed, AiBack, AiEmpty},
+  data() {
+    return {
+      index: 0,
+      current: 1,
+      list: [],
+      status: "加载更多",
+    }
+  },
+  computed: {
+    tabs() {
+      return [
+        {name: "全部"},
+        {name: "未开始"},
+        {name: "进行中"},
+        {name: "已取消"},
+        {name: "已结束"},
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    emitReachBottom() {
+      this.current = this.current + 1;
       this.getList()
     },
-    methods: {
-      emitReachBottom(){
-        this.current = this.current + 1;
-        this.getList()
-      },
-      tag(status) {
-        return {
-          "1": this.$cdn + 'common/1wks.png',
-          "2": this.$cdn + 'common/1jxz.png',
-          "3": this.$cdn + 'common/1yqx.png',
-          "4": this.$cdn + 'common/1yjs.png'
-        }[status]
-      },
-      getList() {
-        this.$http.post("/app/appmeetinginfo/list", null, {
-          params: {
-            listType: 0,
-            meetingStatus: this.index == 0 ? "-1" : this.index,
-            size: 10,
-            current: this.current
-          }
-        }).then(res => {
-          if (res && res.data) {
-            if (this.current > 1 && this.current > res.data.pages) {
-              this.status = "已经到底啦"
-            }
-            this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-          }
-        })
-      },
-      handleClick({id}) {
-        this.$parent.params = id;
-        this.$parent.isList = false;
-        this.$parent.comp = "detail"
-      },
-      change(e) {
-        this.index = e
-        this.current = 1
-        this.getList()
-      },
+    tag(status) {
+      return {
+        "1": this.$cdn + 'common/1wks.png',
+        "2": this.$cdn + 'common/1jxz.png',
+        "3": this.$cdn + 'common/1yqx.png',
+        "4": this.$cdn + 'common/1yjs.png'
+      }[status]
     },
+    getList() {
+      this.$http.post("/app/appmeetinginfo/list", null, {
+        params: {
+          listType: 0,
+          meetingStatus: this.index == 0 ? "-1" : this.index,
+          size: 10,
+          current: this.current
+        }
+      }).then(res => {
+        if (res && res.data) {
+          if (this.current > 1 && this.current > res.data.pages) {
+            this.status = "已经到底啦"
+          }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+    handleClick({id}) {
+      this.$parent.params = id;
+      this.$parent.isList = false;
+      this.$parent.comp = "detail"
+    },
+    change(e) {
+      this.index = e
+      this.current = 1
+      this.getList()
+    },
+  },
 
-    filters: {
-      formatTime(date) {
-        return date.split(" ")[1]?.substr(0, 5)
-      },
-      formatDate(date, i) {
-        return date.split(" ")[0]?.split("-")[i]
-      },
-      formatWeek(date) {
-        return "日一二三四五六".charAt(new Date(date.split(" ")[0]).getDay())
-      },
-    }
+  filters: {
+    formatTime(date) {
+      return date.split(" ")[1]?.substr(0, 5)
+    },
+    formatDate(date, i) {
+      return date.split(" ")[0]?.split("-")[i]
+    },
+    formatWeek(date) {
+      return "日一二三四五六".charAt(new Date(date.split(" ")[0]).getDay())
+    },
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .belong-to-me {
-    min-height: 100%;
-    background-color: #F5F5F5;
+.belong-to-me {
+  min-height: 100%;
+  background-color: #F5F5F5;
 
-    ::v-deep .content {
-      padding: 0 !important;
-    }
+  ::v-deep .content {
+    padding: 0 !important;
+  }
 
-    .body {
+  .body {
+    box-sizing: border-box;
+    padding: 40px 32px;
+
+    .card {
+      background-color: #FFFFFF;
       box-sizing: border-box;
-      padding: 40px 32px;
+      padding: 32px;
+      border-radius: 8px;
+      margin-bottom: 32px;
+      position: relative;
 
-      .card {
-        background-color: #FFFFFF;
-        box-sizing: border-box;
-        padding: 32px;
-        border-radius: 8px;
-        margin-bottom: 32px;
-        position: relative;
+      &:last-child {
+        margin-bottom: 0;
+      }
 
-        &:last-child {
-          margin-bottom: 0;
-        }
+      & > header {
+        font-size: 32px;
+        font-weight: 600;
+        color: #333333;
+      }
 
-        & > header {
-          font-size: 32px;
+      .time {
+        display: flex;
+        flex-direction: column;
+        margin: 46px 0;
+
+        & > span:first-child {
+          font-size: 60px;
           font-weight: 600;
           color: #333333;
+          line-height: 84px;
         }
 
-        .time {
-          display: flex;
-          flex-direction: column;
-          margin: 46px 0;
-
-          & > span:first-child {
-            font-size: 60px;
-            font-weight: 600;
-            color: #333333;
-            line-height: 84px;
-          }
-
-          & > span:last-child {
-            font-size: 22px;
-            color: #333333;
-          }
+        & > span:last-child {
+          font-size: 22px;
+          color: #333333;
         }
+      }
 
-        .arrow {
-          width: 28px;
-          height: 68px;
-          overflow: hidden;
-          position: relative;
-          transform: rotate(180deg);
+      .arrow {
+        width: 28px;
+        height: 68px;
+        overflow: hidden;
+        position: relative;
+        transform: rotate(180deg);
 
-          &:before, &:after {
-            content: "";
-            width: 50px;
-            height: 50px;
-            position: absolute;
-            transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
-          }
-
-          &:before {
-            top: 59px;
-            background-color: #CCCCCC;
-          }
-
-          &:after {
-            left: 7px;
-            top: 59px;
-            background-color: #FFFFFF;
-          }
-        }
-
-        .info {
-          flex-wrap: nowrap;
-
-          & > span:first-child {
-            font-size: 30px;
-            color: #999999;
-            flex-shrink: 0;
-          }
-
-          & > span:last-child {
-            font-size: 30px;
-            color: #343D65;
-          }
-        }
-
-        .tag {
-          width: 112px;
-          height: 112px;
-          background-repeat: no-repeat;
-          background-size: 100% 100% !important;
+        &:before, &:after {
+          content: "";
+          width: 50px;
+          height: 50px;
           position: absolute;
-          top: 0;
-          right: 0;
+          transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
         }
+
+        &:before {
+          top: 59px;
+          background-color: #CCCCCC;
+        }
+
+        &:after {
+          left: 7px;
+          top: 59px;
+          background-color: #FFFFFF;
+        }
+      }
+
+      .info {
+        flex-wrap: nowrap;
+
+        & > span:first-child {
+          font-size: 30px;
+          color: #999999;
+          flex-shrink: 0;
+        }
+
+        & > span:last-child {
+          font-size: 30px;
+          color: #343D65;
+        }
+      }
+
+      .tag {
+        width: 112px;
+        height: 112px;
+        background-repeat: no-repeat;
+        background-size: 100% 100% !important;
+        position: absolute;
+        top: 0;
+        right: 0;
       }
     }
   }
+}
 </style>

From 15a3b4291c2808f4a370d034c3a83ca3b35c30b9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 3 Dec 2021 15:30:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppAskForm/components/AddForm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/apps/AppAskForm/components/AddForm.vue b/src/apps/AppAskForm/components/AddForm.vue
index 496e8866..9c3d342d 100644
--- a/src/apps/AppAskForm/components/AddForm.vue
+++ b/src/apps/AppAskForm/components/AddForm.vue
@@ -328,7 +328,6 @@ export default {
         }
       })
 
-      this.$loading()
       this.$http.post(`/app/appquestionnairetemplate/addOrUpdate`, {
         ...this.form,
         fields,

From 7cc42360889bfe54a0d8c7b5bde1e14898f0454f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 3 Dec 2021 15:37:39 +0800
Subject: [PATCH 3/3] BUG 25206

---
 src/apps/AppAskForm/formDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppAskForm/formDetail.vue b/src/apps/AppAskForm/formDetail.vue
index acf45327..3cdafa8d 100644
--- a/src/apps/AppAskForm/formDetail.vue
+++ b/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">