1

shanXiPlatform/src/utils/index.js

@@ -416,11 +416,11 @@ export function getNowFormatDateone() {
     month+
     seperator1 +
     strDate 
-    // +
-    // "  " +
-    // hour +
-    // ":" +
-    // minutes+
+    +
+    "  " +
+    hour +
+    ":" +
+    minutes
     // ":"+
     // seconds
 

shanXiPlatform/src/views/systemManagement/userManagement/approverManagement/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container treebox">
+  <div class="container  treebox">
     <el-tree 
       id="mainLeft"
       class="filter-tree"
@@ -518,7 +518,8 @@ export default {
   methods: {
       //点击左侧树时
     handTreeClick(data) {
-    
+    this.depotId = data.depotCode
+    this.getRoleSelect()
     },
       filterNode(value, data) {
       if (!value) return true
@@ -539,19 +540,13 @@ export default {
         depotId: this.depotId,
         roleIds: this.rolesId,
       }
-      console.log(params, "params...")
       roleList(params)
         .then((res) => {
           if (res.code == 200) {
-            console.log(res.data, "下拉选")
-            console.log(this.tableData, "????????????????????????")
-
             this.tableData.forEach((item) => {
               if (item.title.indexOf("主管科长") != -1) {
-                // item.approverSelect = res.data[2]
                 this.$set(item, "approverSelect", res.data[33]) //
               } else if (item.title.indexOf("分管副总经理") != -1) {
-                // item.approverSelect = res.data[3]
                 this.$set(item, "approverSelect", res.data[35])
               } else if (item.title.indexOf("总经理") != -1) {
                 this.$set(item, "approverSelect", res.data[34])
@@ -559,9 +554,6 @@ export default {
                 this.$set(item, "approverSelect", res.data[54])
               }
             })
-
-            // this.$forceUpdate();
-            //this.tableData = JSON.parse(JSON.stringify(this.tableData));
           }
         })
         .catch((err) => {
@@ -596,21 +588,12 @@ export default {
     btnSave() {
       this.loading=true
       var flag = true
-      // this.tableData.forEach((item) => {
-      //   if (item.content == null) {
-      //       flag = false
-      //     this.$message("请先选择人员")
-
-      //     return
-      //   }
-      // })
       for (let index = 0; index < this.tableData.length; index++) {
         const ele = this.tableData[index]
         if (ele.content == null) {
           flag = false
           this.$message("请先选择人员")
           this.loading = false
-
           return;
         }
       }
@@ -626,8 +609,6 @@ export default {
         type: this.type,
         depot_id: this.depotId,
       }
-      console.log(data.data, "......")
-        console.log(data.type, "data.type.....")
       approverSubmit(data)
         .then((res) => {
           if (res.code == 200) {
@@ -678,37 +659,29 @@ export default {
   created() {
     this.gettotaltree()
   },
-
   mounted() {
-    //获取当前缓存的登录用户信息
-
     this.userInfo = JSON.parse(getUser())
     console.log(this.userInfo, "this.userInfo.....?????")
-
-    //获取当前用户所在库的库id
     this.depotId = this.userInfo.depotId
-
     this.approverList()
   },
 }
 </script>
 <style lang="scss" scoped>
-// .container {
-//   width: 100%;
-
-//   padding: 10px;
-// }
 .container {
   height: 100%;
   display: flex;
   #mainLeft {
-    width: 300px;
+    width: 340px;
     height: calc(100vh - 200px);
     border: 1px solid #e6e6e6;
+    .el-tree-node__label{
+      color: seagreen;
+    }
   }
   #mainRight {
     margin-left: 20px;
-    width: calc(100% - 320px);
+    width: calc(100% - 340px);
   }
 }