wenhongquan 1 年之前
父节点
当前提交
49de9482ab
共有 3 个文件被更改,包括 19 次插入6 次删除
  1. 4 1
      src/components/Task/Add/index.vue
  2. 3 1
      src/views/mb/task/detail/index.vue
  3. 12 4
      src/views/task/detail/index.vue

+ 4 - 1
src/components/Task/Add/index.vue

@@ -325,7 +325,10 @@ export default defineComponent({
     const doinit = (data) => {
       // console.log(getters.value)
       listTask({ taskCode: moment().year() + "" }).then((res) => {
-        var max =  res.rows.reduce((a,b) => { return Math.max(parseFloat(a.taskCode) ? parseFloat(a.taskCode) : a, parseFloat(b.taskCode)); })
+        var max = 0;
+        if (res.rows.length == 0) { } else {
+          max =  res.rows.reduce((a,b) => { return Math.max(parseFloat(a.taskCode) ? parseFloat(a.taskCode) : a, parseFloat(b.taskCode)); })
+        }
         taskinfo.value.taskCode =
           moment().format("yyyyMMDD") + (Array(4).join(0) + (max + 1)).slice(-4);
       });

+ 3 - 1
src/views/mb/task/detail/index.vue

@@ -689,7 +689,9 @@ const gettasklist = () => {
     }
     taskinfo.value = res.data;
     taskinfo.value.tblTaskLogList = lists;
-    console.log( taskinfo.value)
+    console.log(taskinfo.value)
+
+    moment().subtract
 
     // var logs = (taskinfo.value.tblTaskLogList ?? []).filter(
     //   (i) => i.taskStatus == 2

+ 12 - 4
src/views/task/detail/index.vue

@@ -1400,11 +1400,11 @@ const gettaskInfoText = () => {
   try {
     var datap = "事件分类:" + (task_type.value.filter(
     (i) =>
-      i.value.toString() === taskinfo.value.taskType.toString()
+      i.value == taskinfo.value.taskType
   )[0]?.label ?? "-") + "\r\n";
   datap+="区域:"+  (sys_area.value.filter(
     (i) =>
-      i.value.toString() === taskinfo.value.taskArea.toString()
+      i.value == taskinfo.value.taskArea
         )[0]?.label ?? "-") + "\r\n";
    datap+="班组:"+((taskinfo.value.taskDeptRange ?? "")
                   .split(",")
@@ -1423,8 +1423,9 @@ const gettaskInfoText = () => {
         datap+="事件内容:"+(taskinfo.value.taskContent)+ "\r\n";
         datap+="事件类型:"+(task_event_type.value.filter(
                   (i) =>
-                    i.value.toString() === taskinfo.value.taskEventType.toString()
-                )[0]?.label ?? "-")+ "\r\n";
+                    (i.value) == taskinfo.value.taskEventType
+        )[0]?.label ?? "-") + "\r\n";
+    try {
         datap+="现场核实:"+(JSON.parse(
                     taskinfo.value.tblTaskLogList.filter(
                       (ii) => ii.taskStatus === 3
@@ -1439,8 +1440,15 @@ const gettaskInfoText = () => {
                       (ii) => ii.taskStatus === 3
                     )[0].logDes ?? "{}"
         ).czff)) + "\r\n";
+    } catch (ee) {
+      datap += "现场核实:" + "\r\n";
+        datap+="处理方法:" + "\r\n";
+
+    }
+
     return datap;
   } catch (error) {
+   console.log(taskinfo.value.tblTaskLogList)
 
   }
   return "";