服务工单-消息推送

.env.development

@@ -19,9 +19,9 @@ ENV = 'development'
 
  
  
-VUE_APP_BASE_API = 'http://210.16.189.72:8099/'
-
-
+# VUE_APP_BASE_API = 'http://210.16.189.72:8099/'
+# 本地
+VUE_APP_BASE_API = 'http://localhost:8082/'
  
  
  

src/api/common.js

@@ -1,227 +1,238 @@
-import request from '@/utils/request'
-import parseTime from '@/utils/index.js'
+import request from "@/utils/request";
+import parseTime from "@/utils/index.js";
 
-export function postJson(url,data) {
+export function postJson(url, data) {
   return request({
     url: process.env.VUE_APP_BASE_API + url,
-    method: 'post',
+    method: "post",
     timeout: 600000,
-    data
-  })
+    data,
+  });
 }
 
-export function postJson2(url,data) {
+export function postJson2(url, data) {
   return request({
     url: url,
-    method: 'post',
+    method: "post",
     timeout: 600000,
-    data
-  })
+    data,
+  });
 }
 
 export function downloadfileCRM(data) {
   return request({
-    url: '/downloadfileCRM',
-    responseType:"blob",
-    method: 'post',
-    data
-  })
+    url: "/downloadfileCRM",
+    responseType: "blob",
+    method: "post",
+    data,
+  });
 }
 
