wenhongquan 2 years ago
parent
commit
915b5cabf7

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

@@ -325,8 +325,9 @@ export default defineComponent({
     const doinit = (data) => {
     const doinit = (data) => {
       // console.log(getters.value)
       // console.log(getters.value)
       listTask({ taskCode: moment().year() + "" }).then((res) => {
       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)); })
         taskinfo.value.taskCode =
         taskinfo.value.taskCode =
-          moment().format("yyyyMMDD") + (Array(4).join(0) + (res.total + 1)).slice(-4);
+          moment().format("yyyyMMDD") + (Array(4).join(0) + (max + 1)).slice(-4);
       });
       });
       taskinfo.value = data;
       taskinfo.value = data;
 
 

+ 6 - 1
src/views/detection/list/index.vue

@@ -695,6 +695,7 @@ const resetall = () => {
     params: {
     params: {
     },
     },
   }
   }
+  localStorage.setItem("detectionlist", JSON.stringify(queryparameters.value));
 }
 }
 
 
 const initadd = () => {
 const initadd = () => {
@@ -768,6 +769,7 @@ const onadd = () => {
 };
 };
 
 
 const getList = () => {
 const getList = () => {
+  localStorage.setItem("detectionlist", JSON.stringify(queryparameters.value));
   if (currentstatus.value != 1) {
   if (currentstatus.value != 1) {
     if (currentstatus.value == 2) {
     if (currentstatus.value == 2) {
       queryparameters.value.params["status"] = "1,2,3";
       queryparameters.value.params["status"] = "1,2,3";
@@ -776,7 +778,7 @@ const getList = () => {
     }
     }
     // delete queryparameters.value.status;
     // delete queryparameters.value.status;
   } else {
   } else {
-    queryparameters.value.status = "";
+    // queryparameters.value.status = "";
   }
   }
 
 
   var cq = cloneDeep(queryparameters.value);
   var cq = cloneDeep(queryparameters.value);
@@ -868,6 +870,9 @@ const deltask = (row) => {
     });
     });
   });
   });
   initadd();
   initadd();
+  if (localStorage.getItem("detectionlist") != null) {
+    queryparameters.value = JSON.parse(localStorage.getItem("detectionlist"));
+  }
   getList();
   getList();
 
 
   listDept().then((response) => {
   listDept().then((response) => {

+ 9 - 1
src/views/maintain/list/index.vue

@@ -522,6 +522,7 @@ const resetall = () => {
     pageSize: 10,
     pageSize: 10,
 
 
   };
   };
+  localStorage.setItem("maintainlist", JSON.stringify(queryparameters.value));
 }
 }
 
 
 const initadd = () => {
 const initadd = () => {
@@ -615,6 +616,7 @@ const onadd = () => {
 };
 };
 
 
 const getList = () => {
 const getList = () => {
+  localStorage.setItem("maintainlist", JSON.stringify(queryparameters.value));
   if (currentstatus.value != 1) {
   if (currentstatus.value != 1) {
     if (currentstatus.value == 2) {
     if (currentstatus.value == 2) {
       queryparameters.value.params["status"] = "1,2,3,4";
       queryparameters.value.params["status"] = "1,2,3,4";
@@ -622,8 +624,10 @@ const getList = () => {
       queryparameters.value.status = currentstatus.value;
       queryparameters.value.status = currentstatus.value;
     }
     }
   } else {
   } else {
-    queryparameters.value.status = "";
+    // queryparameters.value.status = "";
   }
   }
+  // console.error(queryparameters.value.status)
+
   var cq = cloneDeep(queryparameters.value);
   var cq = cloneDeep(queryparameters.value);
   var query = proxy.addDateRange(cq, qdate.value);
   var query = proxy.addDateRange(cq, qdate.value);
   if (query.status == "0") {
   if (query.status == "0") {
@@ -701,6 +705,10 @@ onMounted(() => { });
     });
     });
   });
   });
   initadd();
   initadd();
+  if (localStorage.getItem("maintainlist") != null) {
+    queryparameters.value = JSON.parse(localStorage.getItem("maintainlist"));
+  }
+
   getList();
   getList();
 
 
   listDept().then((response) => {
   listDept().then((response) => {

+ 6 - 1
src/views/task/list/index.vue

@@ -369,6 +369,7 @@ const reset = () => {
     pageNum: 1,
     pageNum: 1,
     pageSize: 10,
     pageSize: 10,
   };
   };
+  localStorage.setItem("tasklist", JSON.stringify(queryparameters.value));
 };
 };
 
 
 const addtask = () => {
 const addtask = () => {
@@ -436,7 +437,7 @@ const ontaskadd = async () => {
 };
 };
 
 
 const getList = () => {
 const getList = () => {
-  console.log(queryparameters.value.status)
+  localStorage.setItem("tasklist", JSON.stringify(queryparameters.value));
 
 
   if (
   if (
     currentstatus.value !== "1" &&
     currentstatus.value !== "1" &&
@@ -470,6 +471,10 @@ const getList = () => {
     pagedata.value = response;
     pagedata.value = response;
   });
   });
 };
 };
+if (localStorage.getItem("tasklist")!=null) {
+  queryparameters.value = JSON.parse(localStorage.getItem("tasklist"));
+}
+
 getList();
 getList();
 const edittask = (row) => {
 const edittask = (row) => {
   taskinfo.value = cloneDeep(row);
   taskinfo.value = cloneDeep(row);