2022.7.16

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

@@ -74,7 +74,8 @@
                                 </el-upload>
                             </el-dropdown-item>
                             <el-dropdown-item v-if="permissions.projectImport">
-                                <el-link type="primary" :underline="false" href="./upload/项目导入模板.xlsx" download="项目导入模板.xlsx">模板下载</el-link>
+                                <el-link type="primary" :underline="false" @click="downloadmb" v-if="user.company.packageCustomer == 1 || user.company.packageProvider == 1">模板下载</el-link>
+                                <el-link type="primary" :underline="false" href="./upload/项目导入模板.xlsx" download="项目导入模板.xlsx" v-else>模板下载</el-link>
                             </el-dropdown-item>
                             <el-dropdown-item v-if="permissions.projectExport">
                                 <el-link type="primary" :underline="false" @click="exportProjectData" download="项目导出.xlsx">导出项目</el-link>
@@ -256,12 +257,12 @@
 
         <!--工具条-->
         <el-col :span="24" class="toolbar">
-                <el-button size="small" @click="batchSetWudulistBtn1" v-if="user.timeType.customDegreeActive || user.company.packageProject">取消</el-button>
-            <template v-if="user.timeType.customDegreeActive">
+                <el-button size="small" @click="batchSetWudulistBtn1" v-if="(user.timeType.customDegreeActive || user.company.packageProject) && (showColumnWidth != '0' || permissions.projectManagement)">取消</el-button>
+            <template v-if="user.timeType.customDegreeActive && (showColumnWidth != '0' || permissions.projectManagement)">
                 <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">
+            <template v-if="user.company.packageProject && (showColumnWidth != '0' || permissions.projectManagement)">
                 <el-button size="small" type="primary" @click="addGroupPerson()" :loading="addGroupPersonBtnLoading">批量添加分组参与人</el-button>
                 <el-button size="small" type="primary" @click="addProPreson()">批量添加项目参与人</el-button>
             </template>
@@ -2926,6 +2927,26 @@ a {
                 })
                 .catch(() => {});
             },
+            // 模板下载
+            downloadmb(){
+                this.http.post('/project/getTemplate',{
+                    companyId: this.user.companyId
+                },res => {
+                    if(res.code == 'ok'){
+
+                    }else{
+                        this.$message({
+                            message: res.msg,
+                            type: 'error'
+                        })
+                    }
+                },err => {
+                    this.$message({
+                        message: err,
+                        type: 'error'
+                    })
+                })
+            },
             //强制删除项目
             forceDeletePro(deleteProId) {
                 this.$confirm(this.deleteAlertMsg,"删除项目", {

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

@@ -38,6 +38,28 @@
                     <!-- </el-input> -->
                     </div>
                 </el-form-item>
+                <el-form-item >
+                    <div style="margin-left: 80px">
+                        <el-select v-model="dateType" style="width:120px;"  slot="prepend" placeholder="请选择">
+                            <el-option label="开始时间" :value="0" @click.native="hiddens()"></el-option>
+                            <el-option label="截至时间" :value="1" @click.native="hiddens()"></el-option>
+                        </el-select>
+                    </div>
+                </el-form-item>
+                <el-form-item >
+                    <div style="margin-left: 8px">
+                        <el-date-picker
+                        v-model="dateSelect"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="区间"
+                        end-placeholder="区间"
+                        value-format="yyyy-MM-dd"
+                        clearable
+                        @change="hiddens()">
+                        </el-date-picker>
+                    </div>
+                </el-form-item>
             </el-form>
         </el-col>
         <div style="display: flex;width: 100%;">
@@ -763,7 +785,9 @@ import { error } from 'dingtalk-jsapi';
                 taskLevelColor:['#262626','#E6A23C','#F56C6C'],
                 stageList: '',
                 selectedGroup:{},
-                dateClass: true
+                dateClass: true,
+                dateType: 0,
+                dateSelect: []
             };
         },
         methods: {
@@ -941,13 +965,19 @@ import { error } from 'dingtalk-jsapi';
             //获取项目列表
             getList() {
                 this.listLoading = true;
-                this.http.post('/task/listByPage', {
+                let parameter = {
                     status: this.searchField,
                     viewId: this.idx,
                     pageIndex: this.page,
                     pageSize: this.size,
                     type: this.typeField
-                },
+                }
+                if(this.dateSelect.length != 0){
+                    parameter.dateType = this.dateType
+                    parameter.startDate = this.dateSelect[0]
+                    parameter.endDate = this.dateSelect[1]
+                }
+                this.http.post('/task/listByPage', parameter,
                 res => {
                     this.listLoading = false;
                     if(res.code == 'ok') {