doway-coms 1.6.50 → 1.6.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.6.50",
+  "version": "1.6.52",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/LeaveAMessage/src/index.vue

@@ -1,28 +1,66 @@
 <template>
   <div class="liu-yan" style="background-color: #eaeef1">
     <div class="input-box">
-      <!-- :auto-size="{ minRows: 2, maxRows: 2 }" -->
-      <a-textarea auto-size placeholder="写些什么..." v-model:value="remark" />
-      <a-upload
-        list-type="picture"
-        :headers="uploadHeaders"
-        :action="uploadData.picAction"
-        :data="uploadData"
-        :before-upload="beforeAvatarUpload"
-        @change="handleAvatarSuccess"
-        :file-list="fileList"
-        style="padding-top: 10px"
-      >
-        <a-icon
-          style="font-size: 16px; cursor: pointer; margin: 5px 10px"
-          type="paper-clip"
-        />
-      </a-upload>
-      <div style="display: flex; justify-content: flex-end">
-        <a-button @click="addMsgRemark">发送</a-button>
-      </div>
+      <a-tabs default-active-key="msg">
+        <a-tab-pane key="msg" tab="发送消息">
+          <div style="display:flex">
+            <div
+              style="display:flex;justify-content: center;align-items: center;margin-bottom:5px;flex:1"
+            >
+              <div style="flex:1">主题：</div>
+              <a-input v-model:value="subject" style="flex:3" size="small"></a-input>
+            </div>
+            <div
+              style="display:flex;justify-content: center;align-items: center;margin-bottom:5px;margin-left:5px;flex:1"
+            >
+              <div style="flex:1">发送给：</div>
+              <a-select
+                v-model:value="sendUser"
+                mode="tags"
+                style="width: 85%;flex:3"
+                :options="userList"
+                size="small"
+              ></a-select>
+            </div>
+          </div>
+          <a-textarea placeholder="写些什么..." v-model:value="remark" />
+          <!-- <a-upload
+            list-type="picture"
+            :headers="uploadHeaders"
+            :action="uploadData.picAction"
+            :data="uploadData"
+            :before-upload="beforeAvatarUpload"
+            @change="handleAvatarSuccess"
+            :file-list="fileList"
+            style="padding-top: 10px"
+          >
+            <a-icon style="font-size: 16px; cursor: pointer; margin: 5px 10px" type="paper-clip" />
+          </a-upload>-->
+          <div style="display: flex; justify-content: flex-end;margin-top:5px">
+            <a-button @click="sendMsg">发送</a-button>
+          </div>
+        </a-tab-pane>
+        <a-tab-pane key="remark" tab="记录备注">
+          <a-textarea placeholder="写些什么..." v-model:value="remark" />
+          <a-upload
+            list-type="picture"
+            :headers="uploadHeaders"
+            :action="uploadData.picAction"
+            :data="uploadData"
+            :before-upload="beforeAvatarUpload"
+            @change="handleAvatarSuccess"
+            :file-list="fileList"
+            style="padding-top: 10px"
+          >
+            <a-icon style="font-size: 16px; cursor: pointer; margin: 5px 10px" type="paper-clip" />
+          </a-upload>
+          <div style="display: flex; justify-content: flex-end">
+            <a-button @click="addMsgRemark">记录</a-button>
+          </div>
+        </a-tab-pane>
+      </a-tabs>
     </div>
-    <div class="list" :style="{ height: listHeight - 101 + 'px' }">
+    <div class="list" :style="{ height: listHeight - 215 + 'px' }">
       <a-list
         v-if="remarkData.length > 0"
         item-layout="horizontal"
@@ -52,11 +90,9 @@
             <a-comment :author="item.createUserName" :avatar="item.avatar">
               <!-- <template slot="actions">
               <span v-for="(action,index) in item.actions" :key="index">{{ action }}</span>
-              </template> -->
+              </template>-->
               <template slot="content">
-                <div style="margin-bottom: 5px">
-                  {{ item.body }}
-                </div>
+                <div style="margin-bottom: 5px">{{ item.body }}</div>
                 <div
                   v-if="item.objectCommentAttachDtos.length > 0"
                   style="display: flex; flex-wrap: wrap"
@@ -68,15 +104,9 @@
                     @click="downloadFile(item)"
                   >
                     <div class="download-icon">
-                      <a-icon
-                        type="vertical-align-bottom"
-                        style="font-size: 30px"
-                      />
+                      <a-icon type="vertical-align-bottom" style="font-size: 30px" />
                     </div>
-                    <a-icon
-                      type="file-text"
-                      style="font-size: 25px; margin-right: 5px"
-                    />
+                    <a-icon type="file-text" style="font-size: 25px; margin-right: 5px" />
                     <span class="file-title">{{ item.attachName }}</span>
                   </div>
                 </div>
@@ -105,35 +135,37 @@ import {
   searchObjectCommentApi,
   addObjectCommentApi,
   deleteObjectCommentApi,
+  sendMsgApi,
+  userInfoSearchApi
 } from "../../utils/api";
 export default {
   name: "LeaveAMessage",
   props: {
     listHeight: {
-      type: Number,
+      type: Number
     },
     limitSize: {
       // 限制上传大小
       type: Number,
-      default: 5,
+      default: 5
     },
     limitType: {
       // 限制上传类型
       type: Array,
       default: () => {
         return [];
-      },
+      }
     },
     resId: {
-      type: String,
+      type: String
     },
     picType: {
       type: String,
-      default: "cust",
+      default: "cust"
     },
     dataName: {
-      type: String,
-    },
+      type: String
+    }
     // formRow: {
     //   type: Object,
     //   default: () => {
