From ed6c6350015d52ea1cb033c7558f72b721ece84a Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期四, 19 十二月 2024 19:58:55 +0800
Subject: [PATCH] 打包名称修改,去除错误输出

---
 admin-web/src/views/foundation/classification/index.vue |  275 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 149 insertions(+), 126 deletions(-)

diff --git a/admin-web/src/views/foundation/classification/index.vue b/admin-web/src/views/foundation/classification/index.vue
index 026e52c..f6acf85 100644
--- a/admin-web/src/views/foundation/classification/index.vue
+++ b/admin-web/src/views/foundation/classification/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-container>
-      <el-card shadow="never" style="width: 240px;margin-right: 15px">
+      <el-card shadow="never" style="width: 240px; margin-right: 15px">
         <my-tree ref="searchTree" :tree-list="treeDataList" @setNode="nodeClick" @search="search"></my-tree>
       </el-card>
       <el-container>
@@ -13,11 +13,16 @@
           <el-row style="margin-top: 15px">
             <el-col>
               <!--鍒楄〃-->
-              <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
+              <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
             </el-col>
           </el-row>
           <!--娣诲姞/缂栬緫寮圭獥-->
-          <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
+          <edit
+            v-if="editSetting.show"
+            :setting="editSetting"
+            @close="editSetting.show = false"
+            @search="refreshData"
+          />
         </el-card>
       </el-container>
     </el-container>
@@ -30,20 +35,21 @@
 </template>
 
 <script>
-import myTree from '@/components/myTree/index'
-import MyTableV2 from "@/components/myTable/myTableV2";
-import MyButton from "@/components/myButton/myButton";
+import myTree from '@/components/myTree/index';
+import MyTableV2 from '@/components/myTable/myTableV2';
+import MyButton from '@/components/myButton/myButton';
 import SettingIplatform from '@/utils/settingIplatform';
