2022.6.24

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

@@ -121,9 +121,9 @@
                         </el-popover>
                     </div>
                 </el-form-item>
-                <!-- <el-form-item v-if="(radio == '项目' || radio == '部门' || radio == '项目分类') && exportParam.type == '0'">
+                <el-form-item v-if="(radio == '项目' || radio == '部门' || radio == '项目分类') && exportParam.type == '0'">
                     <el-checkbox v-model="exportParam.projectSum" >含单个项目数据汇总</el-checkbox>
-                </el-form-item> -->
+                </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="exportProjectData" style="width:100%;" >导出</el-button>
@@ -281,14 +281,14 @@
                         param.userId = this.exportParam.userId;
                     }
                 }
-                // if (this.exportParam.type == 1) {
-                //     this.exportParam.projectSum = null
-                // }
-                // if (this.exportParam.projectSum != null) {
-                //     if(this.radio == '项目' || this.radio == '部门' || this.radio == '项目分类'){
-                //         param.projectSum = this.exportParam.projectSum;
-                //     }
-                // }
+                if (this.exportParam.type == 1) {
+                    this.exportParam.projectSum = null
+                }
+                if (this.exportParam.projectSum != null) {
+                    if(this.radio == '项目' || this.radio == '部门' || this.radio == '项目分类'){
+                        param.projectSum = this.exportParam.projectSum;
+                    }
+                }
                 param.type = this.exportParam.type*1
                 this.http.post(url, param,
                     res => {

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

@@ -128,12 +128,12 @@
                      </div>
                 </template>
             </el-table-column>
-            <el-table-column prop="inchargerName" label="负责人" sortable width="150">
+            <el-table-column prop="inchargerName" label="负责人" sortable min-width="150">
                 <template slot-scope="scope">
                     <el-link type="primary" :underline="false" @click="showUser(scope.row.inchargerId)">{{scope.row.inchargerName}}</el-link>
                 </template>
             </el-table-column>
-            <el-table-column prop="participator" label="参与者" :width="user.company.packageCustomer != 1 ? '' : '300'" sortable v-if="user.company.packageProject==0">
+            <el-table-column prop="participator" label="参与者" :min-width="user.company.packageCustomer != 1 ? '' : '300'" sortable v-if="user.company.packageProject==0">
                 <template slot-scope="scope">
                     <!-- <v-for v-for="par in scope.row.participator" :key="par.id" >
                         <el-link style="margin-right:10px;" type="primary" @click="showUser(par.id)">{{par.name}}</el-link>
@@ -159,7 +159,7 @@
                 </template>
             </el-table-column>
             <!-- 客户管理 -->
-            <el-table-column prop="customerName" label="客户" width="190"   v-if="user.company.packageCustomer == 1">
+            <el-table-column prop="customerName" label="客户" min-width="190"   v-if="user.company.packageCustomer == 1">
             <template slot-scope="scope">
                 <el-popover placement="top" width="250" trigger="hover" v-if="scope.row.customerName&&scope.row.customerName.length > 12">
                     <div slot="reference" class="kans">
@@ -172,36 +172,34 @@
                 </div>
             </template>
             </el-table-column>
-            <el-table-column prop="status" label="状态" width="100" >
+            <el-table-column prop="status" label="状态" min-width="100" >
                 <template slot-scope="scope">
                     {{scope.row.status == null?"-":statusTxt[scope.row.status]}}
                 </template>
             </el-table-column>
             <!--专业项目协作-->
             
-            <el-table-column prop="planStartDate" label="开始日期" width="96" >
+            <el-table-column prop="planStartDate" label="开始日期" min-width="96" >
             </el-table-column>
-            <el-table-column prop="planEndDate" label="截止日期" width="96" >
+            <el-table-column prop="planEndDate" label="截止日期" min-width="96" >
             </el-table-column>
-            <el-table-column prop="progress" label="完成度" width="100"  v-if="user.company.packageProject == 1">
+            <el-table-column prop="progress" label="完成度" min-width="100"  v-if="user.company.packageProject == 1">
                 <template slot-scope="scope">
                     {{scope.row.progress==null?"-":scope.row.progress}}%
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="350" align="left" fixed="right">
+            <!-- 000000 -->
+            <el-table-column label="操作" :width="showColumnWidth" align="left" fixed="right" v-if="showColumnWidth != '0'">
                 <template slot-scope="scope">
                     <el-button v-if="permissions.projectManagement || user.id==scope.row.creatorId" size="mini"  @click="subProject(scope.row)">子项目</el-button>
                     <el-button size="mini" v-if="permissions.projectManagement || user.id==scope.row.inchargerId || user.id==scope.row.creatorId" type="primary" @click="handleAdd(scope.$index, scope.row)">编辑</el-button>
-                    <el-button v-if="permissions.projectManagement || user.id==scope.row.creatorId" size="mini"  @click="deletePro(scope.$index, scope.row)">删除</el-button>
-                    <!-- 111 -->
+                    <!-- <el-button v-if="permissions.projectManagement || user.id==scope.row.creatorId" size="mini"  @click="deletePro(scope.$index, scope.row)">删除</el-button> -->
                     <el-dropdown class="customdropdown" split-button size="mini" @click="finishPro(scope.row)" v-if="(permissions.projectManagement || user.id==scope.row.creatorId || user.id==scope.row.inchargerId) && scope.row.status == 1" placement="bottom-start">
                         完成
                         <el-dropdown-menu slot="dropdown" class="customdropdown_menu">
                             <el-button size="mini"  @click="cancelPro(scope.row)" class="customdropdown_menu_btn">撤销</el-button>
                         </el-dropdown-menu>
                     </el-dropdown>
-                    <!-- <el-button v-if="permissions.projectManagement && scope.row.status == 1" size="mini"  @click="cancelPro(scope.row)">撤销</el-button>
-                    <el-button v-if="permissions.projectManagement && scope.row.status == 1" size="mini"  @click="finishPro(scope.row)">完成</el-button> -->
                     <el-button v-if="(permissions.projectManagement || user.id==scope.row.inchargerId || user.id==scope.row.creatorId) && scope.row.status >= 2" size="mini"  @click="restartPro(scope.row)">重启</el-button>
                 </template>
             </el-table-column>
@@ -398,8 +396,10 @@
                     </el-tabs>
                 </div>
             
-            </el-form>
+            </el-form>  
             <div slot="footer" class="dialog-footer;">
+                <!-- 000000 -->
+                <el-button @click.native="deletePro(1, addForm)" v-if="(permissions.projectManagement || user.id==deleteVif) && addForm.id" style="float:left">删除</el-button>
                 <el-button @click.native="addFormVisible = false">取消</el-button>
                 <el-button type="primary" @click="submitInsert" :loading="addLoading">提交</el-button>
             </div>
@@ -805,7 +805,9 @@ a {
                     person: null,
                     personNames: ''
                 },
-                addGroupPersonPdialog: false
+                addGroupPersonPdialog: false,
+                showColumnWidth: '300',
+                deleteVif: null
             };
         },
         // 过滤器