-
 export function wxpush(data) {
   return request({
-    url: '/authdata/wxpush',
-    method: 'post',
-    data
-  })
+    url: "/authdata/wxpush",
+    method: "post",
+    data,
+  });
 }
 
 export function GetDataByName(data) {
   return request({
-    url: '/authdata/GetDataByName',
-    method: 'post',
-    data
-  })
+    url: "/authdata/GetDataByName",
+    method: "post",
+    data,
+  });
 }
 
 export function ExeSqlJiade(data) {
   return request({
-    url: '/authdata/exesql',
-    method: 'post',
-    data
-  })
+    url: "/authdata/exesql",
+    method: "post",
+    data,
+  });
 }
 export function dashboardListJiade(data) {
   return request({
-    url: '/authdata/Dashboards',
-    method: 'post',
-    data
-  })
+    url: "/authdata/Dashboards",
+    method: "post",
+    data,
+  });
 }
 
 export function updateDashboardJiade(data) {
   return request({
-    url: '/authdata/Updatedashboard',
-    method: 'post',
-    data
-  })
+    url: "/authdata/Updatedashboard",
+    method: "post",
+    data,
+  });
 }
 
 export function GetReportform(data) {
   return request({
-    url: '/authdata/GetReportform',
-    method: 'post',
-    data
-  })
+    url: "/authdata/GetReportform",
+    method: "post",
+    data,
+  });
 }
 export function requestbyname(data, requestname) {
   return request({
-    url: '/authdata/' + requestname,
-    method: 'post',
-    data
-  })
+    url: "/authdata/" + requestname,
+    method: "post",
+    data,
+  });
 }
 
 export function GetDataByNameXlsx(data) {
   return request({
-    url: '/authdata/GetDataByName',
-    method: 'post',
+    url: "/authdata/GetDataByName",
+    method: "post",
     data,
-    responseType: 'blob'
-  })
+    responseType: "blob",
+  });
 }
 
 export function GetDataByNames(data) {
   return request({
-    url: '/authdata/GetDataByNames',
-    method: 'post',
-    data
-  })
+    url: "/authdata/GetDataByNames",
+    method: "post",
+    data,
+  });
 }
 
 export function PostDataByName(data) {
   return request({
-    url: '/authdata/PostDataByName',
-    method: 'post',
-    data
-  })
+    url: "/authdata/PostDataByName",
+    method: "post",
+    data,
+  });
 }
 export function GetUpkeepPlan(data) {
   return request({
-    url: '/authdata/GetUpkeepPlan',
-    method: 'post',
-    data
-  })
+    url: "/authdata/GetUpkeepPlan",
+    method: "post",
+    data,
+  });
 }
 export function GetAccount(data) {
   return request({
-    url: '/authdata/GetAccount',
-    method: 'post',
+    url: "/authdata/GetAccount",
+    method: "post",
     timeout: 600000,
-    data
-  })
+    data,
+  });
 }
 
 export function GetArrList(data) {
   return request({
-    url: '/authdata/GetArrList',
-    method: 'post',
-    data
-  })
+    url: "/authdata/GetArrList",
+    method: "post",
+    data,
+  });
 }
 export function PostDataByNames(data) {
   return request({
-    url: '/authdata/PostDataByNames',
-    method: 'post',
-    data
-  })
+    url: "/authdata/PostDataByNames",
+    method: "post",
+    data,
+  });
 }
 
 export function ExecDataByConfig(data) {
   return request({
-    url: '/authdata/ExecDataByConfig',
-    method: 'post',
-    data
-  })
+    url: "/authdata/ExecDataByConfig",
+    method: "post",
+    data,
+  });
 }
 
 export function removeimage(data) {
   return request({
-    url: '/authdata/removeimage',
-    method: 'post',
-    data
-  })
+    url: "/authdata/removeimage",
+    method: "post",
+    data,
+  });
 }
 
 export function getRecuData(data) {
   return request({
-    url: '/authdata/GetRecuDataByName',
-    method: 'post',
-    data
-  })
+    url: "/authdata/GetRecuDataByName",
+    method: "post",
+    data,
+  });
 }
 
 export function failproccess(data, notify) {
-  if (data.data.includes('Duplicate')) {
+  if (data.data.includes("Duplicate")) {
     notify({
-      title: '失败',
-      message: '不可以录入重复数据',
-      type: 'error',
-      duration: 2000
-    })
+      title: "失败",
+      message: "不可以录入重复数据",
+      type: "error",
+      duration: 2000,
+    });
   } else {
     notify({
-      title: '失败',
-      message: '数据存在错误，请校验好重新录入，不可以录入数据',
-      type: 'error',
-      duration: 2000
-    })
+      title: "失败",
+      message: "数据存在错误，请校验好重新录入，不可以录入数据",
+      type: "error",
+      duration: 2000,
+    });
   }
 }
 
 export function form_edit_saveRelation(data) {
   return request({
-    url: '/authdata/form_edit_saveRelation',
-    method: 'post',
-    data
-  })
+    url: "/authdata/form_edit_saveRelation",
+    method: "post",
+    data,
+  });
 }
 
 export function transData(a, idStr, pidStr, chindrenStr) {
-  var r = []; var hash = {}; var id = idStr; var pid = pidStr; var children = chindrenStr; var i = 0; var j = 0; var len = a.length
+  var r = [];
+  var hash = {};
+  var id = idStr;
+  var pid = pidStr;
+  var children = chindrenStr;
+  var i = 0;
+  var j = 0;
+  var len = a.length;
   for (; i < len; i++) {
-    hash[a[i][id]] = a[i]
+    hash[a[i][id]] = a[i];
   }
   for (; j < len; j++) {
-    var aVal = a[j]; var hashVP = hash[aVal[pid]]
+    var aVal = a[j];
+    var hashVP = hash[aVal[pid]];
     if (hashVP) {
-      !hashVP[children] && (hashVP[children] = [])
-      hashVP[children].push(aVal)
+      !hashVP[children] && (hashVP[children] = []);
+      hashVP[children].push(aVal);
     } else {
-      r.push(aVal)
+      r.push(aVal);
     }
   }
-  return r
+  return r;
 }
 export function UpdateDataRelation(data) {
   return request({
-    url: '/authdata/UpdateDataRelation',
-    method: 'post',
-    data
-  })
+    url: "/authdata/UpdateDataRelation",
+    method: "post",
+    data,
+  });
 }
 export function checkButtons(buttonsList, PermissionButtons) {
   // console.log(PermissionButtons)
   for (let i = 0; i < buttonsList.length; i++) {
-    if (buttonsList[i].path === PermissionButtons && buttonsList[i].menu_id && buttonsList[i].path) { // path不为空且menu_id不为空时返回true
-      return true
+    if (
+      buttonsList[i].path === PermissionButtons &&
+      buttonsList[i].menu_id &&
+      buttonsList[i].path
+    ) {
+      // path不为空且menu_id不为空时返回true
+      return true;
     }
   }
-  return false
+  return false;
 }
 
-
 // export function checkButtons(buttonsList, PermissionButtons) {
 //   // console.log(PermissionButtons)
 //   for (let i = 0; i < buttonsList.length; i++) {
@@ -233,54 +244,151 @@ export function checkButtons(buttonsList, PermissionButtons) {
 // }
 
 export function formatJson(filterVal, jsonData) {
-  return jsonData.map(v =>
-    filterVal.map(j => {
-      if (j === 'timestamp') {
-        return parseTime(v[j])
+  return jsonData.map((v) =>
+    filterVal.map((j) => {
+      if (j === "timestamp") {
+        return parseTime(v[j]);
       } else {
-        return v[j]
+        return v[j];
       }
     })
-  )
+  );
 }
 
 export function DownloadExcel(data, filename) {
-  const content = data
-  const blob = new Blob([content])
-  const fileName = filename + '.xlsx'
-  if ('download' in document.createElement('a')) { // 非IE下载
-    const elink = document.createElement('a')
-    elink.download = fileName
-    elink.style.display = 'none'
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href) // 释放URL 对象
-    document.body.removeChild(elink)
-  } else { // IE10+下载
-    navigator.msSaveBlob(blob, fileName)
+  const content = data;
+  const blob = new Blob([content]);
+  const fileName = filename + ".xlsx";
+  if ("download" in document.createElement("a")) {
+    // 非IE下载
+    const elink = document.createElement("a");
+    elink.download = fileName;
+    elink.style.display = "none";
+    elink.href = URL.createObjectURL(blob);
+    document.body.appendChild(elink);
+    elink.click();
+    URL.revokeObjectURL(elink.href); // 释放URL 对象
+    document.body.removeChild(elink);
+  } else {
+    // IE10+下载
+    navigator.msSaveBlob(blob, fileName);
   }
 }
 
-
 export function calculativeWidth() {
-
-    var operateArr = []
-    for(let i = 0; i<arguments.length; i++){
-      operateArr.push(arguments[i])
-    }
-    console.log("operateArr==========",operateArr)
-    var tureCount = operateArr.filter(item => item === true).length
-    if(tureCount){
-      // 每个按钮预计90宽度
-      var countWidth = tureCount * 90
-      console.log(countWidth)
-      return countWidth
-    } else {
-      return 0
-    }
+  var operateArr = [];
+  for (let i = 0; i < arguments.length; i++) {
+    operateArr.push(arguments[i]);
+  }
+  console.log("operateArr==========", operateArr);
+  var tureCount = operateArr.filter((item) => item === true).length;
+  if (tureCount) {
+    // 每个按钮预计90宽度
+    var countWidth = tureCount * 90;
+    console.log(countWidth);
+    return countWidth;
+  } else {
+    return 0;
+  }
 }
 
 // console.log = function () {
 
-// }
+// }
+
+export function handleWechatPush(send_weixin_data1, serviceId) {
+  return new Promise((resolve, reject) => {
+    GetDataByName(send_weixin_data1)
+      .then((response) => {
+        console.log("微信推送(获取参数)======>", response);
+        if (response.data.message == "ok") {
+          var receiverStr = response.data.list[0].receivers;
+          var receiverArr = receiverStr.split(",");
+          var value1 = response.data.list[0].value1;
+          var value2 = response.data.list[0].value2;
+          var value3 = response.data.list[0].value3;
+          var value4 = response.data.list[0].value4;
+          var send_weixin_data2 = {
+            target: receiverArr,
+            serviceId: serviceId,
+            content: [
+              { color: "#173177", value: value1 },
+              { color: "#173177", value: value2 },
+              { color: "#173177", value: value3 },
+              { color: "#173177", value: value4 },
+            ],
+          };
+
+          wxpush(send_weixin_data2)
+            .then((response) => {
+              console.log("微信推送(发送返回)======>", response);
+              resolve(response);
+            })
+            .catch((error) => {
+              reject(error);
+            });
+        } else {
+          reject(new Error("获取推送参数失败"));
+        }
+      })
+      .catch((error) => {
+        reject(error);
+      });
+  });
+}
+
+export function handleWechatPushOfOrder(send_weixin_data1, serviceId) {
+  return new Promise((resolve, reject) => {
+    GetDataByName(send_weixin_data1)
+      .then((response) => {
+        console.log("微信推送(获取参数)======>", response);
+        if (response.data.message == "ok") {
+          var receiverStr = response.data.list[0].receivers;
+          var receiverArr = receiverStr.split(",");
+          var value1 = response.data.list[0].value1;
+          var value2 = response.data.list[0].value2;
+          var value3 = response.data.list[0].value3;
+          var value4 = response.data.list[0].value4;
+          var value5 = response.data.list[0].value5;
+
+          value4 =
+            value4.length > 17 ? value4.substring(0, 17) + "..." : value4;
+
+          value3 = value3.length > 5 ? value3.substring(0, 5) : value3;
+
+          var send_weixin_data2 = {
+            target: receiverArr,
+            serviceId: serviceId,
+            keys: [
+              "thing3",
+              "thing9",
+              "phrase5",
+              "thing14",
+              "character_string15",
+            ],
+            content: [
+              { color: "#173177", value: value1 },
+              { color: "#173177", value: value2 },
+              { color: "#173177", value: value3 },
+              { color: "#173177", value: value4 },
+              { color: "#173177", value: value5 },
+            ],
+          };
+
+          wxpush(send_weixin_data2)
+            .then((response) => {
+              console.log("微信推送(发送返回)======>", response);
+              resolve(response);
+            })
+            .catch((error) => {
+              reject(error);
+            });
+        } else {
+          reject(new Error("获取推送参数失败"));
+        }
+      })
+      .catch((error) => {
+        reject(error);
+      });
+  });
+}

src/views/basicData/noticeRemind/index.vue

@@ -887,7 +887,7 @@
           data.pastureid = this.setUp.temp.pastureid
           // data.service_id = this.setUp.temp.service_id
           data.type_name = this.temp.messageName
-          data.template_id = 'Z_6JHoSH344pVGNaaYM31bOAFYo69w63LdlfLBp3m0k'
+          //data.template_id = 'Z_6JHoSH344pVGNaaYM31bOAFYo69w63LdlfLBp3m0k'
           data.id = this.setUp.temp.id
           data.user = this.selectList2
           data.remind_type = parseInt(this.temp.sendingMethod)  //发送方式123
@@ -906,7 +906,7 @@
           data.user = this.selectList2
           data.sys_name = 'tmrWatch'
           data.type_name = this.temp.messageName
-          data.template_id = 'Z_6JHoSH344pVGNaaYM31bOAFYo69w63LdlfLBp3m0k'
+          //data.template_id = 'Z_6JHoSH344pVGNaaYM31bOAFYo69w63LdlfLBp3m0k'
           data.pastureid = Cookies.get('pastureid')
           data.remind_type = parseInt(this.temp.sendingMethod)  //发送方式123
           data.delay_time = delayedTime //延时
@@ -926,7 +926,7 @@
           data.user = this.selectList2
           data.sys_name = 'tmrWatch'
           data.type_name = this.temp.messageName
-          data.template_id = 'Z_6JHoSH344pVGNaaYM31bOAFYo69w63LdlfLBp3m0k'
+          //data.template_id = 'Z_6JHoSH344pVGNaaYM31bOAFYo69w63LdlfLBp3m0k'
           data.pastureid = Cookies.get('pastureid')
           data.remind_type = parseInt(this.temp.sendingMethod)  //发送方式123
           data.cycle_type = '4'//发送机制

src/views/businessManagement/remoteService/index.vue

@@ -959,6 +959,7 @@ import {
   checkButtons,
   calculativeWidth,
   wxpush,
+  handleWechatPush,
 } from "@/api/common";
 import Cookies from "js-cookie";
 import { parseTime, json2excel } from "@/utils/index.js";
@@ -1775,33 +1776,8 @@ export default {
                 },
               };
 
-              GetDataByName(send_weixin_data1).then((response) => {
-                console.log("微信推送(获取参数)======>", response);
-                if (response.data.message == "ok") {
-                  var receiverStr = response.data.list[0].receivers;
-                  var receiverArr = receiverStr.split(",");
-                  var value1 = response.data.list[0].value1;
-                  var value2 = response.data.list[0].value2;
-                  var value3 = response.data.list[0].value3;
-                  var value4 = response.data.list[0].value4;
-                  var send_weixin_data2 = {
-                    target: receiverArr,
-                    serviceId: 23,
-                    content: [
-                      { color: "#173177", value: value1 },
-                      { color: "#173177", value: value2 },
-                      { color: "#173177", value: value3 },
-                      { color: "#173177", value: value4 },
-                    ],
-                  };
-
-                  wxpush(send_weixin_data2).then((response) => {
-                    console.log("微信推送(获取参数)======>", response);
-                  });
-                  // this.tableSumMoney = response.data.list[0].totlePrice
-                } else {
-                  // this.$notify({ title: '失败', message: '消息推送失败', type: 'error', duration: 2000 })
-                }
+              handleWechatPush(send_weixin_data1, 23).catch((error) => {
+                console.error("微信推送失败:", error);
               });
             } else {
               this.$notify({
@@ -1893,33 +1869,8 @@ export default {
               },
             };
 
-            GetDataByName(send_weixin_data1).then((response) => {
-              console.log("微信推送(获取参数)======>", response);
-              if (response.data.message == "ok") {
-                var receiverStr = response.data.list[0].receivers;
-                var receiverArr = receiverStr.split(",");
-                var value1 = response.data.list[0].value1;
-                var value2 = response.data.list[0].value2;
-                var value3 = response.data.list[0].value3;
-                var value4 = response.data.list[0].value4;
-                var send_weixin_data2 = {
-                  target: receiverArr,
-                  serviceId: 24,
-                  content: [
-                    { color: "#173177", value: value1 },
-                    { color: "#173177", value: value2 },
-                    { color: "#173177", value: value3 },
-                    { color: "#173177", value: value4 },
-                  ],
-                };
-
-                wxpush(send_weixin_data2).then((response) => {
-                  console.log("微信推送(获取参数)======>", response);
-                });
-                // this.tableSumMoney = response.data.list[0].totlePrice
-              } else {
-                // this.$notify({ title: '失败', message: '消息推送失败', type: 'error', duration: 2000 })
-              }
+            handleWechatPush(send_weixin_data1, 24).catch((error) => {
+              console.error("微信推送失败:", error);
             });
           }
         });
@@ -2001,33 +1952,8 @@ export default {
                 },
               };
 
-              GetDataByName(send_weixin_data1).then((response) => {
-                console.log("微信推送(获取参数)======>", response);
-                if (response.data.message == "ok") {
-                  var receiverStr = response.data.list[0].receivers;
-                  var receiverArr = receiverStr.split(",");
-                  var value1 = response.data.list[0].value1;
-                  var value2 = response.data.list[0].value2;
-                  var value3 = response.data.list[0].value3;
-                  var value4 = response.data.list[0].value4;
-                  var send_weixin_data2 = {
-                    target: receiverArr,
-                    serviceId: 23,
-                    content: [
-                      { color: "#173177", value: value1 },
-                      { color: "#173177", value: value2 },
-                      { color: "#173177", value: value3 },
-                      { color: "#173177", value: value4 },
-                    ],
-                  };
-
-                  wxpush(send_weixin_data2).then((response) => {
-                    console.log("微信推送(获取参数)======>", response);
-                  });
-                  // this.tableSumMoney = response.data.list[0].totlePrice
-                } else {
-                  // this.$notify({ title: '失败', message: '消息推送失败', type: 'error', duration: 2000 })
-                }
+              handleWechatPush(send_weixin_data1, 23).catch((error) => {
+                console.error("微信推送失败:", error);
               });
             } else {
               this.$notify({
@@ -2150,42 +2076,9 @@ export default {
                   },
                 };
 
-                GetDataByName(send_weixin_data1).then((response) => {
-                  console.log("微信推送(获取参数)======>", response);
-                  if (response.data.message == "ok") {
-                    var receiverStr = response.data.list[0].receivers;
-                    var receiverArr = receiverStr.split(",");
-                    var value1 = response.data.list[0].value1;
-                    var value2 = response.data.list[0].value2;
-                    var value3 = response.data.list[0].value3;
-                    var value4 = response.data.list[0].value4;
-                    var send_weixin_data2 = {
-                      target: receiverArr,
-                      serviceId: 27,
-                      content: [
-                        { color: "#173177", value: value1 },
-                        { color: "#173177", value: value2 },
-                        { color: "#173177", value: value3 },
-                        { color: "#173177", value: value4 },
-                      ],
-                    };
-
-                    wxpush(send_weixin_data2).then((response) => {
-                      console.log("微信推送(获取参数)======>", response);
-                    });
-                    // this.tableSumMoney = response.data.list[0].totlePrice
-                  } else {
-                    // this.$notify({ title: '失败', message: '消息推送失败', type: 'error', duration: 2000 })
-                  }
+                handleWechatPush(send_weixin_data1, 27).catch((error) => {
+                  console.error("微信推送失败:", error);
                 });
-
-                if (this.isHome == "home") {
-                  // 返回首页
-                  this.$router.push({
-                    name: "Dashboard",
-                    params: { isTodo: "remote" },
-                  });
-                }
               } else {
                 this.$notify({
                   title: "失败",
@@ -2261,33 +2154,8 @@ export default {
                     },
                   };
 
-                  GetDataByName(send_weixin_data1).then((response) => {
-                    console.log("微信推送(获取参数)======>", response);
-                    if (response.data.message == "ok") {
-                      var receiverStr = response.data.list[0].receivers;
-                      var receiverArr = receiverStr.split(",");
-                      var value1 = response.data.list[0].value1;
-                      var value2 = response.data.list[0].value2;
-                      var value3 = response.data.list[0].value3;
-                      var value4 = response.data.list[0].value4;
-                      var send_weixin_data2 = {
-                        target: receiverArr,
-                        serviceId: 26,
-                        content: [
-                          { color: "#173177", value: value1 },
-                          { color: "#173177", value: value2 },
-                          { color: "#173177", value: value3 },
-                          { color: "#173177", value: value4 },
-                        ],
-                      };
-
-                      wxpush(send_weixin_data2).then((response) => {
-                        console.log("微信推送(获取参数)======>", response);
-                      });
-                      // this.tableSumMoney = response.data.list[0].totlePrice
-                    } else {
-                      // this.$notify({ title: '失败', message: '消息推送失败', type: 'error', duration: 2000 })
-                    }
+                  handleWechatPush(send_weixin_data1, 26).catch((error) => {
+                    console.error("微信推送失败:", error);
                   });
                 } else {
                   this.$notify({

src/views/productManagement/installationOrder/components/AddDialog.vue

@@ -384,7 +384,13 @@
 </template>
 
 <script>
-import { GetDataByName, GetDataByNames, ExecDataByConfig } from "@/api/common";
+import {
+  GetDataByName,
+  GetDataByNames,
+  ExecDataByConfig,
+  handleWechatPushOfOrder,
+} from "@/api/common";
+import Cookies from "js-cookie";
 
 export default {
   name: "AddDialog",
@@ -741,10 +747,29 @@ export default {
             // 调用保存接口
             ExecDataByConfig(params)
               .then((response) => {
+                console.log("response", response);
                 if (response.msg === "ok") {
                   this.$message.success("保存成功");
                   this.handleDialogClose();
                   this.$emit("success");
+
+                  var rowId = response.data[0].resultmaps.LastInsertId;
+
+                  var send_weixin_data1 = {
+                    name: "getRemindData",
+                    parammaps: {
+                      userId: Cookies.get("g_userId"),
+                      remindId: 76,
+                      remindTypeName: "服务工单",
+                      rowId: rowId,
+                    },
+                  };
+
+                  handleWechatPushOfOrder(send_weixin_data1, 76).catch(
+                    (error) => {
+                      console.error("微信推送失败:", error);
+                    }
+                  );
                 } else {
                   this.$message.error(response.data || "保存失败");
                 }

src/views/productManagement/installationOrder/components/CheckDialog.vue

@@ -194,6 +194,7 @@ export default {
     initForm() {
       this.form = {
         serviceStaffId: parseInt(this.currentUser.id),
+        serviceStaffName: "",
         customContact: "",
         telephone: "",
         checkDate: this.formatDate(new Date()),
@@ -292,6 +293,10 @@ export default {
               isNewContact: isNewContact,
               orderId: this.rowData.id,
               serviceStaffId: this.form.serviceStaffId,
+              serviceStaffName:
+                this.installerOptions.find(
+                  (item) => item.value === this.form.serviceStaffId
+                )?.label || "",
               customContact: this.form.customContact,
               telephone: this.form.telephone,
               checkDate: this.formatDate(this.form.checkDate),

src/views/productManagement/installationOrder/components/DispatchDialog.vue

@@ -71,8 +71,12 @@
 </template>
 
 <script>
-import { ExecDataByConfig, GetDataByName } from "@/api/common";
-
+import {
+  ExecDataByConfig,
+  GetDataByName,
+  handleWechatPushOfOrder,
+} from "@/api/common";
+import Cookies from "js-cookie";
 export default {
   name: "DispatchDialog",
   props: {
@@ -204,6 +208,7 @@ export default {
     // 提交表单
     handleSubmit() {
       this.$refs.form.validate(async (valid) => {
+        var dispatcherId = this.form.dispatcherId;
         if (valid) {
           try {
             const params = {
@@ -259,6 +264,20 @@ export default {
               this.$message.success("派单成功");
               this.handleDialogClose();
               this.$emit("success");
+
+              var send_weixin_data1 = {
+                name: "getRemindData",
+                parammaps: {
+                  userId: dispatcherId,
+                  remindId: 77,
+                  remindTypeName: "服务工单",
+                  rowId: this.rowData.id,
+                },
+              };
+
+              handleWechatPushOfOrder(send_weixin_data1, 77).catch((error) => {
+                console.error("微信推送失败:", error);
+              });
             } else {
               this.$message.error(response.msg || "派单失败");
             }

src/views/productManagement/installationOrder/index.vue

@@ -643,6 +643,7 @@ import {
   GetDataByNames,
   PostDataByName,
   ExecDataByConfig,
+  handleWechatPushOfOrder,
 } from "@/api/common";
 import AddDialog from "./components/AddDialog";
 import exportMixin from "@/mixins/exportMixin";
@@ -1244,6 +1245,9 @@ export default {
         type: "warning",
       });
       try {
+        var orderId_wx = row.id;
+        var userId_wx = this.currentUser.id;
+
         const params = {
           common: {
             returnmap: "0",
@@ -1275,6 +1279,21 @@ export default {
         const response = await ExecDataByConfig(params);
         if (response.msg === "ok") {
           this.$message.success("操作成功");
+
+          var send_weixin_data1 = {
+            name: "getRemindData",
+            parammaps: {
+              userId: userId_wx,
+              remindId: 80,
+              remindTypeName: "服务工单",
+              rowId: orderId_wx,
+            },
+          };
+
+          handleWechatPushOfOrder(send_weixin_data1, 80).catch((error) => {
+            console.error("微信推送失败:", error);
+          });
+
           this.getList();
         } else {
           this.$message.error(response.msg || "操作失败");
@@ -1309,6 +1328,9 @@ export default {
     // 处理验收确认
     async handleCheckConfirm(formData) {
       try {
+        var orderId_wx = this.currentRow.id;
+        var userId_wx = formData.serviceStaffId;
+
         const params = {
           common: {
             returnmap: "0",
@@ -1356,10 +1378,7 @@ export default {
             parammaps: {
               orderId: formData.orderId,
               checkUserId: formData.serviceStaffId,
-              checkUserName:
-                this.installerOptions.find(
-                  (item) => item.id === formData.serviceStaffId
-                )?.label || "",
+              checkUserName: formData.serviceStaffName,
               contactId: formData.isNewContact
                 ? "@insertContacts.LastInsertId"
                 : formData.customContact,
@@ -1385,6 +1404,21 @@ export default {
         if (response.msg === "ok") {
           this.$message.success("验收成功");
           this.checkDialogVisible = false;
+
+          var send_weixin_data1 = {
+            name: "getRemindData",
+            parammaps: {
+              userId: userId_wx,
+              remindId: 81,
+              remindTypeName: "服务工单",
+              rowId: orderId_wx,
+            },
+          };
+
+          handleWechatPushOfOrder(send_weixin_data1, 81).catch((error) => {
+            console.error("微信推送失败:", error);
+          });
+
           this.getList();
         } else {
           this.$message.error(response.msg || "验收失败");
@@ -1473,6 +1507,9 @@ export default {
     // 处理驳回
     async handleRejectConfirm(form) {
       try {
+        var orderId_wx = this.currentRow.id;
+        var userId_wx = this.currentUser.id;
+
         const params = {
           common: {
             returnmap: "0",
@@ -1507,6 +1544,21 @@ export default {
           this.$message.success("驳回成功");
           this.rejectDialogVisible = false;
           this.viewDialogVisible = false;
+
+          var send_weixin_data1 = {
+            name: "getRemindData",
+            parammaps: {
+              userId: userId_wx,
+              remindId: 78,
+              remindTypeName: "服务工单",
+              rowId: orderId_wx,
+            },
+          };
+
+          handleWechatPushOfOrder(send_weixin_data1, 78).catch((error) => {
+            console.error("微信推送失败:", error);
+          });
+
           this.getList();
         } else {
           this.$message.error(response.msg || "驳回失败");
@@ -1519,6 +1571,9 @@ export default {
     // 处理接单
     async handleAcceptConfirm(form) {
       try {
+        var orderId_wx = this.currentRow.id;
+        var userId_wx = this.currentUser.id;
+
         const params = {
           common: {
             returnmap: "0",
@@ -1555,6 +1610,21 @@ export default {
           this.$message.success("接单成功");
           this.acceptDialogVisible = false;
           this.viewDialogVisible = false;
+
+          var send_weixin_data1 = {
+            name: "getRemindData",
+            parammaps: {
+              userId: userId_wx,
+              remindId: 79,
+              remindTypeName: "服务工单",
+              rowId: orderId_wx,
+            },
+          };
+
+          handleWechatPushOfOrder(send_weixin_data1, 79).catch((error) => {
+            console.error("微信推送失败:", error);
+          });
+
           this.getList();
         } else {
           this.$message.error(response.msg || "接单失败");
@@ -1570,7 +1640,7 @@ export default {
     },
     // 判断当前用户是否在服务人员列表中
     isCurrentUserInServiceStaff(serviceStaffIds) {
-      console.log("serviceStaffIds", serviceStaffIds);
+      //console.log("serviceStaffIds", serviceStaffIds);
       if (!serviceStaffIds) return false;
       const currentUserId = parseInt(this.currentUser.id);
       const staffIds = serviceStaffIds