-import items from './items'
-import edit from './edit'
-import * as finsystenant from '@/api/baseSetting/finsystenant'
-import myImport from '@/views/components/myImport'
-import {updStatus} from "@/api/baseSetting/finsystenant";
-import {getBaseUrl, getUploadUrl} from '@/utils/base';
+import items from './items';
+import edit from './edit';
+import * as finsystenant from '@/api/baseSetting/finsystenant';
+import {getTree} from '@/api/foudation/classification';
+import myImport from '@/views/components/myImport';
+import {getBaseUrl} from '@/utils/base';
+import {getDicts} from '@/api/system/dict/data';
 
 export default {
-  name: "index",
-  components: {MyButton, MyTableV2, edit, myTree, myImport},
+  name: 'index',
+  components: { MyButton, MyTableV2, edit, myTree, myImport },
   data() {
     return {
       // 鎼滅储妗�
@@ -55,25 +61,25 @@
         tenantId: null,
         userName: null,
         userPhone: null,
-        status: 1
+        states: 1,
       },
       // 瀵煎叆
       importSetting: {
-          dialogTitle: '瀵煎叆',
-          dialogShow: false,
-          fileSettings: {
-              data: {},
-              uploadUrl: getBaseUrl()+"/pc/fin/sys/tenant/import", // 涓婁紶鍦板潃
-              accept: '.xls', // 鏍煎紡
-              type: 'text', // 鍥炴樉褰㈠紡
-              loading: false // 瀵煎叆鏁堟灉
-          },
-          /* 妯℃澘涓嬭浇 */
-          templateSettings: {
-              templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
-              templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
-          },
-          onSuccess: null
+        dialogTitle: '瀵煎叆',
+        dialogShow: false,
+        fileSettings: {
+          data: {},
+          uploadUrl: getBaseUrl() + '/pc/base/category/import', // 涓婁紶鍦板潃
+          accept: '.xls', // 鏍煎紡
+          type: 'text', // 鍥炴樉褰㈠紡
+          loading: true, // 瀵煎叆鏁堟灉
+        },
+        /* 妯℃澘涓嬭浇 */
+        templateSettings: {
+          templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
+          templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate?type=classification', // 涓嬭浇鍦板潃
+        },
+        onSuccess: null,
       },
       editSetting: {
         title: '',
@@ -85,14 +91,16 @@
       table: {
         showIndex: true, // 鏄惁鏄剧ず搴忓彿
         expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
-        url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+        url: SettingIplatform.apiBaseURL + '/pc/base/category/list', // 璇锋眰鍦板潃
         // 宸ュ叿鏉�
         tools: {
-          columnsCtrl: {// 鍒楁帶鍒舵寜閽�
-            show: false
+          columnsCtrl: {
+            // 鍒楁帶鍒舵寜閽�
+            show: false,
           },
-          generalExport: {// 閫氱敤瀵煎嚭鎸夐挳
-            show: false
+          generalExport: {
+            // 閫氱敤瀵煎嚭鎸夐挳
+            show: false,
           },
           // 鑷畾涔夊伐鍏锋潯鎸夐挳
           custom: [
@@ -102,45 +110,52 @@
                 this.showAdd(null);
               },
             },
-          ]
+            {
+              name: '瀵煎叆',
+              click: () => {
+                this.openImport(null);
+              },
+            },
+          ],
         },
         // 鍒椾俊鎭�
         columns: [
-          {title: '鍒嗙被鍚嶇О', field: 'category_Name', align: 'center'},
-          {title: '绫诲埆', field: 'classification', align: 'left'},
-          {title: '鏄剧ず椤哄簭', field: 'order_Number', align: 'center', width: '80px'},
+          { title: '鍒嗙被鍚嶇О', field: 'categoryName', align: 'left', minWidth: 140 },
+          { title: '绫诲埆', field: 'classification', align: 'center', width: 100 },
+          { title: '鏄剧ず椤哄簭', field: 'orderNumber', align: 'center', width: 100 },
           {
             field: 'states',
             title: '鐘舵��',
             align: 'center',
             width: 100,
-            switch: row => {
-              const result = {}
-              if (row.status == 1) {
+            switch: (row) => {
+              const result = {};
+              if (row.states == 1) {
                 Object.assign(result, {
                   value: true, // 寮�
                   label: '鏄�', // 寮�鐨勬弿杩�
-                  click: () => { // 鐐瑰嚮浜嬩欢
-                    this.updState(row)
-                  }
-                })
+                  click: () => {
+                    // 鐐瑰嚮浜嬩欢
+                    this.updState(row);
+                  },
+                });
               } else {
                 Object.assign(result, {
                   value: false, // 鍏�
                   label: '鍚�', // 鍏崇殑鎻忚堪
                   click: () => {
-                    this.updState(row)
-                  }
-                })
+                    this.updState(row);
+                  },
+                });
               }
-              return result
-            }
-          }
+              return result;
+            },
+          },
         ],
         // 鎿嶄綔淇℃伅
         operation: {
           show: true, // 鏄剧ず鎿嶄綔鍒�
-          width: '150', // 鍒楀
+          width: '160', // 鍒楀
           attr: [
             {
               title: '缂栬緫',
@@ -153,7 +168,7 @@
               events: (row) => {
                 this.del(row);
               },
-            }
+            },
           ],
         },
         paging: {
@@ -163,79 +178,78 @@
             small: false,
             pageNum: 1,
             pageSize: 10,
-            total: 0
-          }
-        }
+            total: 0,
+          },
+        },
       },
