Skip to content

M
mes-ui
Commit 04eb6985 authored by renjintao's avatar renjintao
Browse files
Options

record

parent 89336019
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 198 deletions
pages/project/record/add.vue
View file @ 04eb6985
...@@ -60,10 +60,11 @@ export default { ...@@ -60,10 +60,11 @@ export default {
message: '必填', message: '必填',
trigger: 'blur' trigger: 'blur'
}], }],
workHour: [{ workHour: [{
required: true, required: true,
message: '必填', message: '必填',
trigger: 'blur' trigger: 'blur',
type: "number"
}] }]
} }
} }
......
pages/project/record/edit.vue
View file @ 04eb6985
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
required: true, required: true,
message: '必填', message: '必填',
trigger: 'blur' trigger: 'blur'
}] }],
}, },
parms: { parms: {
app: "taskRecord", app: "taskRecord",
......
pages/project/task/detail.vue
View file @ 04eb6985
<template> <template>
<div class="flex"> <div class="flex">
<div class="fg1" > <div class="fg1">
<Card> <Card>
<p slot="title">任务信息</p> <p slot="title">任务信息</p>
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="6" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="6" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="6" :name="l('creatorUserId')"> <Filed :span="6" :name="l('creatorUserId')">
<User :value="entity.creatorUserId"/> <User :value="entity.creatorUserId" />
</Filed> </Filed>
<Filed :span="6" :name="l('level')"> <Filed :span="6" :name="l('level')">
<State code="project.task.level" :value="entity.level"/> <State code="project.task.level" :value="entity.level" />
</Filed> </Filed>
<Filed :span="6" :name="l('status')"> <Filed :span="6" :name="l('status')">
<State code="project.task.status" :value="entity.status"/> <State code="project.task.status" :value="entity.status" />
</Filed> </Filed>
<Filed :span="12" :name="l('title')">{{entity.title}}</Filed> <Filed :span="12" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="12" :name="l('userId')">{{entity.userId}} <Filed :span="12" :name="l('userId')">{{entity.userId}}
<User :value="entity.creatorUserId"/> <User :value="entity.creatorUserId" />
</Filed> </Filed>
<Filed :span="24" :name="l('userIds')"> <Filed :span="24" :name="l('userIds')">
<User v-for="(li,i) in entity.userIds" :value="li" :key="i" class="ml10"/> <User v-for="(li,i) in entity.userIds" :value="li" :key="i" class="ml10" />
</Filed> </Filed>
<Filed :span="12" :name="l('startDate')"> <DateRange :value="entity"></DateRange></Filed> <Filed :span="12" :name="l('startDate')">
<Filed :span="12" :name="l('plansToStartDate')"><DateRange :value="entity" start="plansToStartDate" end="plansToEndTime"></DateRange></Filed> <DateRange :value="entity"></DateRange>
<Filed :span="24" :name="l('note')"> </Filed>
<div v-html="entity.note"></div> <Filed :span="12" :name="l('plansToStartDate')">
</Filed> <DateRange :value="entity" start="plansToStartDate" end="plansToEndTime"></DateRange>
</Filed>
<Filed :span="24" :name="l('note')">
<div v-html="entity.note"></div>
</Filed>
<!-- <Filed :span="12" :name="l('plansToEndTime')">{{entity.plansToEndTime}}</Filed> --> <!-- <Filed :span="12" :name="l('plansToEndTime')">{{entity.plansToEndTime}}</Filed> -->
<!-- <Filed :span="12" :name="l('completePercentage')">{{entity.completePercentage}}</Filed> <!-- <Filed :span="12" :name="l('completePercentage')">{{entity.completePercentage}}</Filed>
<Filed :span="12" :name="l('upTaskId')">{{entity.upTaskId}}</Filed> --> <Filed :span="12" :name="l('upTaskId')">{{entity.upTaskId}}</Filed> -->
</Row> </Row>
</div>
</Form>
</Card>
<Card class="mt10" v-if="entity.status!=2">
<p slot="title">任务汇报</p>
<div class="form">
<Form :label-width="120" ref="formValidate">
<Row :gutter="24">
<Col :span="24">
<FormItem label="任务状态">
<RadioGroup v-model="status">
<Radio :label="1">工作中</Radio>
<Radio :label="2">完成</Radio>
<Radio :label="3">冻结</Radio>
</RadioGroup>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="标题" prop="title"> <Input v-model="entitysave.title"/>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="工时" prop="workHour">
<InputNumber v-model="entitysave.workHour" :min="0"></InputNumber>
</FormItem>
</Col>
<Col :span="24"> </div>
<FormItem label="内容" prop="note"> </Form>
<Input type="textarea" v-model="entitysave.note" :height="100" /> </Card>
</FormItem> <Card class="mt10" v-if="entity.status!=2">
</Col> <p slot="title">任务汇报</p>
<Col :span="12"> <div class="form">
<FormItem label="附件" prop="attachment"> <Form :label-width="120" ref="formValidate">
<files ref="refFile" :parms="parms" files /> <Row :gutter="24">
</Input> <Col :span="24">
</FormItem> <FormItem label="任务状态">
</Col> <RadioGroup v-model="status">
</Row> <Radio :label="1">工作中</Radio>
<FormItem> <Radio :label="2">完成</Radio>
<Button <Radio :label="3">冻结</Radio>
type="primary" </RadioGroup>
@click="updatepart" </FormItem>
class="mr10" </Col>
>确定</Button <Col :span="12">
><Button @click="handleClose">取消</Button> <FormItem label="标题" prop="title"> <Input v-model="entitysave.title" />
</FormItem> </FormItem>
</Form> </Col>
</div> <Col :span="12">
</Card> <FormItem label="工时" prop="workHour">
<InputNumber v-model="entitysave.workHour" :min="0"></InputNumber>
</FormItem>
</Col>
<Col :span="24">
<FormItem label="内容" prop="note">
<Input type="textarea" v-model="entitysave.note" :height="100" />
</FormItem>
</Col>
<Col :span="12">
<FormItem label="附件" prop="attachment">
<files ref="refFile" :parms="parms" files />
</Input>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="updatepart" class="mr10">确定</Button><Button @click="handleClose">取消</Button>
</FormItem>
</Form>
</div>
</Card>
</div> </div>
<div v-width="500" class="pl20"> <div v-width="500" class="pl20">
<Card> <Card>
...@@ -90,136 +89,134 @@ ...@@ -90,136 +89,134 @@
<component :is="detail" :eid="curId" /> <component :is="detail" :eid="curId" />
</Card> </Card>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
import ApiRecord from "../record/api"; import ApiRecord from "../record/api";
export default { export default {
name: "Add", name: "Add",
data() { data() {
return { return {
entity: {}, entity: {},
parms: { parms: {
app: "taskRecord", app: "taskRecord",
eid: null, eid: null,
name: "", name: "",
field: "", field: "",
}, },
status: null, status: null,
entitysave: { entitysave: {
projectId: "", projectId: "",
planId: "", planId: "",
workHour: 0, workHour: 0,
title: "", title: "",
note: "", note: "",
attachment: "", attachment: "",
taskId: "", taskId: "",
}, },
timeValue: { timeValue: {
startDate: "", startDate: "",
endDate: "", endDate: "",
}, },
timeValuePlan: { timeValuePlan: {
startDate: "", startDate: "",
endDate: "", endDate: "",
}, },
divHeight: "200px", divHeight: "200px",
rules: { rules: {
title: [ title: [{
{ required: true,
required: true, message: "必填",
message: "必填", trigger: "blur",
trigger: "blur", }, ],
}, workHour: [{
], required: true,
workHour: [ message: "必填",
{ trigger: "blur",
required: true, type: "number"
message: "必填", }, ],
trigger: "blur", },
}, detail: null,
], curId: "",
},
detail: null,
curId: "",
};
},
props: {
eid: String,
},
created() {},
mounted() {
if (this.eid) {
this.load(this.eid);
}
},
methods: {
load(v) {
Api.get({
id: v,
}).then((r) => {
this.entity = r.result;
this.status = this.entity.status;
this.entitysave.projectId = this.entity.projectId;
this.entitysave.planId = this.entity.planId;
this.entitysave.taskId = this.eid;
//控制radio显示end
this.$emit("on-load");
this.curId = v;
this.detail = () => import("../record/recordTimeLine");
});
},
updatepart() {
if (this.status != this.entity.status) {
let params = {
id: this.eid,
status: this.status,
}; };
Api.updatepart(params).then((r) => {
if (r.success) {
this.$Message.success("任务状态汇报成功");
this.$emit("on-ok");
} else {
this.$Message.error("操作失败");
}
});
}
ApiRecord.create(this.entitysave).then((res) => {
if (res.success) {
this.$Message.success("工时汇报成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
});
}, },
handleClose() { props: {
this.$emit("on-close"); eid: String,
},
created() {},
mounted() {
if (this.eid) {
this.load(this.eid);
}
}, },
l(key) { methods: {
key = "project_task" + "." + key; load(v) {
return this.$t(key); Api.get({
id: v,
}).then((r) => {
this.entity = r.result;
this.status = this.entity.status;
this.entitysave.projectId = this.entity.projectId;
this.entitysave.planId = this.entity.planId;
this.entitysave.taskId = this.eid;
//控制radio显示end
this.$emit("on-load");
this.curId = v;
this.detail = () => import("../record/recordTimeLine");
});
},
updatepart() {
if (this.status != this.entity.status) {
let params = {
id: this.eid,
status: this.status,
};
Api.updatepart(params).then((r) => {
if (r.success) {
this.$Message.success("任务状态汇报成功");
this.$emit("on-ok");
} else {
this.$Message.error("操作失败");
}
});
}
ApiRecord.create(this.entitysave).then((res) => {
if (res.success) {
this.$Message.success("工时汇报成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
});
},
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "project_task" + "." + key;
return this.$t(key);
},
}, },
}, watch: {
watch: { eid(v) {
eid(v) { if (v) {
if (v) { this.load(v);
this.load(v); }
} },
}, },
},
}; };
</script> </script>
<style scoped> <style scoped>
.tex_in10 { .tex_in10 {
text-align: inherit !important; text-align: inherit !important;
} }
.rightDiv { .rightDiv {
width: 18%; width: 18%;
float: left; float: left;
padding-left: 50px; padding-left: 50px;
} }
</style> </style>
pages/project/task/index.vue
View file @ 04eb6985
...@@ -259,7 +259,7 @@ export default { ...@@ -259,7 +259,7 @@ export default {
icon: "ios-alarm", icon: "ios-alarm",
type: "icon", type: "icon",
oprate: "edit", oprate: "edit",
title: "回报工作", title: "汇报工作",
disable: params.row.status == 1 || params.row.status == 3 ? false : true disable: params.row.status == 1 || params.row.status == 3 ? false : true
}, },
on: { on: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment