zhc077
/
projectManagement
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhc077:dee8202b7ae91665055fa0e70ed5d7b2451b6bde
Branches Tags
zhc077:dev
zhc077:dev_2307
zhc077:dev_4newlayout
zhc077:master
..
compare: zhc077:61b313862154d925f61883969bd20ea8b3ac6a2f
Branches Tags
zhc077:dev
zhc077:dev_2307
zhc077:dev_4newlayout
zhc077:master

No commits in common. 'dee8202b7ae91665055fa0e70ed5d7b2451b6bde' and '61b313862154d925f61883969bd20ea8b3ac6a2f' have entirely different histories.
dee8202b7a ... 61b3138621

2 changed files with 113 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 206
      ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
  2. 11
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java

206
ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
Unescape View File

@ -5,17 +5,24 @@
<a-row>
<a-col :span="24">
<a-form-model-item label="上级任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperName">
<j-popup v-model="model.upperTaskName" field="upperTaskName" org-fields="id,task_name"
dest-fields="upperId,upperTaskName" code="taskname" :multi="true" @input="popupCallback" />
<j-popup
v-model="model.upperTaskName"
field="upperTaskName"
org-fields="id,task_name"
dest-fields="upperId,upperTaskName"
code="taskname"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="上级任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperId">-->
<!-- <j-dict-select-tag v-model="model.upperId" placeholder="请选择所属上级任务"-->
<!-- :dict-code="task" style="width: 100%">-->
<!-- </j-dict-select-tag>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-model-item label="上级任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperId">-->
<!-- <j-dict-select-tag v-model="model.upperId" placeholder="请选择所属上级任务"-->
<!-- :dict-code="task" style="width: 100%">-->
<!-- </j-dict-select-tag>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="24" style="display: none;">
<a-form-model-item label="上级任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperId">
<a-input v-model="model.upperId" placeholder="请选择所属上级任务"></a-input>
@ -24,27 +31,26 @@
<a-col :span="24">
<a-form-model-item label="任务等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workLevel">
<!-- <a-input-number :min="1" :max="16" v-model="model.workLevel" placeholder="请输入任务等级" style="width: 100%" />-->
<j-dict-select-tag v-model="model.workLevel" type="radio" placeholder="请选择任务等级" dict-code="workLevel"
style="width: 100%">
<j-dict-select-tag v-model="model.workLevel" type="radio" placeholder="请选择任务等级" dict-code="workLevel" style="width: 100%">
</j-dict-select-tag>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col>
<a-col >
<a-form-model-item label="任务层级" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="level">
<j-dict-select-tag v-model="model.level" type="radio" style="width: 100%" dictCode="task_type_level" />
<j-dict-select-tag v-model="model.level" type="radio" style="width: 100%" dictCode="task_type_level"/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col>
<a-col >
<a-form-model-item label="任务类型" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="typeId">
<!-- <j-dict-select-tag v-model="model.typeId" type="radio" style="width: 100%" dict-code="task_type,type_name,id"/> -->
<div v-for="item in options" :key="item.id" class="a">
<span style="margin-right: 10px;" class="B">{{ item.type_Name }} </span>
<a-radio-group v-model="model.typeId" :key="`children-${item.id}`">
<a-radio-group v-model="model.typeId" :key="`children-${item.id}`" >
<a-radio v-for="child in item.children" :key="child.id" :value="child.id">
<span>{{ child.type_Name }}</span>
</a-radio>
@ -56,41 +62,49 @@
<a-row>
<a-col :span="24">
<a-form-model-item label="项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectId">
<j-dict-select-tag v-model="model.projectId" placeholder="请选择项目" dict-code="projectx,project_name,id"
style="width: 100%" :disabled="model.typeId == null" @change="fillTaskName">
<j-dict-select-tag
v-model="model.projectId"
placeholder="请选择项目"
dict-code="projectx,project_name,id"
style="width: 100%"
:disabled="model.typeId==null"
@change="fillTaskName" >
</j-dict-select-tag>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="中文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskName">
<!-- <a-input v-model="model.taskName" placeholder="请输入中文名称"-->
<!-- autocomplete="on" -->
<!-- :disabled="model.typeId==null">-->
<!-- </a-input>-->
<a-textarea v-model="model.taskName" placeholder="请输入中文名称" autocomplete="on"
:disabled="model.typeId == null" auto-size />
<!-- <a-input v-model="model.taskName" placeholder="请输入中文名称"-->
<!-- autocomplete="on" -->
<!-- :disabled="model.typeId==null">-->
<!-- </a-input>-->
<a-textarea v-model="model.taskName"
placeholder="请输入中文名称"
autocomplete="on"
:disabled="model.typeId==null"
auto-size />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="责任人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="managerUsers">
<j-multi-select-tag type="list_multi" v-model="model.managerUsers" dictCode="sys_user,realname,id"
placeholder="请选择责任人" />
<j-multi-select-tag type="list_multi" v-model="model.managerUsers" dictCode="sys_user,realname,id" placeholder="请选择责任人"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moduleId">
<!-- <a-input v-model="model.moduleId" placeholder="请输入模块" modulex,module_name,id></a-input>-->
<j-dict-select-tag v-model="model.moduleId" placeholder="请选择模块" :dict-code="this.modulex" style="width: 80%"
@change="fillModuleName()"></j-dict-select-tag>
<j-dict-select-tag v-model="model.moduleId" placeholder="请选择模块" :dict-code="this.modulex"
style="width: 80%" @change="fillModuleName()"></j-dict-select-tag>
<a-button @click="handleAdd3" type="primary" icon="plus" style="width: 20%;"></a-button>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="功能" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="functionId">
<!-- <a-input v-model="model.functionId" placeholder="请输入功能id" functionx,function_name,id></a-input>-->
<j-dict-select-tag v-model="model.functionId" placeholder="请选择功能" :dict-code="functionx" style="width: 80%"
@change="fillFunctionName()"></j-dict-select-tag>
<a-button @click="handleAdd1(model.moduleId)" type="primary" icon="plus" style="width: 20%;"></a-button>
<j-dict-select-tag v-model="model.functionId" placeholder="请选择功能"
:dict-code="functionx"
style="width: 80%" @change="fillFunctionName()"></j-dict-select-tag>
<a-button @click="handleAdd1(model.moduleId)" type="primary" icon="plus" style="width: 20%;" ></a-button>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -98,17 +112,16 @@
<!-- <a-input v-model="model.ruleId" placeholder="请输入规则id" rulex,rule_no,id></a-input>-->
<j-dict-select-tag v-model="model.ruleId" placeholder="请选择规则" :dict-code="rulex"
style="width: 80%"></j-dict-select-tag>
<a-button @click="handleAdd2(model.functionId, model.moduleId)" type="primary" icon="plus"
style="width: 20%;"></a-button>
<a-button @click="handleAdd2(model.functionId,model.moduleId)" type="primary" icon="plus" style="width: 20%;"></a-button>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col>
<a-col >
<a-form-model-item label="任务状态" :labelCol="labelCol1" :wrapperCol="wrapperCol1" prop="workStatus">
<!-- <a-input-number :min="1" :max="16" v-model="model.workStatus" placeholder="请输入任务状态" style="width: 100%" />-->
<j-dict-select-tag v-model="model.workStatus" type="radio" dict-code="task_work_status"
placeholder="请选择任务状态" style="width: 100%" />
placeholder="请选择任务状态" style="width: 100%"/>
</a-form-model-item>
</a-col>
</a-row>
@ -116,7 +129,7 @@
<a-col>
<a-form-model-item label="任务描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="taskDescribe">
<!-- <a-input type="textarea" v-model="model.taskDescribe" :rows="2"/> -->
<j-editor v-model="model.taskDescribe" />
<j-editor v-model="model.taskDescribe"/>
</a-form-model-item>
</a-col>
</a-row>
@ -124,37 +137,36 @@
<a-col :span="24">
<a-form-model-item label="发布时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="publishTime">
<!-- <j-date placeholder="请选择发布时间" v-model="model.publishTime" style="width: 100%"/>-->
<a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.startTime" style="width: 100%" />
<a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.startTime" style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="预计结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="expectedEndTime">
<!-- <j-date placeholder="请选择预计结束时间" v-model="model.expectedEndTime" style="width: 100%"/>-->
<a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.expectedEndTime"
style="width: 100%" />
<a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.expectedEndTime" style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="预计时长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="expectedDuration">
<a-input-number v-model="model.expectedDuration" placeholder="请输入预计时长" style="width: 100%" @blur="expectedDuration()"/>
<a-input-number v-model="model.expectedDuration" placeholder="请输入预计时长" style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="实际时长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="realDuration">
<a-input-number v-model="model.realDuration" placeholder="请输入实际时长" style="width: 100%" />
<a-input-number v-model="model.realDuration" placeholder="请输入实际时长" style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="startTime">
<!-- <j-date placeholder="请选择开始时间" v-model="model.startTime" style="width: 100%"/>-->
<a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.startTime" style="width: 100%" />
<a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.startTime" style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="submitTime">
<!-- <j-date placeholder="请选择提交时间" v-model="model.submitTime" style="width: 100%"/>-->
<a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.submitTime" style="width: 100%" />
<a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.submitTime" style="width: 100%"/>
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -181,13 +193,13 @@
<script>
import store from '@/store'
import { httpAction, getAction } from '@api/manage'
import { validateDuplicateValue } from '@/utils/util'
import {httpAction, getAction} from '@api/manage'
import {validateDuplicateValue} from '@/utils/util'
import JVxeDateCell from "@comp/jeecg/JVxeTable/components/cells/JVxeDateCell";
import JMultiSelectTag from "@/components/dict/JMultiSelectTag"
import TaskModal from "@views/task/modules/TaskModal.vue";
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { mixinDevice } from "@/utils/mixin";
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {mixinDevice} from "@/utils/mixin";
import modulexModal from "@views/modulex/modules/ModulexModal__Style#Drawer.vue";
import FunctionxModal from "@views/functionx/modules/FunctionxModal__Style#Drawer.vue";
import RulexModal from "@views/rulex/modules/RulexModal__Style#Drawer.vue";
@ -237,73 +249,73 @@ export default {
// sm: {span: 16},
// },
labelCol: {
xs: { span: 23 },
sm: { span: 6 },
xs: {span: 23},
sm: {span: 6},
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
xs: {span: 24},
sm: {span: 16},
},
// 任务层级 任务类型 任务状态
labelCol1: {
xs: { span: 24 },
sm: { span: 3 },
xs: {span: 24},
sm: {span: 3},
},
wrapperCol1: {
xs: { span: 24 },
sm: { span: 21 },
xs: {span: 24},
sm: {span: 21},
},
// 任务描述
labelCol2: {
xs: { span: 24 },
sm: { span: 3 },
xs: {span: 24},
sm: {span: 3},
},
wrapperCol2: {
xs: { span: 24 },
sm: { span: 20 },
xs: {span: 24},
sm: {span: 20},
},
labelCol3: {
xs: { span: 24 },
sm: { span: 7 },
xs: {span: 24},
sm: {span: 7},
},
wrapperCol3: {
xs: { span: 24 },
sm: { span: 15 },
xs: {span: 24},
sm: {span: 15},
},
confirmLoading: false,
validatorRules: {
taskName: [
{ required: true, message: '请输入中文名称!' },
{required: true, message: '请输入中文名称!'},
// {pattern: /^.{2,300}$/, message: '长度不在范围内!'},
// {pattern: /^[0-9]{0,100}$/, message: '栏目排序不能为空且长度为正整数'}
],
level: [
{ required: true, message: '任务层级不能为空!' },
{required: true, message: '任务层级不能为空!'},
],
typeId: [
{ required: true, message: '任务类型不能为空!' },
{required: true, message: '任务类型不能为空!'},
],
workLevel: [
{ required: true, message: '任务等级不能为空!' },
{required: true, message: '任务等级不能为空!'},
],
workStatus: [
{ required: true, message: '任务状态不能为空!' },
{required: true, message: '任务状态不能为空!'},
],
projectId: [
{ required: true, message: '项目不能为空!' },
{required: true, message: '项目不能为空!'},
],
managerUsers: [
{ required: true, message: '责任人不能为空!' },
{required: true, message: '责任人不能为空!'},
],
expectedDuration: [
{ required: true, message: '请输入预计任务时长!' },
{ pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的时长!' },
{required: true, message: '请输入预计任务时长!'},
{pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的时长!'},
],
realDuration: [
{ required: false, message: '请输入实际任务时长!' },
{ pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的时长!' },
{required: false, message: '请输入实际任务时长!'},
{pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的时长!'},
],
},
url: {
@ -314,8 +326,7 @@ export default {
// queryTaskTypeById: "/taskType/taskType/queryById",
fillTaskName: "/task/task/fillTaskName",
list: "/task/task/list",
listtasktype: '/taskType/taskType/getTypeMap',
expectedDuration: '/task/task/estimateTime'
listtasktype: '/taskType/taskType/getTypeMap'
}
}
@ -332,16 +343,6 @@ export default {
this.tasktype()
},
methods: {
expectedDuration() {
let param = {
startTime: this.model.startTime,
expectedDuration: this.model.expectedDuration,
}
getAction(this.url. expectedDuration, param).then((res) => {
this.model.expectedEndTime=res.result
})
},
tasktype() {
getAction(this.url.listtasktype).then((res) => {
const data = res.result;
@ -352,7 +353,7 @@ export default {
})
})
},
popupCallback(value, row) {
popupCallback(value,row){
this.model = Object.assign(this.model, row);
},
handleCheckChange(data, checked, tree) {
@ -368,7 +369,7 @@ export default {
}
,
fillTaskName() {
this.modulex = "modulex,module_name,id,project_id='" + this.model.projectId + "'";
this.modulex = "modulex,module_name,id,project_id='"+this.model.projectId+"'";
let that = this;
let fillTaskName = "";
@ -395,8 +396,8 @@ export default {
}
}
,
fillLevelName() {
this.task = "task,task_name,id,level='" + this.model.level + "'";
fillLevelName(){
this.task = "task,task_name,id,level='"+this.model.level+"'";
}
,
handleAdd3: function () {
@ -410,24 +411,24 @@ export default {
// this.$refs.modalForm1.title = "新增";
// this.$refs.modalForm1.disableSubmit = false;
// },
handleAdd1(moduleId) {
console.log(moduleId + "22222222222222")
handleAdd1(moduleId){
console.log(moduleId+"22222222222222")
this.$refs.modalForm1.add1(moduleId)
this.$refs.modalForm1.title = "新增";
this.$refs.modalForm1.disableSubmit = false;
},
handleAdd2: function (functionId, moduleId) {
this.$refs.modalForm2.add1(functionId, moduleId);
handleAdd2: function (functionId,moduleId) {
this.$refs.modalForm2.add1(functionId,moduleId);
this.$refs.modalForm2.title = "新增";
this.$refs.modalForm2.disableSubmit = false;
},
fillModuleName() {
this.functionx = "functionx,function_name,id,module_id='" + this.model.moduleId + "'";
this.functionx = "functionx,function_name,id,module_id='"+this.model.moduleId+"'";
},
fillFunctionName() {
this.rulex = "rulex,rule_no,id,function_id='" + this.model.functionId + "'";
fillFunctionName(){
this.rulex = "rulex,rule_no,id,function_id='"+this.model.functionId+"'";
},
// 获取当前日期的方法
// 获取当前日期的方法
getProjectNum() {
const projectTime = new Date() // 当前中国标准时间
const Year = projectTime.getFullYear() // 获取当前年份 支持IE和火狐浏览器.
@ -498,18 +499,17 @@ export default {
}
</script>
<style lang="less" scoped>
.a {
.a{
display: flex;
flex-direction: row;
flex-wrap: wrap;
flex-wrap:wrap;
align-items: baseline;
}
.B {
.B{
width: 10%;
}
::v-deep .ant-radio-group {
::v-deep .ant-radio-group{
width: 85%;
}
</style>

11
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java
Unescape View File

@ -453,10 +453,7 @@ public class TaskController extends JeecgController<Task, ITaskService> {
workTime += endTime.getTime() - date3.getTime();
return workTime;
}else {
//时间跨度没有超过两天
if (startTime.compareTo(date4) >= 0)
return workTime; //任务是下午下班之后发布的，且是下班之后提交的，没有多余工作时间
if (startTime.compareTo(date1) <= 0)
startTime = date1; //发布任务在8点之前
if (startTime.compareTo(date2) <= 0){
@ -533,11 +530,6 @@ public class TaskController extends JeecgController<Task, ITaskService> {
long tempTime = 0;
if (startTime.compareTo(date1) <= 0)
startTime = date1; //任务发布在8点半之前，修正时间
if (startTime.compareTo(date4) >= 0){
startTime = date1; //任务发布在晚上下班后，修正到第二天早上上班时间
offset ++;
}
if (startTime.compareTo(date2) < 0){
//上午发布任务
tempTime = date2.getTime() - startTime.getTime();
@ -555,8 +547,6 @@ public class TaskController extends JeecgController<Task, ITaskService> {
tempTime = date4.getTime() - startTime.getTime();
if (tempTime >= millisecond)
return new Date(startTime.getTime() + millisecond + DAYTIME*offset);
else
millisecond -= tempTime;
}
//时间修正，天数偏移量加1，到这里有两中情况，1、白天工作时间不足抵消 2、下午6点之后发布任务
offset ++;
@ -567,7 +557,6 @@ public class TaskController extends JeecgController<Task, ITaskService> {
return new Date(startTime.getTime() + millisecond + DAYTIME*offset);
//上午偏移不足，下午一定够，因为不会跨两天
millisecond -= tempTime;
startTime = date3;
return new Date(startTime.getTime() + millisecond + DAYTIME*offset);
}

Write Preview
Loading…
Cancel
Save