doway-coms 1.6.59 → 1.6.61

package/package.json

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

package/packages/LeaveAMessage/src/index.vue

@@ -33,11 +33,12 @@
                   <div style="flex:1">发送给：</div>
                   <a-select
                     v-model:value="sendUser"
-                    :show-search="true"
+                    show-search
                     mode="multiple"
                     style="width: 85%;flex:3"
                     :options="userList"
                     size="small"
+                    :filter-option="true"
                   ></a-select>
                 </div>
               </div>
@@ -55,7 +56,7 @@
             <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>
+                <a-button @click="sendMsg" :disabled="sendUser.length < 1 || remark ===''">发送</a-button>
               </div>
             </a-tab-pane>
             <a-tab-pane key="remark" tab="记录备注">
@@ -76,7 +77,7 @@
                 />
               </a-upload>
               <div style="display: flex; justify-content: flex-end">
-                <a-button @click="addMsgRemark">记录</a-button>
+                <a-button @click="addMsgRemark" :disabled="remark !==''">记录</a-button>
               </div>
             </a-tab-pane>
           </a-tabs>
@@ -173,7 +174,7 @@ import {
 export default {
   name: "LeaveAMessage",
   props: {
-    orderNum:{
+    topic: {
       type: String
     },
     modalHeight: {
@@ -248,7 +249,6 @@ export default {
       uploadHeaders: {
         Authorization: null
       },
-      subject: "",
       sendUser: [],
       userList: [],
       remark: "",
@@ -371,16 +371,28 @@ export default {
     getUserInfo() {
       userInfoSearchApi().then(res => {
         res.content.forEach(item => {
-          this.userList.push({ value: item.id, label: item.name });
+          this.userList.push({
+            value: item.name,
+            label: item.name,
+            code: item.id
+          });
         });
       });
       console.log(this.userList);
     },
     sendMsg() {
+      let tmp = [];
+      this.userList.forEach(uitem => {
+        this.sendUser.forEach(sitem => {
+          if (uitem.label === sitem) {
+            tmp.push(uitem.code);
+          }
+        });
+      });
       let postData = {
         content: this.remark,
-        receiver: this.sendUser.join(","),
-        subject: this.orderNum,
+        receiver: tmp.join(","),
+        subject: this.topic,
         objectName: this.objectName,
         resId: this.resId
       };