Skip to content

M
mes-ui
Commit 0685f966 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents ba35b1fc e166fc1a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 470 additions and 72 deletions
components/page/state.vue
View file @ 0685f966
......@@ -20,7 +20,7 @@
<Modal
v-model="modal"
title="生命周期"
width="800"
width="1200"
footer-hide
:mask-closable="false"
>
......
pages/project/plan/index.vue
View file @ 0685f966
......@@ -146,6 +146,9 @@ export default {
align: "left",
high: true,
code: "mes.project_plan.Type",
attr:{
type:'icon'
}
},
{
key: "title",
......@@ -162,14 +165,21 @@ export default {
high: true,
code: "mes.project_plan.Status",
},
{
key: "startDate",
title: this.l("startDate"),
align: "left",
high: true
,type:"date"
},
{ key: "endDate", title: this.l("endDate"), align: "left", high: true,type:"date" },
// {
// key: "startDate",
// title: this.l("startDate"),
// align: "left",
// high: true
// ,type:"date"
// },
// { key: "endDate", title: this.l("endDate"), align: "left", high: true,type:"date" },
{ key: "endDate", title: "计划日期", align: "left",render(h,param) {
return h('DateRange',{
attrs:{
value:param.row
}
})
}, },
// {
// key: "attachment",
// title: this.l("attachment"),
......@@ -227,13 +237,6 @@ export default {
});
},
// rowclick(row,li){
// return {
// test(){
// alert(1);
// }
// }
// },
add(row) {
if(row){
this.curId=row.id;
......@@ -268,7 +271,10 @@ export default {
console.warn(row)
row.status=1;
Api.sendtask(row).then(r=>{
Api.sendtask({
id:row.id,
status:1,
}).then(r=>{
if(r.success){
this.$Message.info("任务派发成功！");
this.search();
......
pages/project/project/detail.vue
View file @ 0685f966
......@@ -56,9 +56,10 @@
</div>
<div class="body-document">
<h4 v-text="title"></h4>
<keep-alive>
<component v-bind:is="detail" :eid="eid" :data="entity"></component>
</keep-alive>
<component v-bind:is="detail" :eid="eid" :data="entity"></component>
<!-- <keep-alive>
</keep-alive> -->
</div>
</div>
</template>
......
pages/project/record/recordTimeLine.vue 0 → 100644
View file @ 0685f966
This diff is collapsed.
pages/project/task/add.vue
View file @ 0685f966
......@@ -16,7 +16,7 @@
</FormItem>
</Col>
<Col :span="12">
<FormItem label="计划开始结束时间" prop="date">
<FormItem label="计划起止日期" prop="date">
<DatePicker type="datetimerange" format="yyyy-MM-dd" v-model="date" placeholder="请选择时间范围" @on-change="changeFormat" style="width: 300px"></DatePicker>
</FormItem>
</Col>
......
pages/project/task/detail.vue
View file @ 0685f966
<template>
<div class="detail" style="width:100%">
<Row style="height:284px">
<Filed :span="6" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="6" :name="l('level')">
<state code="project.task.level" :value="entity.level" type="text"></state>
</Filed>
<Filed :span="6" :name="l('status')">
<state code="project.task.status" :value="entity.status" type="text"></state>
</Filed>
<Filed :span="6" :name="l('userId')">
<User :value="parseInt(entity.userId)"></User>
</Filed>
<Filed :span="12" name="计划起止日期">
<TimeDifference :timeValue="timeValuePlan" :work="0"></TimeDifference>
</Filed>
<Filed :span="12" name="实际起止日期">
<TimeDifference :timeValue="timeValue" :work="1"></TimeDifference>
</Filed>
<div class="detail" style="width:100%;overflow:auto">
<div style="width:80%; border-right:1px solid #ccc;padding-right:30px;float:left">
<Row style="height:284px">
<Filed :span="12" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="12" :name="l('level')">
<state code="project.task.level" :value="entity.level" type="text"></state>
</Filed>
<Filed :span="12" :name="l('status')">
<state code="project.task.status" :value="entity.status" type="text"></state>
</Filed>
<Filed :span="12" :name="l('userId')">
<User :value="parseInt(entity.userId)"></User>
</Filed>
<Filed :span="12" name="计划起止日期">
<TimeDifference :timeValue="timeValuePlan" :work="0"></TimeDifference>
</Filed>
<Filed :span="12" name="实际起止日期">
<TimeDifference :timeValue="timeValue" :work="1"></TimeDifference>
</Filed>
<Filed :span="24" :name="l('note')">
<div style="height:200px" v-html="entity.note" class="tex_in10"></div>
</Filed>
<Filed :span="6" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="6" :name="l('creatorUserId')">
<User :value="entity.creatorUserId"></User>
</Filed>
</Row>
<component :is="detail" :eid="curId" v-if="false" />
<Filed :span="24" :name="l('note')">
<div style="height:200px" v-html="entity.note" class="tex_in10"></div>
</Filed>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">
<User :value="entity.creatorUserId"></User>
</Filed>
</Row>
</div>
<div class="rightDiv" :style="{height:divHeight}">
<component :is="detail" :eid="curId" />
</div>
<FooterToolbar class="ftball">
<div class="tip"><Button type="primary" @click="updatepart(2)">完成</Button><Button type="primary" @click="updatepart(3)">冻结</Button><Button @click="handleClose">取消</Button></div>
</FooterToolbar>
</div>
</template>
<script>
import Api from './api'
import ApiTask from '../task/api'
export default {
name: 'Add',
data() {
......@@ -45,6 +54,7 @@ export default {
startDate: "",
endDate: "",
},
divHeight: '200px',
rules: {
name: [{
required: true,
......@@ -64,10 +74,18 @@ export default {
props: {
eid: String
},
created() {
this.divHeight = window.innerHeight - 150 + 'px'
},
mounted() {
if (this.eid != '' && this.eid != null) {
this.load(this.eid);
}
window.onresize = () => {
return (() => {
this.divHeight = window.innerHeight - 150 + 'px'
})()
}
},
methods: {
load(v) {
......@@ -84,11 +102,35 @@ export default {
endDate: r.result.plansToEndTime,
},
this.$emit('on-load')
// this.curId = v
//this.detail = () => import('../record/index1')
this.curId = v
this.detail = () => import('../record/recordTimeLine')
})
},
updatepart(valStatus) {
let params = {
id: this.eid,
status: valStatus
}
if (valStatus == 1) {
params.startDate = ''
}
if (valStatus == 2) {
params.endDate = ''
}
ApiTask.updatepart(params).then(r => {
if (r.success) {
this.$Message.success('操作成功')
this.$emit('on-ok')
} else {
this.$Message.error('操作失败')
}
}).catch(err => {
this.disabled = false;
this.$Message.error('操作失败')
console.warn(err)
})
},
handleClose() {
this.$emit('on-close')
},
......@@ -112,4 +154,11 @@ export default {
text-indent: 12px;
text-align: inherit !important;
}
.rightDiv {
width: 18%;
float: left;
padding-left: 50px;
}
</style>
pages/project/task/index.vue
View file @ 0685f966
......@@ -145,7 +145,7 @@ export default {
oprate: 'detail'
},
on: {
click: () => this.viewRecord(params.row.id)
click: () => this.viewRecord(params.row.id, params.row.status)
}
}, params.row.title)
}
......@@ -155,29 +155,15 @@ export default {
title: this.l("level"),
align: "center",
high: true,
width: 80,
code: 'project.task.level'
},
{
key: "projectTitle",
title: this.l("projectTitle"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "planTitle",
title: this.l("planTitle"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "status",
title: this.l("status"),
align: "center",
high: true,
width: 120,
code: 'project.task.status'
},
......@@ -193,7 +179,7 @@ export default {
title: '计划起止日期',
align: "center",
high: true,
width: 400,
width: 200,
render: (h, params) => {
return h('TimeDifference', {
props: {
......@@ -211,7 +197,7 @@ export default {
title: '实际起止日期',
align: "center",
high: true,
width: 400,
width: 200,
render: (h, params) => {
return h('TimeDifference', {
props: {
......@@ -227,8 +213,9 @@ export default {
{
key: "workHour",
title: this.l("workHour"),
align: "center",
align: "right",
high: true,
width: 80,
render: (h, params) => {
return h('a', {
attrs: {
......@@ -257,8 +244,9 @@ export default {
{
key: "creationTime",
title: this.l("creationTime"),
align: "left",
align: "center",
high: true,
width: 150,
},
{
title: '操作',
......@@ -472,8 +460,9 @@ export default {
onSelect(val) {
this.$refs.grid.reload(this.easySearch)
},
viewRecord(id) {
viewRecord(id, status) {
this.curId = id;
this.tastkStatus = status;
this.title = "查看记录";
this.fullScreen = true;
this.detail = () => import('./detail')
......
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