002201 2 năm trước cách đây
mục cha
commit
dcd4bde401

+ 5 - 4
src/components/popover-tree-select/index.vue

@@ -97,6 +97,7 @@ export default {
   watch: {
     "$props.value": {
       handler: function (newProp) {
+        console.log("newProp", newProp);
         if (!newProp) this.lastSelectData = [];
       },
       immediate: true,
@@ -310,7 +311,7 @@ export default {
         overflow: hidden;
       "
     >
-      <div v-if="multiple && selectData.length">
+      <div v-if="multiple && lastSelectData.length">
         <el-popover
           :offset="-10"
           :width="width"
@@ -321,10 +322,10 @@ export default {
           placement="bottom-start"
         >
           <el-tag slot="reference" :size="size" style="margin-right: 10px">
-            + {{ selectData.length }}
+            + {{ lastSelectData.length }}
           </el-tag>
           <el-tag
-            v-for="(tag, index) in selectData"
+            v-for="(tag, index) in lastSelectData"
             :size="size"
             hit
             closable
@@ -332,7 +333,7 @@ export default {
               display: 'flex',
               justifyContent: 'space-between',
               alignItems: 'center',
-              margin: selectData.length - 1 === index ? '0' : '0 0 5px 0',
+              margin: lastSelectData.length - 1 === index ? '0' : '0 0 5px 0',
             }"
             @close="useDelete(index)"
           >

+ 1 - 1
src/views/purchase/task/first-direct/index.vue

@@ -58,7 +58,7 @@ export default {
         if (code === 200) {
           this.hide();
           this.$emit("success");
-          this.$notify.success({ title: msg });
+          this.$notify.success({ title: msg, duration: 0 });
         } else {
           this.$notify.warning({ title: msg });
         }

+ 16 - 13
src/views/purchase/task/index.vue

@@ -47,8 +47,6 @@ export default {
         if (code === 200) {
           this.tableData = rows;
           this.page.total = total;
-        } else {
-          this.$notify.warning({ title: msg });
         }
       } catch (err) {
         // catch
@@ -58,17 +56,23 @@ export default {
       }
     },
     // 查 询
-    useQuery(prop, page) {
+    async useQuery(prop, page) {
       const { pageNum, pageSize } = page;
-      const { date, documentsCodes } = prop;
-      prop.endDate = date[1];
-      prop.startDate = date[0];
-      prop.documentsCodes = documentsCodes
-        ? documentsCodes.split(",")
-        : undefined;
-      this.fetchList(
-        { ...prop, date: undefined },
-        { pageNum, pageSize, isAsc: "desc", orderByColumn: "createTime" }
+      const {
+        date: [startDate, endDate],
+        documentsCodes,
+      } = prop;
+      await this.fetchList(
+        {
+          ...prop,
+          endDate,
+          startDate,
+          date: undefined,
+          documentsCodes: documentsCodes
+            ? documentsCodes.replace(/\s*/g, "").replaceAll(",", ",")
+            : undefined,
+        },
+        { pageNum, pageSize, isAsc: "desc", orderByColumn: "updateTime" }
       );
     },
     // 重 置
@@ -157,7 +161,6 @@ export default {
               :clearable="column.clearable"
               :placeholder="column.placeholder"
               style="width: 100%"
-              @change="useQuery(params, page)"
               @keyup.enter.native="useQuery(params, page)"
             ></el-input>
             <el-select