From f714a3478472565306b79ac91eff63b05a227b88 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 04 十二月 2023 11:09:48 +0800
Subject: [PATCH] Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01

---
 src/views/system/label/index.vue |   56 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/views/system/label/index.vue b/src/views/system/label/index.vue
index 7419008..f910400 100644
--- a/src/views/system/label/index.vue
+++ b/src/views/system/label/index.vue
@@ -325,19 +325,33 @@
 </template>
 
 <script>
-import { addUser, updateUser } from "@/api/system/user";
 import {
+  changetagcategory,
   toamendtag,
+  toamendtagcategory,
   addapitag,
+  addtagcategory,
   detailstag,
   deletetag,
-  changetagcategory,
-  toamendtagcategory,
-  addtagcategory,
   deletetagcategory,
+  exporttag,
   listtag,
   tagclassifylist,
 } from "@/api/system/label";
+import {
+  listbase_tag,
+  getbase_tag,
+  addbase_tag,
+  updatebase_tag,
+  delbase_tag,
+} from "@/api/smartorpor/base_tag";
+import {
+  listbase_tagcategory,
+  getbase_tagcategory,
+  addbase_tagcategory,
+  updatebase_tagcategory,
+  delbase_tagcategory,
+} from "@/api/smartorpor/base_tagcategory";
 
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -510,9 +524,10 @@
 
   methods: {
     /** 鏌ヨ鏍囩鍒楄〃 */
-    getList() {
+    getList(row) {
+      console.log(row);
+      console.log(this.queryParams);
       listtag(this.addDateRange(this.queryParams)).then((response) => {
-        console.log(response);
         this.total = response.total;
         this.userList = response.rows;
       });
@@ -546,11 +561,14 @@
       if (this.lstamendtag) {
         toamendtag(this.addDateRange(this.tagform)).then((response) => {
           console.log(response);
+          this.lstamendtagVisible = false;
           this.getList();
         });
       } else {
         addapitag(this.addDateRange(this.tagform)).then((response) => {
           console.log(response);
+          this.lstamendtagVisible = false;
+
           this.getList();
         });
       }
@@ -638,17 +656,17 @@
     // 鏍囩鐘舵�佷慨鏀�
     handleStatusChange(row) {
       console.log(row.isupload);
-      let text = row.isupload === "0" ? "鍚敤" : "鍋滅敤";
+      let text = row.isupload == 0 ? "鍋滅敤" : "鍚敤";
       this.$modal
         .confirm('纭瑕�"' + text + '""' + row.tagname + '"鏍囩鍚楋紵')
         .then(function () {
-          return changetagcategory(row.tagid, row.isupload);
+          return toamendtag(row);
         })
         .then(() => {
           this.$modal.msgSuccess(text + "鎴愬姛");
         })
         .catch(function () {
-          row.isupload = row.isupload === "0" ? "1" : "0";
+          row.isupload = row.isupload == 0 ? 1 : 0;
         });
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -671,26 +689,6 @@
       this.multiple = !selection.length;
     },
 
-    /** 鏇存柊/淇敼鎻愪氦鎸夐挳 */
-    submitForm: function () {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then((response) => {
-              this.$modal.msgSuccess("淇敼鎴愬姛");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addUser(this.form).then((response) => {
-              this.$modal.msgSuccess("鏂板鎴愬姛");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       console.log(row, "鍒犻櫎寮圭獥");

--
Gitblit v1.9.3