Merge remote-tracking branch 'origin/master'

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

@@ -4,7 +4,7 @@
             <el-row :gutter="20">
             <el-col :span="17" >
                 <div class="box info">
-                    <label>基本信息<el-link v-if="user.id == project.creatorId || user.id == project.inchargerId" @click="showEdit" style="float:right;"><i class="el-icon-edit"  ></i></el-link></label>
+                    <label>基本信息<el-link v-if="(user.id == project.creatorId || user.id == project.inchargerId) || permissions.projectManagement" @click="showEdit" style="float:right;"><i class="el-icon-edit"  ></i></el-link></label>
                     <el-row :gutter="10" >
                         <el-col :span="5" ><span class="gray_label">项目名称:</span></el-col><el-col :span="7" ><span >{{project.projectName}}</span></el-col>
                         <el-col :span="5" ><span class="gray_label">项目分类:</span></el-col><el-col :span="7" ><span >{{project.categoryName}}</span></el-col>
@@ -24,7 +24,7 @@
                         <el-col :span="7" >
                         <span style="float:left;" v-if="permissions.projectContract">{{project.contractAmount == null?'-':project.contractAmount | numberToCurrency}} 元</span>
                         <el-link v-if="user.id == project.creatorId || user.id == project.inchargerId" @click="contractRecord" style="float:left;"><i class="iconfont firerock-iconrecord"></i></el-link>
-                        <el-link v-if="user.id == project.creatorId || user.id == project.inchargerId" @click="contractChange" style="float:right;"><i class="el-icon-edit"  ></i></el-link>
+                        <el-link v-if="user.id == project.creatorId || user.id == project.inchargerId || permissions.projectManagement" @click="contractChange" style="float:right;"><i class="el-icon-edit"  ></i></el-link>
                         </el-col>
                         
                     </el-row>
@@ -76,7 +76,7 @@
                 </div>
                 <div class="box" style="margin-top:10px;">
                     <div><label>相关人员</label>
-                    <el-link v-if="user.id == project.creatorId || user.id == project.inchargerId" @click="showEditPar" style="float:right;"><i class="el-icon-edit"  ></i></el-link>
+                    <el-link v-if="user.id == project.creatorId || user.id == project.inchargerId || permissions.projectManagement" @click="showEditPar" style="float:right;"><i class="el-icon-edit"  ></i></el-link>
                     </div>
                     <div style="margin-top:10px;color:#999;">项目经理</div>
                     <div><el-link style="margin:10px" @click="showUser(project.inchargerId)">{{project.inchargerName}}</el-link></div>
@@ -105,7 +105,7 @@
                 </div> -->
                 <!--项目相关工程专业 -->
                 <div class="box info" style="margin-top:10px;" v-if="user.company.packageEngineering == 1">
-                    <div><label>相关工程专业<el-link v-if="user.id == project.creatorId || user.id == project.inchargerId" @click="showEditProfession" style="float:right;"><i class="el-icon-edit"  ></i></el-link></label>
+                    <div><label>相关工程专业<el-link v-if="user.id == project.creatorId || user.id == project.inchargerId || permissions.projectManagement" @click="showEditProfession" style="float:right;"><i class="el-icon-edit"  ></i></el-link></label>
                     <el-row :gutter="10" v-for="item in projectProfessionListOnPage" :key="item.id">
                         <el-col :span="5" ><span >{{item.professionName}}</span></el-col>
                         <el-col :span="2" ><span >{{item.percentage}}%</span></el-col>
@@ -117,7 +117,7 @@
 
                 <!--项目相关领导 -->
                 <div class="box info" style="margin-top:10px;" >
-                    <div><label>相关领导<el-link v-if="user.id == project.creatorId || user.id == project.inchargerId" @click="showChooseLeaderTree" style="float:right;"><i class="el-icon-edit"  ></i></el-link></label>
+                    <div><label>相关领导<el-link v-if="user.id == project.creatorId || user.id == project.inchargerId || permissions.projectManagement" @click="showChooseLeaderTree" style="float:right;"><i class="el-icon-edit"  ></i></el-link></label>
                     
                     </div>
                     <el-row :gutter="10">
@@ -1340,6 +1340,7 @@
                 if(this.addForm.inchargerId != null) {
                     formData.append("inchargerId", this.addForm.inchargerId);
                 }
+                formData.append("onlyChangeParticipate", 'true');
                 
                 this.http.uploadFile(this.port.project.add,formData,
                 res => {

fhKeeper/formulahousekeeper/timesheet/src/views/provider/provider.vue

@@ -16,6 +16,7 @@
                 <el-form-item style="float:right;">
                     <el-link type="primary" :underline="false" @click="handleAdd(-1,null)" style="margin-right: 10px">新增供应商</el-link>
                     <el-link type="primary" :underline="false" @click="intocustomerRatio" style="margin-right: 10px">批量导入供应商</el-link>
+                    <el-link type="primary" :underline="false" @click="exportProjectData" style="margin-right: 10px">导出供应商</el-link>
                     <el-link type="primary" :underline="false" @click="showClfDialog = true">分类管理</el-link>
                 </el-form-item>
             </el-form>
@@ -242,6 +243,28 @@
             }
         },
         methods: {
+            // 导出供应商
+            exportProjectData() {
+                //导出项目
+                this.http.post('/provider-info/exportData',{},
+                res => {
+                    if (res.code == "ok") {
+                        var filePath = res.data;
+                        const a = document.createElement('a'); // 创建a标签
+                        a.setAttribute('download', '供应商导出.xls');// download属性
+                        a.setAttribute('href', filePath);// href链接
+                        a.click(); //自执行点击事件
+                        a.remove();
+                    } 
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                    }
+                );
+            },
             // 列表排序
             tableSort({column, prop, order}){
                 if(prop == 'providerCode' || prop == 'providerName' || prop == 'providerCategoryName') {