编辑项目

fhKeeper/formulahousekeeper/timesheet_h5/src/router/index.js

@@ -97,6 +97,13 @@ const router = new Router({
         },
         component: () => import("@/views/project/projectInside")
     },
+    {
+        path: "/editProject",
+        meta: {
+            title: "编辑项目"
+        },
+        component: () => import("@/views/project/edit")
+    },
     {
         path: "/editask",
         name: "editask",

fhKeeper/formulahousekeeper/timesheet_h5/src/utils/request.js

@@ -12,7 +12,7 @@ const service = axios.create({
 // request拦截器,在请求之前做一些处理
 service.interceptors.request.use(
     config => {
-        if(config.url != "/report/editReport" && config.url != "/project/editProject" && config.url != "/common/uploadFile") {
+        if(config.url != "/report/editReport" && config.url != "/project/editProject" && config.url != "/common/uploadFile" && config.url != "/project/editProject") {
             config.data = qs.stringify(config.data);
             config.headers["Content-Type"] = "application/x-www-form-urlencoded; charset=UTF-8";
         } else {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -15,7 +15,7 @@
                     </div>
                 </template>
                 <template #right-icon>
-                    <van-button icon="replay" type="default" size="mini" style="height:0.6rem;padding:0 0.16667rem;" :loading="cardRefLoading" loading-size="0.26667rem" @click="cardtimeRefresh(form.createDate)" v-if="user.timeType.syncCorpwxTime==1 && (form.createDate == today || !report.time || report.time.workHours == 0)"></van-button>
+                    <van-button icon="replay" native-type="button" type="default" size="mini" style="height:0.6rem;padding:0 0.16667rem;" :loading="cardRefLoading" loading-size="0.26667rem" @click.stop.native="cardtimeRefresh(form.createDate)" v-if="user.timeType.syncCorpwxTime==1 && (form.createDate == today || !report.time || report.time.workHours == 0)"></van-button>
                 </template>
             </van-cell>
                 <!-- <div v-if="report.time" class="attendanceRecord">

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/edit.vue

@@ -0,0 +1,396 @@
+<template>
+  <div>
+    <van-nav-bar title="编辑项目" left-text="返回" @click-left="back" fixed left-arrow />
+    <div class="content">
+        <van-form ref="projectSubmit">
+        <van-field v-model="projectDetail.projectCode" label="项目编号"></van-field>
+        <van-field v-model="projectDetail.projectName" label="项目名称"></van-field>
+        <!-- 主项目 -->
+        <van-field label="主项目" @click="mainProjectShow = true" readonly clickable v-if="user.timeType.mainProjectState == '1'">
+            <template #input>
+                <span>{{projectDetail.projectMainName}}</span>
+            </template>
+        </van-field>
+            <van-popup v-model="mainProjectShow" position="bottom">
+                <van-picker
+                show-toolbar
+                value-key="name"
+                :columns="mainProjectList"
+                @confirm="mainProjectConfirm"
+                @cancel="mainProjectShow = false"
+                ></van-picker>
+            </van-popup>
+        <!-- 项目分类 -->
+        <van-field label="项目分类" @click="categoryShow = true" readonly clickable v-if="user.timeType.mainProjectState != '1'">
+            <template #input>
+                <span>{{projectDetail.categoryName}}</span>
+            </template>
+        </van-field>
+            <van-popup v-model="categoryShow" position="bottom">
+                <van-picker
+                show-toolbar
+                value-key="name"
+                :columns="categoryList"
+                @confirm="categoryConfirm"
+                @cancel="categoryShow = false"
+                ></van-picker>
+            </van-popup>
+        <!-- 项目描述 -->
+        <van-field v-model="projectDetail.projectDesc" label="项目描述"></van-field>
+        <!-- 项目类型 -->
+        <van-field label="项目类型" @click="publicShow = true" readonly clickable>
+            <template #input>
+                <span>{{publicList[projectDetail.isPublic]}}</span>
+            </template>
+        </van-field>
+            <van-popup v-model="publicShow" position="bottom">
+                <van-picker
+                show-toolbar
+                :columns="publicList"
+                @confirm="publicConfirm"
+                @cancel="publicShow = false"
+                ></van-picker>
+            </van-popup>
+        <!-- 参与人 -->
+        <van-field label="全部参与人" @click="userNamesShow = true" readonly clickable v-show="projectDetail.isPublic == 0">
+            <template #input>
+                <span>{{projectDetail.userNames}}</span>
+            </template>
+        </van-field>
+            <van-popup v-model="userNamesShow" position="bottom">
+                <van-search v-model="userName" placeholder="输入员工姓名搜索" @search="onSearch" v-if="user.userNameNeedTranslate != '1'"></van-search>
+                <div style="minHeight:300px;">
+                <template v-if="user.userNameNeedTranslate == '1'">
+                    <van-checkbox class="userCheckbox" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" ><ww-open-data type='userName' :openid='item.name'></ww-open-data></van-checkbox>
+                </template>
+                <template v-else>
+                    <van-checkbox class="userCheckbox" v-for="(item) in userList" :key="item.id" v-model="item.isChecked" >{{item.name}}</van-checkbox>
+                </template>
+                <van-button style="width:100%;position: -webkit-sticky;position: sticky;bottom: 0;" @click="userNamesConfirm();userNamesShow=false">确定</van-button>
+                </div>
+            </van-popup>
+        <!-- 项目经理 -->
+        <van-field label="项目经理" @click="inchargerShow = true" readonly clickable>
+            <template #input>
+                <span>{{projectDetail.inchargerName}}</span>
+            </template>
+        </van-field>
+            <van-popup v-model="inchargerShow" position="bottom">
+                <van-picker
+                show-toolbar
+                value-key="name"
+                :columns="inchargerList"
+                @confirm="inchargerConfirm"
+                @cancel="inchargerShow = false"
+                ></van-picker>
+            </van-popup>
+        <!-- 开始日期 -->
+        <van-field label="计划开始日期" @click="startDateShow = true" readonly clickable>
+            <template #input>
+                <span>{{projectDetail.planStartDate}}</span>
+            </template>
+        </van-field>
+            <van-popup v-model="startDateShow" position="bottom">
+                <van-datetime-picker
+                v-model="currentStartDate"
+                type="date"
+                title="选择年月日"
+                :min-date="minDate"
+                :max-date="maxDate"
+                @confirm="startDateConfirm"
+                @cancel="startDateShow = false"
+                />
+            </van-popup>
+        <!-- 结束日期 -->
+        <van-field label="计划结束日期" @click="endDateShow = true" readonly clickable>
+            <template #input>
+                <span>{{projectDetail.planEndDate}}</span>
+            </template>
+        </van-field>
+            <van-popup v-model="endDateShow" position="bottom">
+                <van-datetime-picker
+                v-model="currentEndDate"
+                type="date"
+                title="选择年月日"
+                :min-date="minDate"
+                :max-date="maxDate"
+                @confirm="endDateConfirm"
+                @cancel="endDateShow = false"
+                />
+            </van-popup>
+        </van-form>
+
+
+        <div class="form_btn" style="position: fixed; bottom: 0px; width: 100%">
+            <div style="padding-bottom: 10px">
+                <van-button square block type="info" @click="deleteProject()" style="width: 50%; float: left">删除</van-button>
+                <van-button square block type="info" @click="submitProject" style="width: 50%; float: left">保存</van-button>
+            </div>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            user: JSON.parse(localStorage.userInfo),
+            projectId: JSON.parse(sessionStorage.projectId),
+            minDate: new Date(2020,0,1),
+            maxDate: new Date(2025,11,31),
+            projectDetail: {},
+
+            mainProjectList: [],
+            mainProjectShow: false,
+            categoryList: [],
+            categoryShow: false,
+            publicList: ['普通项目','公共项目'],
+            publicShow: false,
+            userName: null,
+            allUserList: [],
+            userList: [],
+            userNamesShow: false,
+            inchargerList: [],
+            inchargerShow: false,
+            currentStartDate: new Date(),
+            startDateShow: false,
+            currentEndDate: new Date(),
+            endDateShow: false
+        }
+    },
+    mounted() {
+        this.getProjectDetail()
+        if(this.user.timeType.mainProjectState == '1'){
+            this.getMainProjectList()
+        }else{
+            this.getCategoryList()
+        }
+    },
+    methods: {
+        back() {
+            history.back();
+        },
+        formatDate(date) {
+            let mon = date.getMonth() + 1
+            return `${date.getFullYear()}-${mon<10?'0'+mon:mon}-${date.getDate()<10?'0'+date.getDate():date.getDate()}`;
+        },
+
+        mainProjectConfirm(value,key){
+            this.projectDetail.projectMainId = value.id
+            this.projectDetail.projectMainName = value.name
+            this.categoryShow = false
+        },
+        categoryConfirm(value,key){
+            this.projectDetail.category = value.id
+            this.projectDetail.categoryName = value.name
+            this.categoryShow = false
+        },
+        publicConfirm(value,key){
+            this.projectDetail.isPublic = key
+            this.publicShow = false
+        },
+        onSearch(val) {
+            console.log(val);
+            this.userList = [];
+            this.allUserList.forEach(u=>{if (u.name.startsWith(val)) {
+                this.userList.push(u);
+            }})
+        },
+        userNamesConfirm(){
+            let that = this;
+            that.inchargerList = [];
+            that.projectDetail.userId = [];
+            let userNames = ''
+            this.userList.filter(u=>u.isChecked).forEach(u=>{
+                userNames+=(u.name+',');
+                that.projectDetail.userId.push(u.id);
+                that.inchargerList.push(u);
+            });
+            if (userNames.length > 0) {
+                userNames = userNames.substring(0, userNames.length-1);
+            }
+            this.$set(this.projectDetail,'userNames',userNames)
+        },
+        inchargerConfirm(value,key){
+            this.projectDetail.inchargerId = value.id
+            this.projectDetail.inchargerName = value.name
+            this.inchargerShow = false
+        },
+        startDateConfirm(value){
+            this.projectDetail.planStartDate = this.formatDate(value)
+            this.startDateShow = false
+        },
+        endDateConfirm(value){
+            this.projectDetail.planEndDate = this.formatDate(value)
+            this.endDateShow = false
+        },
+
+
+        submitProject(){
+            // this.$refs.projectSubmit.validate().then(()=>{
+                let formData = new FormData();
+                formData.append("id", this.projectDetail.id);
+                formData.append("name", this.projectDetail.projectName);
+                if(this.projectDetail.projectCode){
+                    formData.append("code", this.projectDetail.projectCode);
+                }
+                if(this.projectDetail.projectMainId && this.user.timeType.mainProjectState == '1') {
+                    formData.append("projectMainId", this.addForm.projectMainId);
+                }
+                if(this.projectDetail.category) {
+                    formData.append("category", this.projectDetail.category);
+                }
+                if(this.projectDetail.projectDesc) {
+                    formData.append("projectDesc", this.projectDetail.projectDesc);
+                }
+                formData.append("isPublic", this.projectDetail.isPublic);
+                if(this.projectDetail.userId.length != 0 && this.projectDetail.isPublic == 0) {
+                    for(let i in this.projectDetail.userId) {
+                        formData.append("userId", this.projectDetail.userId[i]);
+                    }
+                }
+                if(this.projectDetail.inchargerId) {
+                    formData.append("inchargerId", this.projectDetail.inchargerId);
+                }
+                if(this.projectDetail.planStartDate) {
+                    formData.append("planStartDate", this.projectDetail.planStartDate);
+                }
+                if(this.projectDetail.planEndDate) {
+                    formData.append("planEndDate", this.projectDetail.planEndDate);
+                }
+                this.$axios.post("/project/editProject", formData)
+                .then(res => {
+                    if(res.code == "ok") {
+                        this.$toast.success('修改成功')
+                        this.back()
+                    } else {
+                        this.$toast.fail('获取失败');
+                    }
+                }).catch(err=> {this.$toast.clear();console.log(err)});
+            // }).catch(()=>{return})
+        },
+        deleteProject(){
+            this.$dialog.confirm({
+                    title: '删除项目',
+                    message: '确定要删除项目'+this.projectDetail.projectName+'吗?'
+                }).then(() => {
+                    const toast = this.$toast.loading({
+                        forbidClick: true,
+                        duration: 0
+                    });
+                    this.$axios.post("/project/deleteProject", {id: this.projectDetail.id})
+                    .then(res => {
+                        if(res.code == "ok") {
+                            this.$toast.clear();
+                            this.$toast.success('删除成功');
+                            this.back();
+                        } else if(res.code == 'reconfirm'){
+                            this.$toast.clear();
+                            this.forceDelete(res.msg)
+                        } else {
+                            this.$toast.clear();
+                            this.$toast.fail(res.msg);
+                        }
+                    }).catch(err=> {this.$toast.clear();});
+                }).catch(() => {});
+        },
+        forceDelete(msg){
+            this.$dialog.confirm({
+                    title: '删除项目',
+                    message: msg
+                }).then(() => {
+                    const toast = this.$toast.loading({
+                        forbidClick: true,
+                        duration: 0
+                    });
+                    this.$axios.post("/project/deleteProject", {id: this.projectDetail.id, force: 1})
+                    .then(res => {
+                        if(res.code == "ok") {
+                            this.$toast.clear();
+                            this.$toast.success('删除成功');
+                            this.back();
+                        } else {
+                            this.$toast.clear();
+                            this.$toast.fail(res.msg);
+                        }
+                    }).catch(err=> {this.$toast.clear();});
+                }).catch(() => {});
+        },
+        
+
+        getProjectDetail(){
+            this.$axios.post("/project/detail", {id: this.projectId})
+            .then(res => {
+                if(res.code == "ok") {
+                    this.projectDetail = res.data
+                    let userNames = ''
+                    let userId = []
+                    for(let i in res.data.participationList){
+                        userNames += res.data.participationList[i].name + ','
+                        userId.push(res.data.participationList[i].id)
+                        this.inchargerList.push(res.data.participationList[i])
+                    }
+                    this.$set(this.projectDetail,'userNames',userNames.substring(0,userNames.length - 1))
+                    this.$set(this.projectDetail,'userId',userId)
+                    this.currentStartDate = new Date(res.data.planStartDate)
+                    this.currentEndDate = new Date(res.data.planEndDate)
+                    this.getUserList()
+                } else {
+                    this.$toast.fail('获取失败');
+                }
+            }).catch(err=> {this.$toast.clear();console.log(err)});
+        },
+        getMainProjectList(){
+            this.$axios.post("/project-main/list", {})
+            .then(res => {
+                if(res.code == "ok") {
+                    this.mainProjectList = res.data
+                } else {
+                    this.$toast.fail('获取失败');
+                }
+            }).catch(err=> {this.$toast.clear();console.log(err)});
+        },
+        getCategoryList(){
+            this.$axios.get("/project-category/list", {})
+            .then(res => {
+                if(res.code == "ok") {
+                    this.categoryList = res.data
+                } else {
+                    this.$toast.fail('获取失败');
+                }
+            }).catch(err=> {this.$toast.clear();console.log(err)});
+        },
+        getUserList(){
+            this.$axios.post("/user/getEmployeeList", {departmentId: -1,pageIndex: 1,pageSize: -1})
+            .then(res => {
+                if(res.code == "ok") {
+                    let list = res.data.records
+                    for (let i in list) {
+                        let length = this.projectDetail.participationList.filter(u => u.id == list[i].id).length
+                        if(length){
+                            list[i].isChecked = true
+                        }else{
+                            list[i].isChecked = false
+                        }
+                    }
+                    this.allUserList = list;
+                    this.userList = list;
+                } else {
+                    this.$toast.fail('获取失败');
+                }
+            }).catch(err=> {this.$toast.clear();console.log(err)});
+        }
+    },
+}
+</script>
+
+<style lang="less" scoped>
+.content{
+    margin-top: 46px;
+    overflow: auto;
+    .userCheckbox {
+        padding: 10px;
+    }
+}
+</style>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/index.vue

@@ -46,11 +46,10 @@
                 <van-list v-model="isUpLoading" :finished="upFinished" :immediate-check="false" :offset="100" finished-text="没有更多了" @load="onLoadList">
                     <van-swipe-cell v-for="(item,index) in list" :key="index">
                         <van-cell :border="false" :title="item.projectName" :value="item.projectCode" clickable @click="toProjectInside(item)"/>
-                        <template slot="right" v-if="projectManagement || item.creatorId == user.id">
-                            <!-- <van-button square type="primary" text="查看" @click="toProjectInside(item)"/> -->
+                        <!-- <template slot="right" v-if="projectManagement || item.creatorId == user.id">
                             <van-button square type="info" text="编辑" @click="openDialog(index)" style="height:100%"/>
                             <van-button square type="danger" text="删除" @click="delPro(index)" style="height:100%"/>
-                        </template>
+                        </template> -->
                     </van-swipe-cell> 
                 </van-list>
             </van-pull-refresh>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/projectInside.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
-        <van-nav-bar title="项目详情" left-text="返回" @click-left="back" fixed left-arrow />
+        <van-nav-bar :title="projectDetail.projectName ? projectDetail.projectName : '-'" left-text="返回" @click-left="back" fixed left-arrow :right-text="active == 1 && (projectManagement || user.id==projectDetail.inchargerId || user.id==projectDetail.creatorId) ? '编辑项目' : ''" @click-right="openProject()" />
         <div class="content">
-            <van-cell><div style="width:100%;text-align:center;font-size:120%">{{projectDetail.projectName ? projectDetail.projectName : '-'}}</div></van-cell>
+            <!-- <van-cell><div style="width:100%;text-align:center;font-size:120%">{{projectDetail.projectName ? projectDetail.projectName : '-'}}</div></van-cell> -->
             <van-tabs v-model="active" @change="activeChange">
                 <!-- 任务看板 -->
                 <van-tab title="任务看板">
@@ -52,6 +52,12 @@
                 <!-- 项目概览 -->
                 <van-tab title="项目概览">
                     <!-- 基本信息 -->
+                    <van-cell>
+                        <van-row>
+                            <van-col span="7">项目名称：</van-col>
+                            <van-col span="17">{{projectDetail.projectName}}</van-col>
+                        </van-row>
+                    </van-cell>
                     <van-cell>
                         <van-row>
                             <van-col span="7">项目分类：</van-col>
@@ -230,6 +236,7 @@ export default {
     data() {
         return {
             user: JSON.parse(localStorage.userInfo),
+            projectManagement: false,
             projectId: JSON.parse(sessionStorage.projectId),
             projectDetail: {},
             
@@ -256,7 +263,11 @@ export default {
     },
     mounted() {
         // console.log('project',this.project);
-        
+        for(let i in this.user.functionList){
+            if(this.user.functionList[i].name == '管理全部项目'){
+                this.projectManagement = true
+            }
+        }
         this.getProjectDetail()
         this.getLevelList()
         this.getTaskGroupList()
@@ -319,6 +330,12 @@ export default {
             }).catch(err=> {this.$toast.clear();console.log(err)});
         },
         
+        openProject(){
+            if(this.active == 1 && (this.projectManagement || this.user.id==this.projectDetail.inchargerId || this.user.id==this.projectDetail.creatorId)){
+                this.$router.push("/editProject");
+            }
+        },
+