ソースを参照

调整工作日报左边的状态选择框

Lijy 3 年 前
コミット
8a270a82ba

+ 10 - 10
fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -4,19 +4,19 @@ var path = require('path')
 // var ip = '192.168.2.36'
 
  
-// var ip = '47.100.37.243' 
+var ip = '47.100.37.243' 
 // var ip = '192.168.2.159'
 
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    }
-}
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     }
+// }
 
 module.exports = {
   build: {

+ 7 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -32,7 +32,7 @@
                         <el-option value="3" label="待提交">待提交</el-option>
                         </el-select></div>
                     <div>
-                        <el-tree :data="data"  @node-click="handleNodeClick" >
+                        <el-tree :data="data"  @node-click="handleNodeClick">
                             <span class="custom-tree-node" slot-scope="{ node, data}">
                             <span>{{ node.label }}</span>
                             <span v-if="data.membCount != null && data.isUser == null">({{data.membCount}})</span>
@@ -999,7 +999,9 @@
                 },
                 zhoBaoIdx: '',
                 zhoBaoName: '',
-                zhis: {}
+                zhis: {},
+                dataAn: [],
+                dataSelected: []
             };
         },
         filters: {
@@ -1993,6 +1995,7 @@
             },
             // 部门列表点击
             handleNodeClick(data) {
+                console.log(data, this.dataAn, this.dataSelected)
                 this.depData = data;
                 var list = [];
                 if (data.id == -1) {
@@ -2100,6 +2103,7 @@
                                 this.fillMembList = this.unFillList;
                             }
                         }
+                        this.stateChange()
                         
                     } else {
                         this.$message({
@@ -2355,6 +2359,7 @@
                     if (res.code == "ok") {
                         this.reportList = res.data;
                         document.querySelector("#day"+this.choseDay).scrollIntoView(true);
+                        // this.stateChange()
                     } else {
                         this.$message({
                             message: res.msg,