-    }
+    };
   },
   created() {
     // 鑾峰彇鏈烘瀯鏍�
-    this.initTreeData()
+    this.initTreeData();
+    // 绫诲埆瀛楀吀
+    getDicts('GOODS_PRICE').then((res) => {
+      this.items[1].options = res.map((v) => {
+        v.label = v.dict_label;
+        v.value = v.dict_value;
+        return v;
+      });
+    });
   },
   methods: {
     //瀵煎叆
     importOrg() {
-        this.importSetting.dialogShow = true
-        this.importSetting.onSuccess = (response, callBack) => {
-            if (response.code===1){
-              this.$message.success(response.msg)
-              this.search(1)
-            }else{
-              this.$message.warning(response.msg)
-            }
-            callBack()
+      this.importSetting.dialogShow = true;
+      this.importSetting.onSuccess = (response, callBack) => {
+        if (response.code === 1) {
+          this.$message.success(response.msg);
+          this.search(1);
+        } else {
+          this.$message.warning(response.msg);
         }
+        callBack();
+      };
     },
     // 宸︿晶鏍戝垵濮嬪寲
     initTreeData() {
-      finsystenant.getTree().then(res => {
-        const content = res || []
-        this.treeDataList.splice(0, this.treeDataList.length)
-        this.treeDataList = content
-        if (content.length > 0) {
-          this.importSetting.fileSettings.data = {pid: content[0].id}
-        }
-      })
+      getTree().then((res) => {
+        const content = res || [];
+        this.treeDataList = content;
+      });
     },
     updState(row) {
-      let vm = this
-      let text = row.status == 0 ? "鍚敤" : "绂佺敤";
-      vm.$modal.confirm('纭瑕�' + text + '"' + row.name + '"鍚楋紵').then(function () {
-        let params = Object.assign({}, row)
-        params.status = row.status == 1 ? 0 : 1
-        finsystenant.edit(params).then(res => {
+      let vm = this;
+      let text = row.states == 0 ? '鍚敤' : '绂佺敤';
+      vm.$modal.confirm('纭瑕�' + text + '"' + row.categoryName + '"鍚楋紵').then(function () {
+        let params = Object.assign({}, row);
+        params.states = row.states == 1 ? 0 : 1;
+        finsystenant.edit(params).then((res) => {
           if (res) {
-            row.status = row.status === 1 ? 0 : 1
-            vm.$modal.msgSuccess(text + "鎴愬姛");
-            vm.search()
+            row.states = row.states === 1 ? 0 : 1;
+            vm.$modal.msgSuccess(text + '鎴愬姛');
+            vm.search();
           }
         })
-      })
+      });
     },
     del(row) {
-      this.$modal
-        .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
+      var that = this
+      this.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.categoryName + '"鐨勬満鏋勫悧锛�')
         .then(function () {
-          finsystenant.del({id: row.id}).then((res) => {
-          });
-        })
-        .then((res) => {
-          this.$message.success('鍒犻櫎鎴愬姛锛�');
-          this.search()
-        })
-        .catch(() => {
-        });
+          finsystenant.del({ id: row.id }).then((res) => {
+            that.$message.success('鍒犻櫎鎴愬姛锛�');
+            that.refreshData();
+          })
+      });
     },
     showAdd() {
-      // if (!this.editSetting.orgId) {
-      //   this.$message.warning('璇峰厛閫夋嫨宸︿晶鏈烘瀯')
-      // } else {
-        this.editSetting.id = null;
-        this.editSetting.info = null;
-        this.editSetting.title = '鏂板';
-        this.editSetting.show = true;
-      // }
+      if (this.p && this.p) {
+        this.editSetting.pid = this.p.id;
+      }
+      this.editSetting.id = null;
+      this.editSetting.info = null;
+      this.editSetting.title = '鏂板';
+      this.editSetting.show = true;
     },
     showAudit(row) {
       this.editSetting.id = row.id;
@@ -244,37 +258,46 @@
       this.editSetting.show = true;
     },
     nodeClick(param) {
-      param = param || {}
-      this.p = Object.assign({}, {
-        id: param.id,
-        name: param.name
-      })
+      param = param || {};
+      this.p = Object.assign(
+        {},
+        {
+          id: param.id,
+          name: param.name,
+        },
+      );
       if (this.p.id != undefined && this.p.id != null) {
-        this.filterFrom.tenantId = this.p.id
-        this.editSetting.orgId = this.p.id
+        this.filterFrom.fatherCategoryId = this.p.id;
+        this.editSetting.orgId = this.p.id;
       } else {
-        this.filterFrom.tenantId = null
-        this.editSetting.orgId = null
+        this.filterFrom.fatherCategoryId = null;
+        this.editSetting.orgId = null;
       }
-      this.importSetting.fileSettings.data = {pid: param.id}
-      this.search(1)
+      this.importSetting.fileSettings.data = { pid: param.id };
+      this.search(1);
     },
     // 鏌ヨtable鍒楄〃
     search(pageNum) {
       if (pageNum != undefined) {
-        this.$refs.myTable.search(pageNum)
+        this.$refs.myTable.search({ pageNum });
       } else {
-        this.$refs.myTable.search()
+        this.$refs.myTable.search();
       }
     },
+    refreshData() {
+      this.initTreeData();
+      this.search();
+    },
     fifterForm(params) {
-      this.filterFrom = Object.assign(this.filterFrom, params)
-      this.search(1)
-    }
-  }
-}
+      this.filterFrom = Object.assign(this.filterFrom, params);
+      this.search(1);
+    },
+
+    openImport(){
+      this.importOrg();
+    },
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

--
Gitblit v1.9.1