推送管理

src/views/messagePush/messageManagement/informationApproval/components/addOrEditDialog.vue

@@ -215,6 +215,29 @@ return time.getTime() + 86400000 < Date.now() //禁止选择今天以前的时
             params.attachmentName = file.name
             params.attachmentUrl = file.url
           }
+          
+          // 在编辑情况下，将表单内容拼出 requestDataJson 参数
+          if (props.dataList.id) {
+            // 确保 receiverIdList 中的手机号是字符串格式
+            const formattedReceiverIdList = receiverIdList.map(phone => String(phone))
+            
+            const dataObject: any = {
+              title: title,
+              message: message,
+              smsKeyId: smsKeyId,
+              receiverIdList: formattedReceiverIdList,
+            }
+            if (pushTime) {
+              dataObject.pushTime = pushTime.replace('T', ' ')
+            }
+            if (uploadedFiles.value.length > 0) {
+              const file = uploadedFiles.value[0]
+              dataObject.attachmentName = file.name
+              dataObject.attachmentUrl = file.url
+            }
+            params.requestDataJson = JSON.stringify(dataObject)
+          }
+          
           isLoading.value = true
           let ifcode = ''
           let text = ''

src/views/messagePush/pushManagement/shortMessage/components/addOrEditDialog.vue

@@ -6,8 +6,8 @@
         <el-form-item label="短信密钥" prop="smsKeyId" style="width: 50%">
           <selectClientMessage v-model="ruleForm.smsKeyId" messageType="SHORT" />
         </el-form-item>
-        <el-form-item label="推送时间" prop="pushTime" style="width: 50%">
-          <el-date-picker unlink-panels v-model="ruleForm.pushTime" type="datetime" placeholder="请选择推送时间，不选择则立即发送"
+        <el-form-item label="推送时间" prop="sendTime" style="width: 50%">
+          <el-date-picker unlink-panels v-model="ruleForm.sendTime" type="datetime" placeholder="请选择推送时间，不选择则立即发送"
             :default-time="new Date()" style="width: 100%" value-format="YYYY-MM-DDTHH:mm:ss" :disabled-date="(time) => {
     return time.getTime() + 86400000 < Date.now() //禁止选择今天以前的时间
   }
@@ -124,7 +124,7 @@
     message: string
     receiverIdList: any
     smsKeyId: string
-    pushTime: string
+    sendTime: string
     userInfo: any
     id?: any
   }
@@ -138,7 +138,7 @@
     receiverIdList: [], //手机号列表
     smsKeyId: '',
     userInfo: [], //用户信息
-    pushTime: '', //发送时间
+    sendTime: '', //发送时间
   })
   const checkreceiverIdList = (rule: any, value: any, callback: any) => {
     if (!ruleForm.value.receiverIdList.length && !userMobile.value.length) {
@@ -181,7 +181,7 @@
       receiverIdList: [], //手机号列表
       clientId: '',
       userInfo: [], //用户信息
-      pushTime: '', //发送时间
+      sendTime: '', //发送时间
     }
   }
   // 消息推送
@@ -190,7 +190,7 @@
     await formEl
       .validate((valid, fields) => {
         if (valid) {
-          let { title, message, smsKeyId, pushTime, receiverIdList } = ruleForm.value
+          let { title, message, smsKeyId, sendTime, receiverIdList } = ruleForm.value
           receiverIdList = Array.from(new Set([...receiverIdList, ...userMobile.value]))
           let params: any = {
             title,
@@ -198,8 +198,8 @@
             smsKeyId,
             receiverIdList,
           }
-          if (pushTime) {
-            params.pushTime = pushTime.replace('T', ' ')
+          if (sendTime) {
+            params.sendTime = sendTime.replace('T', ' ')
           }
           // 添加附件参数
           if (uploadedFiles.value.length > 0) {

src/views/messagePush/pushManagement/wechatApplet/components/addOrEditDialog.vue

@@ -119,9 +119,9 @@ const submitHandle = (data) => {
   if(allData.templateId){
     allData.modelId = allData.templateId
   }
-  if(allData.sendTime){
-    allData.pushTime = allData.sendTime.replace('T', ' ')
-  }
+  // if(allData.sendTime){
+  //   allData.pushTime = allData.sendTime.replace('T', ' ')
+  // }
   if(allData.wxOpenidList){
     allData.receiverIdList = allData.wxOpenidList
   }
@@ -137,9 +137,9 @@ const submitHandle = (data) => {
   if (allData.modelId) {
     delete allData.templateId
   }
-  if (allData.pushTime) {
-    delete allData.sendTime
-  }
+  // if (allData.pushTime) {
+  //   delete allData.sendTime
+  // }
   if (allData.wxOpenidList) {
     delete allData.wxOpenidList
   }

src/views/messagePush/pushManagement/wechatOfficialAccounts/components/addOrEditDialog.vue

@@ -136,10 +136,10 @@ const submitHandle = (data) => {
     ruleForm.value.receiverIdList = ruleForm.value.mpOpenidList
     delete ruleForm.value.mpOpenidList
   }
-  if (ruleForm.value.sendTime) {
-    ruleForm.value.pushTime = ruleForm.value.sendTime
-    delete ruleForm.value.sendTime
-  }
+  // if (ruleForm.value.sendTime) {
+  //   ruleForm.value.pushTime = ruleForm.value.sendTime
+  //   delete ruleForm.value.sendTime
+  // }
   if (ruleForm.value.templateId) {
     ruleForm.value.modelId = ruleForm.value.templateId
     delete ruleForm.value.templateId

src/views/messagePush/pushManagement/wechatOfficialAccounts/components/stepFrom/twoBasicInformation.vue

@@ -136,7 +136,8 @@ const selectChange = (val) => {
           console.log(dataArr, 'dataArr')
         }
       })
-      itemData.value = dataArr
+      // 过滤掉第一个和最后一个元素
+      itemData.value = dataArr.slice(1, -1)
       handleTemExample.value = data.example.split('\n')
       handleTemExample.value[0] = handleTemExample.value[0].replace(/\s*/g, '')
       ruleForm.templateName = data.title