修改配置

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 10010
+  port: 14010
   tomcat:
     uri-encoding: utf-8
     max-http-form-post-size: -1
@@ -13,7 +13,7 @@ spring:
       max-request-size: 100MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:17089/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&&useSSL=false
+    url: jdbc:mysql://127.0.0.1:17089/man_mld?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&&useSSL=false
     username: root
     password: P011430@Huoshi*
     hikari:
@@ -54,7 +54,7 @@ logging:
     #打印sql语句
     com.management.platform.mapper: error
   path: /log/
-  file: worktime.log
+  file: worktime-mld.log
 ##########
 mybatis-plus:
   #  mapper-locations: classpath:mapper/*/*.xml
@@ -80,7 +80,7 @@ mybatis:
   mapper-locations: mappers/*Mapper.xml
 #####配置图片上传路径####
 upload:
-  path: /www/staticproject/timesheet/upload/
+  path: /www/staticproject/timesheet_mld/upload/
 
 
 
@@ -91,7 +91,7 @@ management:
   security:
     enabled:false:
   server:
-    port: 10011
+    port: 14011
   #  endpoints:
   #    web:
   #      exposure:

fhKeeper/formulahousekeeper/timesheet_mld/build-private.bat

@@ -1,12 +0,0 @@
-@echo off
-
-copy /Y setIndex\indexTwo.html index.html
-
-start /B npm run build
-
-timeout /t 35 /nobreak
-
-copy /Y setIndex\indexOne.html index.html
-
-echo Done!
-pause

fhKeeper/formulahousekeeper/timesheet_mld/src/components/taskComponent.vue

@@ -16,7 +16,8 @@
             </el-form-item>
             <template v-if="selectType.needAudit">
                 <el-form-item :label="$t('subordinatetotheproject')" v-if="showOrNot" prop="projectId">
-                    <el-select v-model="addForm.projectId" :placeholder="$t('defaultText.pleaseChoose')" @change="agentCreatesEvents(1)" filterable="true" style="width:100%;" :disabled="doYouWantToDisableAll">
+                    <el-select v-model="addForm.projectId" :placeholder="$t('defaultText.pleaseChoose')" @change="agentCreatesEvents(1)" filterable="true" style="width:100%;" 
+                    :disabled="doYouWantToDisableAll" no-data-text="您尚无担任LA的相关项目">
                         <el-option-group v-for="group in integrationProjectList" :key="group.label" :label="group.label">
                             <el-option v-for="item in group.peojectList" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
                                 <span style="float: left; color: #8492a6; font-size: 13px;">{{ item.projectCode }}</span>
@@ -463,8 +464,8 @@
         </template>
         
         <template>
-            <el-button type="primary" @click="submitInsert(0)" :loading="addLoading" v-if="!showMmeiLaiDeData.taskStatus || showMmeiLaiDeData.taskStatus == 2 || showMmeiLaiDeData.taskStatus == 5">
-                {{addForm.taskStatus == 2?'保存并提交':'保存'}}
+            <el-button type="primary" @click="submitInsert(0)" :loading="addLoading" v-if="addForm.id == null || canEditTask">
+                提交
             </el-button>
             <!--对于需要审核的情况-->
             <!-- <el-button type="primary" @click="submitInsert(1)" :loading="addLoading" v-if="selectType.needAudit && (showMmeiLaiDeData.taskStatus == 2 || showMmeiLaiDeData.taskStatus == 5 || showMmeiLaiDeData.taskStatus == 6)">
@@ -628,20 +629,6 @@
                             <p v-if="user.timeType.customDataActive==1">{{user.timeType.customDataName}}：{{item2.customData}}</p>
                             <!-- 自定义日报文本 -->
                             <p v-if="user.timeType.customTextActive==1">{{user.timeType.customTextName}}：{{item2.customText}}</p>
-                            <p v-if="user.company.packageEngineering == 1">
-                                {{$t('other.professionalProgress')}}：
-                                <span style="margin-right:10px;" v-for="progressItem in item2.professionProgress" :key="progressItem.id">{{progressItem.professionName}}({{progressItem.progress}}%) 
-                                    <el-tooltip v-if="progressItem.auditState == 0"  :content="$t('state.WaitingAudit')" effect="light" placement="top">
-                                    <i class="iconfont firerock-icondaibandengdaishenhe"></i>
-                                    </el-tooltip>
-                                    <el-tooltip v-if="progressItem.auditState == 1" :content="$t('state.alreadyPassed')" effect="light" placement="top">
-                                    <i  class="iconfont firerock-iconshenhetongguo"></i>
-                                    </el-tooltip>
-                                    <el-tooltip v-if="progressItem.auditState == 2" :content="$t('state.notThrough')" effect="light" placement="top">
-                                    <i  class="iconfont firerock-iconshenhebohui"></i>
-                                    </el-tooltip>
-                                    </span>
-                            </p>
                             <div v-if="item2.multiWorktime==0">
                             <p style="display: inline-block;">{{$t('time.duration')}}：
                                 <span v-if="item2.reportTimeType == 0" style="margin-right:10px;">{{typeList[item2.timeType]}}</span>
@@ -692,38 +679,6 @@
             </div>
         </span>
     </div>
-
-    <!-- 发起会议 -->
-    <el-dialog :title="$t('faQiHuiYi')" :visible.sync="meetingVisable" width="500px" :before-close="handleClose" append-to-body>
-        <div class="block">
-            <div>
-                <span class="demonstration">{{ $t('huiYiKaiShiShiJian') }}</span>
-                <el-date-picker
-                v-model="initiateAMeetingForm.startTime"
-                type="datetime"
-                :placeholder="$t('xuanZeRiQiShiJian')"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                clearable
-                default-time="10:00:00">
-                </el-date-picker>
-            </div>
-            <div style="margin-top: 20px">
-                <span class="demonstration">{{ $t('huiYiJieShuShiJian') }}</span>
-                <el-date-picker
-                v-model="initiateAMeetingForm.endTime"
-                type="datetime"
-                :placeholder="$t('xuanZeRiQiShiJian')"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                clearable.
-                default-time="11:00:00">
-                </el-date-picker>
-            </div>
-        </div>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="meetingVisable = false">{{ $t('quXiao') }}</el-button>
-            <el-button type="primary" @click="confirmMeeting()">{{ $t('queDing') }}</el-button>
-        </span>
-    </el-dialog>
   </div>
 </template>
 
@@ -970,7 +925,7 @@ export default {
         alreadyPartArray: [],
         projectCreatorId: null,
         projectInchargerId: null,
-        canAddTask: false, // 是否可创建任务的判断标志
+        canEditTask: false, // 是否可创建任务的判断标志
         canEditStageList: false, //是否可编辑列表的判断标志
         groupResponsibleId: '', // 分组负责人的id
         groupDetailsShow: false,
@@ -1564,7 +1519,7 @@ export default {
                 this.addForm.indate = null;
                 this.addLoading = false;
 
-                this.canAddTask = res.data.canAddTask
+                this.canEditTask = res.data.canEditTask
 
                 this.recentProgressInfo = res.data.progress;
                 
@@ -1853,7 +1808,7 @@ export default {
         res => {
             if (res.code == "ok") {
                 this.stageList = res.data.list;
-                this.canAddTask = res.data.canAddTask
+                this.canEditTask = res.data.canEditTask
                 this.canEditStageList = res.data.canEditStageList
                 this.timess() // 处理时间的方法
             } else {

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

@@ -204,12 +204,13 @@
                             <span style="display: inline-block;margin-right: 55px">
                                 <span  :class="judgedate(scope.row.endDate) && searchField == '0' && scope.row.taskStatus == 0 ? 'redwarningspan autodatespan' : 'autodatespan'">{{scope.row.endDate}}</span>
                             </span>
-                            <el-button v-if="searchField == 0 && scope.row.secondAuditorId && scope.row.secondAuditorId.indexOf(user.id) != -1" size="small" type="primary" @click="cancelTask(scope.row)">撤销</el-button>
+                            <!--我创建的，对于创建人在待第一审核状态下，可以进行撤回操作-->
+                            <el-button v-if="(scope.row.taskStatus == 0 && ((scope.row.secondAuditorId && scope.row.secondAuditorId.indexOf(user.id) != -1) || user.roleName.indexOf('管理员') >= 0)) 
+                            || (scope.row.creatorId == user.id && scope.row.taskStatus == 3)" size="small" type="primary" @click="cancelTask(scope.row)">撤销</el-button>
                             <el-button v-if="searchField == 0" size="small" type="primary" @click="completes(scope.row.id, 0, scope.row)">{{ $t('wan-cheng') }}</el-button>
                             <el-button v-if="searchField == 1" size="small" type="warning" @click="completes(scope.row.id, 1, scope.row)">{{ $t('zhong-qi') }}</el-button>
                             <el-button v-if="idx == 3" size="small" type="primary" @click="handleAuditTask(scope.row, true)">通过</el-button>
                             <el-button v-if="idx == 3" size="small" type="danger" @click="handleAuditTask(scope.row, false)">驳回</el-button>
-                            
                             </div>
                         </template>
                     </el-table-column>
@@ -1002,6 +1003,7 @@ import { getThemeColor } from '@/utils/commonMethod.js'
                 },
                 res => {
                     if (res.code == "ok") {
+                        this.taskRejectReasonDialog = false;
                         this.getList();
                         this.getMyAuditCount();
                     } else {