Skip to content

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

task /project / plan

parent e7c84fbe
Show whitespace changes
Inline Side-by-side
Showing with 223 additions and 161 deletions
pages/aps/plan/index.vue
View file @ a4bfdbe3
......@@ -373,6 +373,7 @@ export default {
showAi: false,
showAll: false,
showRun: false,
isPrescheduleStatu: 0,
};
},
mounted() {
......@@ -402,10 +403,14 @@ export default {
let statueArry = [];
let tempmesCodeList = [];
this.resultsStatusArr = [];
this.isPrescheduleStatu = 0
value.forEach((data) => {
var that = this;
statueArry.push(data.id);
this.resultsStatusArr.push(data.mainRoutingSetStatus);
if (data.isPreschedule == 2) {
this.isPrescheduleStatu = 2
}
tempmesCodeList.push(data.mesCode);
});
......@@ -463,7 +468,7 @@ export default {
this.scheduleType = null;
this.scheduleTypeName = "";
this.listBatchIds = this.listBatchIds1;
if (this.scheduleStatus == 1) {
if (this.scheduleStatus == 1 && this.isPrescheduleStatu != 2) {
this.scheduleModal = true;
} else {
this.$Message.error("所选订单里存在未派发订单！");
......
pages/project/project/detail.vue
View file @ a4bfdbe3
<template>
<div class=".detail-document">
<div class=".detail-document">
<div class="top-title">
<div class="new-detail row-left">
<Row>
<Filed :span="12" :name="l('title') + '：'">{{ entity.title }}</Filed>
<Filed :span="12" :name="l('state') + '：'">
<state code="project.main.state" :value="entity.state"
/></Filed>
<state code="project.main.state" :value="entity.state" />
</Filed>
<!-- <Filed :span="12" :name="l('phase')">{{ entity.phase }}</Filed> -->
<Filed :span="12" :name="l('startDate') + '：'">{{
entity.startDate
......@@ -18,27 +18,37 @@
</div>
<ul>
<li>
<a @click="details"> <Icon type="ios-log-in" />详情 </a>
<a @click="details">
<Icon type="ios-log-in" />详情
</a>
&nbsp;
<span>|</span>
</li>
<li>
<a @click="template"> <Icon type="ios-photos" />模版</a>
<a @click="template">
<Icon type="ios-photos" />模版
</a>
&nbsp;
<span>|</span>
</li>
<li>
<a @click="task"> <Icon type="md-create" />任务 </a>
<a @click="task">
<Icon type="md-create" />任务
</a>
&nbsp;
<span>|</span>
</li>
<li>
<a @click="task"> <Icon type="md-create" />成员 </a>
<a @click="groupUser">
<Icon type="md-create" />成员
</a>
&nbsp;
<span>|</span>
</li>
<li>
<a @click="task"> <Icon type="md-create" />动态 </a>
<a @click="task">
<Icon type="md-create" />动态
</a>
&nbsp;
<span>|</span>
</li>
......@@ -50,8 +60,9 @@
<component v-bind:is="detail" :eid="eid" :data="entity"></component>
</keep-alive>
</div>
</div>
</div>
</template>
<script>
import Api from "./api";
export default {
......@@ -65,8 +76,16 @@ export default {
avatorPath: "",
entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }],
name: [{
required: true,
message: "必填",
trigger: "blur"
}],
code: [{
required: true,
message: "必填",
trigger: "blur"
}],
},
fileds: [],
parms: {
......@@ -86,7 +105,9 @@ export default {
},
methods: {
load(v) {
Api.get({ id: v }).then((r) => {
Api.get({
id: v
}).then((r) => {
this.entity = r.result;
// this.$emit("on-load");
});
......@@ -102,8 +123,19 @@ export default {
this.detail = () => import("../plan");
},
task() {
this.curId = this.eid;
this.title = "任务";
//this.detail = () => import("../task/index");
this.$router.push({
name: "project-task",
params: {
id: this.curId
}
});
},
groupUser() {
// this.curId = this.eid;
this.title = "项目任务";
this.title = "任务";
// this.detail = () => import("./add");
},
l(key) {
......@@ -120,6 +152,7 @@ export default {
},
};
</script>
<style lang="less">
.top-title {
// margin: 10px;
......@@ -127,29 +160,35 @@ export default {
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
position: relative;
border-radius: 5px;
.row-left {
width: 1100px;
}
ul {
display: -webkit-inline-box;
display: inline-box;
position: absolute;
bottom: 5px;
right: 0px;
li {
width: 70px;
span {
color: #e0e0e0;
}
}
}
}
.body-document {
margin-top: 10px;
background: #fff;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
border-radius: 8px;
min-height: 80vh;
h4 {
height: 50px;
line-height: 50px;
......@@ -158,25 +197,30 @@ export default {
color: #f5f6fa;
border-radius: 5px 5px 0 0;
}
.img-touxiang {
width: 230px;
height: 230px;
float: right;
margin-top: 10px;
margin-right: 10px;
img {
width: 100%;
height: 100%;
border-radius: 5px;
}
}
.detail-d {
padding-left: 20px;
.filed-d {
border-top: 1px solid #e0e0e0;
}
}
}
.detail-document {
background-color: #f5f7f9 !important;
}
......
pages/project/task/index.vue
View file @ a4bfdbe3
......@@ -9,9 +9,9 @@
</a>
</div>
<Content class="content" :class="!showMenu?'con_bord':''">
<DataGrid :columns="columns" ref="grid" :action="action">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :lazy="true">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<Form ref="formInline" inline>
<FormItem>
<div class="taskMenu">
<Menu mode="horizontal" active-name="2" @on-select="onSelect">
......@@ -98,8 +98,12 @@ export default {
showMenu: true,
easySearch: {
keys: {
op: "title,projectTitle,planTitle",
op: "title",
value: null
},
projectId: {
op: "Equal",
value: ''
}
},
theme1: 'light',
......@@ -108,6 +112,7 @@ export default {
detail: null,
curId: '',
fullScreen: false,
projectId: '',
columns: [
// {
// key: "selection",
......@@ -292,18 +297,26 @@ export default {
data1: [{
id: 1,
title: '测试title'
}]
}],
data: []
}
},
mounted() {
console.log(this);
},
async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
if (this.$route.params.id != '') {
this.easySearch.projectId.value = this.$route.params.id
}
this.treeHeight = window.innerHeight - 150;
},
mounted() {
this.$refs.grid.reload(this.easySearch);
console.log(this.easySearch);
},
methods: {
ok() {
this.$refs.grid.load()
......
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