@@ -143,14 +175,15 @@ export default {
   },
   watch: {
     resId: {
-      handler: function (newVal) {
+      handler: function(newVal) {
         this.uploadData.resId = newVal;
-      },
-    },
+      }
+    }
   },
   created() {
-    let viewDatas =
-      this.$store.getters.moduleViewInfo[this.$route.meta.moduleCode];
+    let viewDatas = this.$store.getters.moduleViewInfo[
+      this.$route.meta.moduleCode
+    ];
     this.objectName = viewDatas.objectName;
     this.userId = this.$store.getters.userId;
   },
@@ -161,6 +194,7 @@ export default {
     this.internalServiceUrl = attachGetAttachUrlApi();
     this.uploadData.picAction = this.internalServiceUrl + "/UploadAttach";
     this.getMsgRemarkData();
+    this.getUserInfo();
   },
   data() {
     return {
@@ -170,14 +204,17 @@ export default {
       uploadData: {
         picType: "",
         picAction: "",
-        resId: "",
+        resId: ""
       },
       uploadHeaders: {
-        Authorization: null,
+        Authorization: null
       },
+      subject: "",
+      sendUser: [],
+      userList: [],
       remark: "",
       attachment: [],
-      objectName: "",
+      objectName: ""
     };
   },
   methods: {
@@ -186,13 +223,13 @@ export default {
       if (file.size / 1024 / 1024 > this.limitSize) {
         notification.error({
           message: "错误",
-          description: "上传图片大小不能超过 " + this.limitSize + "MB!",
+          description: "上传图片大小不能超过 " + this.limitSize + "MB!"
         });
       }
       if (this.limitType.length > 0 && !this.limitType[file.type]) {
         notification.error({
           message: "错误",
-          description: "上传附件格式错误!",
+          description: "上传附件格式错误!"
         });
       }
       return true;
@@ -213,17 +250,22 @@ export default {
             {
               field: "objectName",
               operator: "EQ",
-              value: this.objectName,
+              value: this.objectName
             },
+            {
+              field: "resId",
+              operator: "EQ",
+              value: this.resId
+            }
           ],
-          operator: "and",
+          operator: "and"
         },
-        sorts: [['createTime', 'desc']]
+        sorts: [["createTime", "desc"]]
       };
-      searchObjectCommentApi(postData).then((res) => {
+      searchObjectCommentApi(postData).then(res => {
         let tmp = [];
-        res.content.forEach((item) => {
-          let flag = tmp.findIndex((titem) => {
+        res.content.forEach(item => {
+          let flag = tmp.findIndex(titem => {
             return (
               titem.createTime ===
               moment(item.createTime).format("YYYY年MM月DD")
@@ -232,7 +274,7 @@ export default {
           if (flag < 0) {
             tmp.push({
               type: "date",
-              createTime: moment(item.createTime).format("YYYY年MM月DD"),
+              createTime: moment(item.createTime).format("YYYY年MM月DD")
             });
           }
           item["avatar"] =
@@ -259,10 +301,10 @@ export default {
           resId: this.resId,
           objectName: this.objectName,
           body: this.remark,
-          objectCommentAttachIds: this.attachment,
+          objectCommentAttachIds: this.attachment
         };
         console.log(this.fileList);
-        addObjectCommentApi(postData).then((res) => {
+        addObjectCommentApi(postData).then(res => {
           this.remark = "";
           this.attachment = [];
           this.fileList = [];
@@ -272,12 +314,34 @@ export default {
     },
     delMsgRemark(val) {
       deleteObjectCommentApi({
-        keyIds: [val.id],
-      }).then((res) => {
+        keyIds: [val.id]
+      }).then(res => {
         this.getMsgRemarkData();
       });
     },
-  },
+    getUserInfo() {
+      userInfoSearchApi().then(res => {
+        res.content.forEach(item => {
+          this.userList.push({ value: item.id, label: item.name });
+        });
+      });
+      console.log(this.userList);
+    },
+    sendMsg() {
+      let postData = {
+        content: this.remark,
+        receiver: this.sendUser.join(","),
+        subject: this.subject,
+        objectName: this.objectName,
+        resId: this.resId
+      };
+      sendMsgApi(postData).then(res => {
+        this.remark = "";
+        this.sendUser = [];
+        this.getMsgRemarkData();
+      });
+    }
+  }
 };
 </script>
 
@@ -299,7 +363,7 @@ export default {
   position: relative;
 }
 .list {
-  padding: 15px 15px;
+  padding: 10px 15px;
   overflow: auto;
   .close-icon {
     position: absolute;
@@ -346,8 +410,8 @@ export default {
 .input-box {
   background-color: #fff;
   padding: 10px 10px 0;
-  min-height: 100px;
-  max-height: 100px;
+  min-height: 210px;
+  max-height: 210px;
 }
 .msg-content {
   box-sizing: border-box;

package/packages/utils/api.js

@@ -72,4 +72,18 @@ export function deleteObjectCommentApi(data) {
     method: 'post',
     data: data
   })
+}
+export function sendMsgApi(data) {
+  return request({
+    url: store.getters.msgUrl + '/sendMsg',
+    method: 'post',
+    data: data
+  })
+}
+export function userInfoSearchApi(data) {
+  return request({
+    url: store.getters.umsUrl + 'userInfo',
+    method: 'get',
+    params: data
+  })
 }