2022.5.16 18:39

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,18 +1,18 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-// var ip = '192.168.2.36'
+var ip = '192.168.2.36'
 // var ip = '192.168.2.12'// var ip = '47.100.37.243' 
 
-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
-        }
-    }
-}
+// 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
+//         }
+//     }
+// }
 
 module.exports = {
   build: {

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -72,12 +72,14 @@
 
         <!--列表-->
         <el-table ref="projectlistOfWudulist" :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @selection-change="checkedWudulist">
-            <el-table-column type="selection" width="60" v-if="user.timeType.customDegreeActive && permissions.projectManagement"></el-table-column>
-            <el-table-column type="index" width="60" v-else>
+            <el-table-column type="selection" width="60" :selectable="isSelectable">
+                <!-- creator 项目创建人    incharger 项目负责人 -->
+            </el-table-column>
+            <!-- <el-table-column type="index" width="60" v-else>
                 <template slot-scope="scope" >
                         {{scope.$index+1+(page-1)*size}}
                     </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="projectCode" label="项目编号" sortable width="120"></el-table-column>
             <el-table-column prop="categoryName" label="项目分类" sortable width="120"></el-table-column>
             <el-table-column prop="projectName" label="项目名称" width="250" sortable>
@@ -172,10 +174,12 @@
 
         <!--工具条-->
         <el-col :span="24" class="toolbar">
-            <template v-if="user.timeType.customDegreeActive && permissions.projectManagement">
                 <el-button size="small" @click="batchSetWudulistBtn1">取消</el-button>
+            <template v-if="user.timeType.customDegreeActive">
                 <el-button size="small" type="primary" @click="batchSetWudulistBtn2(true)">批量设置{{user.timeType.customDegreeName}}</el-button>
                 <el-button size="small" type="primary" @click="batchSetWudulistBtn2(false)">批量添加{{user.timeType.customDegreeName}}</el-button>
+            </template>
+            <template v-if="user.company.packageProject">
                 <el-button size="small" type="primary" @click="addGroupPerson()" :loading="addGroupPersonBtnLoading">批量添加分组参与人</el-button>
             </template>
             <el-pagination
@@ -896,9 +900,15 @@ a {
                 })
             },
 
-
-            test(){
-                console.log(this.addGroupPersonData.group);
+            isSelectable(row,index){
+                if(row.creatorId == this.user.id || row.inchargerId == this.user.id || this.permissions.projectManagement){
+                    return true
+                }else{
+                    return false
+                }
+            },
+            test(row){
+                console.log(row);
             },
             // 批量添加参与人员
             addGroupPerson(){