Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -191,6 +191,9 @@
                 <el-form-item label="项目名称" prop="name">
                     <el-input v-model="addForm.name"  placeholder="请输入项目名称" clearable></el-input>
                 </el-form-item>
+                <el-form-item label="项目描述" prop="name">
+                    <el-input type="textarea" :rows="2" v-model="addForm.projectDesc" maxlength="50" show-word-limit  placeholder="请输入项目描述" clearable></el-input>
+                </el-form-item>
                 <el-form-item label="级别" >
                     <el-select v-model="addForm.level"  placeholder="请选择级别" style="width:32%;" >
                         <el-option v-for="item in importanceList" :key="item.id" :label="item.label" :value="item.id"></el-option>
@@ -1142,6 +1145,9 @@
                         if(this.addForm.contractAmount != null) {
                             formData.append("contractAmount", this.addForm.contractAmount);
                         }
+                        if(this.addForm.projectDesc != null) {
+                            formData.append("projectDesc", this.addForm.projectDesc);
+                        }
                         var listId = []
                         var listName = []
                         if(this.auseList.length > 0) {

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

@@ -307,16 +307,19 @@
                 <el-form-item label="任务内容" prop="name">
                     <el-input v-model="addForm.name" :maxlength="40" :disabled="(this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement" placeholder="请输入任务内容" clearable></el-input>
                 </el-form-item>
+                <!-- {{timelabel}}{{mileageCup}} -->
                 <el-form-item :label="!timelabel ? '开始时间' : '截至时间'" prop="startDate">
                     <el-date-picker v-model="addForm.startDate" type="date" style="width:40%;" value-format="yyyy-MM-dd"  
                     placeholder="请选择日期" :disabled="(this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement" @change="DateChange()" v-if="!timelabel"></el-date-picker>
                     <span style="margin-left:30px;margin-right:10px;" v-if="!timelabel">截止时间</span>
                     <el-date-picker style="width:40%;" v-model="addForm.endDate" type="date" value-format="yyyy-MM-dd"  
                     placeholder="请选择日期" :disabled="(this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement" @change="DateChange()"></el-date-picker>
+
                     <span style="margin-left:30px;margin-right:10px;" v-if="timelabel && mileageCup">完成时间</span>
                     <el-date-picker style="width:40%;" v-if="timelabel && mileageCup" v-model="addForm.finishDate" type="date" value-format="yyyy-MM-dd"  
                     placeholder="请选择日期" :disabled="(this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement" @change="DateChange()"></el-date-picker>
                     </el-form-item>
+
                 <div style="border: 1px solid #ddd;margin:5px 0;padding:5px 0;">
                 <el-form-item :label="'执行人'+(index+1)" v-for="(executorItem, index) in addForm.executorListFront" :key="index">
                     <el-select v-model="executorItem.executorId" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement" size="small" filterable clearable placeholder="请选择执行人" style="width:40%;" @change="$forceUpdate()">
@@ -2253,6 +2256,7 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
                 this.isEditFile = false;
                 this.title="创建任务";
                 this.commentList = [];
+                this.timelabel = false
             },
             addExecutorLine(e) {
                 if(e == 1){