zhengqiang 5 роки тому
батько
коміт
c19a9241dd
2 змінених файлів з 31 додано та 8 видалено
  1. 10 1
      src/api/base/messageInfo.js
  2. 21 7
      src/views/base/messageInfo-send.vue

+ 10 - 1
src/api/base/messageInfo.js

@@ -45,6 +45,15 @@ function recvPageSearch(formData){
   return request.post(constant.serverUrl + "/base/message/recvPageSearch", formData);
 }
 
+
+function batchSend(formData){
+  return request.post(constant.serverUrl + "/base/message/batchSend",formData);
+}
+
+function sendAll(formData){
+  return request.post(constant.serverUrl + "/base/message/sendAll", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove,recvPageSearch
+  pageList,create,edit,add,update,remove,batchRemove,recvPageSearch,batchSend,sendAll
 }

+ 21 - 7
src/views/base/messageInfo-send.vue

@@ -25,8 +25,8 @@
           ></el-select-tree>
       </el-form-item>
       <el-form-item label="所属角色" prop="roleId">
-        <el-select v-model="queryModel.roleId" multiple placeholder="请选择" size="mini">
-          <el-option :value="item.id" v-for="item in roleList" :key="item.key">{{item.personRoleName}}</el-option>
+        <el-select v-model="queryModel.roleId" placeholder="请选择" clearable size="mini">
+          <el-option :value="item.id" v-for="item in roleList" :key="item.key" :label="item.personRoleName"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="姓名" prop="name">
@@ -171,7 +171,7 @@ export default {
     return {
       queryModel: {
         companyId: "",
-        structureId: "",
+        companyStructureId: "",
         roleId: "",
         name: ""
       },
@@ -218,9 +218,18 @@ export default {
 
           formData.append("messageId", self.messageId);
           formData.append("companyId", self.queryModel.companyId);
-          formData.append("companyStructureId", self.queryModel.companyStructureId);
+
+          if(self.queryModel.companyStructureId!=null){
+            formData.append("companyStructureId", self.queryModel.companyStructureId);
+          }
+
+          if(self.queryModel.roleId!=null){
           formData.append("roleId", self.queryModel.roleId);
-          formData.append("name", self.queryModel.name);
+          }
+
+          if(self.queryModel.name!=null){
+            formData.append("name", self.queryModel.name);
+          }
 
           messageInfoApi
             .recvPageSearch(formData)
@@ -300,7 +309,12 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        messageInfoApi.batchSend(idList).then(function (response) {
+        var formData = new FormData();
+
+        formData.append("messageId", self.messageId);
+        formData.append("personIds", idList.join(","));
+
+        messageInfoApi.batchSend(formData).then(function (response) {
           var jsonData = response.data;
 
           if (jsonData.result) {
@@ -308,7 +322,7 @@ export default {
 
             self.$message({
               type: "success",
-              message: "删除成功!",
+              message: "发送成功!",
             });
           }
         });