@@ -2011,6 +2013,7 @@ a {
                             }
                             list[i].userNames = str;
                         }
+                        this.showColumnWidth = this.showColumn(list)
                         this.list = list;
                         this.total = res.data.total;
                         this.$nextTick(()=>{
@@ -2031,6 +2034,31 @@ a {
                     });
                 });
             },
+            showColumn(list){
+                if(this.permissions.projectManagement){
+                    let creat = false
+                    let incha = false
+                    for(let i in list){
+                        if(this.user.id == list[i].creatorId){
+                            creat = true
+                        }
+                        if(this.user.id == list[i].inchargerId){
+                            incha = true
+                        }
+                    }
+                    if(creat){
+                        return '300'
+                    }else {
+                        if(incha){
+                            return '210'
+                        }else {
+                            return '0'
+                        }
+                    }
+                }else {
+                    return '0'
+                }
+            },
 
             //显示新增界面
             handleAdd(i, item) {
@@ -2095,7 +2123,8 @@ a {
                         category:item.category,
                         projectDesc: item.projectDesc
                     }
-                    console.log("handleadd",item)
+                    this.deleteVif = item.creatorId
+                    console.log("handleadd",this.deleteVif,this.addForm.id)
                     if(item.associateDegrees != null && item.associateDegrees != 'null' && item.associateDegrees != '') {
                         var spli = item.associateDegrees.split(',')
                         var sl  = []
@@ -2104,7 +2133,7 @@ a {
                             sl.push(num)
                         }
                         this.auseList = sl
-                        console.log(this.auseList)
+                        // console.log(this.auseList)
                     } else {
                         this.auseList = []
                     }
@@ -2353,7 +2382,7 @@ a {
 
             // 删除
             deletePro(i, item) {
-                this.$confirm("确定要删除项目[" + item.projectName + "]吗?","删除项目", {
+                this.$confirm("确定要删除项目[" + item.name + "]吗?","删除项目", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"