刘恒 1 год назад
Родитель
Сommit
0f76daefec

+ 1 - 1
.env.development

@@ -1,4 +1,4 @@
-VUE_APP_API_BASE_URL='http://192.168.0.42:8080'
+VUE_APP_API_BASE_URL='http://192.168.0.29:8081'
 
 
 #VUE_APP_API_BASE_URL='https://test.baoxianzhanggui.com/web-api'

+ 17 - 7
src/components/tree/allTree.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="tree">
     <a-tree
-      v-if="treeData && treeData.length > 0"
+      
       :tree-data="treeData"
       :title="'11'"
       :replaceFields="replaceFields"
@@ -13,6 +13,7 @@
       :expanded-keys="expandedKeys"
       @expand="onExpand"
       ref="tree"
+      :default-checked-keys="checkList"
     >
       <template slot="custom" slot-scope="item">
         <span>{{ item }}</span>
@@ -32,6 +33,7 @@ export default {
     checkable: {
       default: false,
     },
+   
     // defaultCheckList: {
     //   default: [],
     // },
@@ -53,9 +55,11 @@ export default {
     ...mapState("setting", ["userInfo"]),
   },
   watch: {},
-  created() {},
-  mounted() {
+  created() {
     this.getMechanismTree();
+  },
+  mounted() {
+  
   },
   methods: {
     onExpand(expandedKeys) {
@@ -68,16 +72,22 @@ export default {
         // this.$refs.tree.expandedKeys = ["99D17"];
         // this.$refs.tree.defaultExpandedKeys = ["99D17"];
         // console.log(this.$refs.tree);
-        // this.expandedKeys = ["99D17"];
-        // this.checkList = ["99D17"];
+        this.expandedKeys = [];
+        this.checkList = [];
         this.$API.sysManage
           .getUserItem({
             userId: item.id,
           })
           .then((res) => {
             if (res.data.code === 200) {
-              this.expandedKeys = res.data.data.deptIds;
-              this.checkList = res.data.data.deptIds;
+              // this.getMechanismTree();
+             
+              setTimeout(()=>{
+
+                this.expandedKeys = res.data.data.deptIds;
+                this.checkList = res.data.data.deptIds;
+                
+              },500)
             }
           });
       });

+ 7 - 7
src/pages/business/orderMessage.vue

@@ -65,7 +65,7 @@
       </div>
       <div style="background-color: #fff; margin-top: 15px">
         <div class="table-title">
-          <h2>保费详情</h2>
+          <h2>订单详情</h2>
           <div>
             <datePicker @getList="timeChange"></datePicker>
             <!-- <span>时间筛选</span>
@@ -175,19 +175,19 @@ const columns = [
   },
   {
     title: "交强险保费",
-    dataIndex: "jqpremium",
+    dataIndex: "jqPremium",
   },
   {
     title: "车船税",
-    dataIndex: "taxamount",
+    dataIndex: "taxAmount",
   },
   {
     title: "商业险保费",
-    dataIndex: "sypremium",
+    dataIndex: "syPremium",
   },
   {
     title: "非车险保费",
-    dataIndex: "jypremium",
+    dataIndex: "jyPremium",
   },
   {
     title: "毛利润",
@@ -315,8 +315,8 @@ export default {
         .then((res) => {
           if (res.data.code === 200) {
             this.loading = false;
-            this.tableList = res.data.data.records;
-            this.pagination.current= res.data.data.current
+            this.tableList = res.data.data.list;
+            this.pagination.current= res.data.data.pages
             this.pagination.defaultPageSize= res.data.data.size
             this.pagination.total= res.data.data.total
             

+ 21 - 4
src/pages/sys/permissionsAuth.vue

@@ -36,6 +36,7 @@
             @checkTree="checkTree"
             ref="tree"
             @getList="getMessageList"
+            :list="treeData"
           ></tree>
         </div>
         <div style="flex: 1">
@@ -254,15 +255,31 @@ export default {
       searchName: "",
       tabs: 1,
       deptId: "",
+      treeData:[]
     };
   },
   created() {
     this.getList();
     this.resetForm = { ...this.dataForm };
     this.getAuthList();
+    this.getMechanismTree()
+  },
+  mounted() {
+    
+
+    // .getMechanismTree()
   },
-  mounted() {},
   methods: {
+    getMechanismTree() {
+      // console.log(this.userInfo);
+      this.$API.mechanism
+        .getMechanismTree({ deptId: this.userInfo.deptId })
+        .then((res) => {
+          if (res.data.code === 200) {
+            this.treeData = res.data.data;
+          }
+        });
+    },
     filter(inputValue, path) {
       return path.some(
         (option) =>
@@ -315,7 +332,7 @@ export default {
           leaderId: this.formState.leaderId[this.formState.leaderId.length - 1],
         })
         .then((res) => {
-          console.log(res);
+       
           if (res.data.code === 200) {
             this.perLoading = false;
             this.perTable = [...res.data.data.content];
@@ -340,7 +357,7 @@ export default {
       this.title = "数据权限配置";
       this.visible = true;
       this.dataForm = { ...item.record };
-
+  
       this.$nextTick(() => {
         this.$refs.tree.setExpandKys(item.record);
         // this.defaultCheckList = [""];
@@ -357,7 +374,7 @@ export default {
 
       //   this.setExpandKys(item.record);
     },
-    setExpandKys() {},
+    
     onChange(pagination) {
       // this.$message.info('表格状态改变了')
       // console.log(pagination, filters, sorter, { currentDataSource });