Skip to content

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

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

parents d7db9f74 7ff949c1
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 46 deletions
components/page/opration.vue
View file @ ed9a51b5
......@@ -40,8 +40,8 @@ export default {
type: String
},
disable: {
type: Boolean,
default: false
type: Number,
default: 0
},
},
......
components/page/projectTaskTree.vue
View file @ ed9a51b5
......@@ -95,7 +95,7 @@ export default {
h("state", {
props: {
code: "mes.project_plan.Status",
type: "text",
type: "tag",
value: data.status
}
}),
......
components/page/userGroup.vue
View file @ ed9a51b5
......@@ -13,10 +13,12 @@
v-for="item in users"
:value="item.userId"
:key="item.userId"
:disabled="item.status==1"
:label="item.note"
:disabled="item.status==0"
>
<div class="user">
<State v-show="item.authority" code="project.group.authority" :value="item.authority" class="mr10"/> {{item.note}} <User :value="item.userId"/></span><Tag>{{item.role}}</Tag>
<State code="project.group.authority" :value="item.authority" class="mr10" type="tag"/> {{item.note}}
<State code="project.group.role" :value="item.role" class="mr10" type="tag"/>
</div>
</Option>
</Select>
......@@ -58,13 +60,13 @@ export default {
// codition:[{fieldName: "groupId", fieldValue: "b9d6fa9e-e033-4a3e-9925-c1f4437d970c", conditionalType: "Equal"}]
codition:[{fieldName: "projectId", fieldValue: this.projectId, conditionalType: "Equal"}]
}
this.$api.post(`${material}/projectplan/list`, params).then(r=>{
this.$api.post(`${material}/projectgroupuser/list`, params).then(r=>{
this.users=r.result;
})
},
change(event) {
let name = "";
this.data.forEach((e) => {
this.users.forEach((e) => {
if (e.id == event) {
name = e.label;
}
......
i18n/locale/zh-CN.js
View file @ ed9a51b5
......@@ -1863,6 +1863,7 @@ export default {
plansToEndTime: '计划结束时间',
completePercentage: '完成百分比',
upTaskId: '上级任务Id',
workHour:'工时'
},
//工资记录
project_plan_record: {
......
pages/project/groupUser/index1.vue
View file @ ed9a51b5
......@@ -244,7 +244,7 @@ export default {
//新增保存或修改保存
save() {
this.cur.groupId = this.eid
if (!this.cur.userId) {
if (this.cur.userId==0||this.cur.userId==null) {
this.$Message.error("请选择人员");
return;
}
......@@ -255,14 +255,15 @@ export default {
this.$Message.error("此人已经选择");
return;
}
if (!this.cur.role ) {
if (this.cur.role===undefined) {
this.$Message.error("请选择人员角色");
return;
}
if (this.cur.authority == null || this.cur.authority == '') {
if (this.cur.authority ===undefined) {
this.$Message.error("请选择人员权限");
return;
}
if (this.cur.id && this.cur.id != '') { //人员修改
Api.update(this.cur).then((r) => {
this.disabled = false;
......
pages/project/plan/api.js
View file @ ed9a51b5
......@@ -16,6 +16,9 @@ export default {
update(params) {
return Api.post(`${material}/projectplan/update`, params);
},
sendtask(params) {
return Api.post(`${material}/projectplan/sendtask`, params);
},
delete(id) {
return Api.delete(`${material}/projectplan/delete`, {
params: {
......
pages/project/plan/index.vue
View file @ ed9a51b5
......@@ -102,7 +102,7 @@ export default {
oprate: "edit",
disable:params.row.status
},
on: { click: () => this.send(params.row.id) },
on: { click: () => this.send(params.row) },
},
),
h(
......@@ -249,6 +249,35 @@ export default {
this.detail = () => import("./add");
this.modal = true;
},
send(row){
console.log(row);
if(!row.startDate){
this.$Message.error("未设置开始时间");
return
}
if(!row.endDate){
this.$Message.error("未设置结束时间");
return
}
if(!row.executor){
this.$Message.error("为设置执行人");
return
}
delete row.chlidren;
delete row.parent;
console.warn(row)
var data=JSON.parse(JSON.stringify(row));
data.status=1;
Api.sendtask({
id:row.id,
}).then(r=>{
if(r.result){
this.$Message.info("任务派发成功！");
this.search();
}
})
},
copy(id) {
this.curId = id;
this.title = "克隆";
......
pages/project/project/detail.vue
View file @ ed9a51b5
......@@ -123,23 +123,23 @@ export default {
this.detail = () => import("../plan");
},
task() {
this.curId = this.eid;
//this.curId = this.eid;
this.title = "任务";
//this.detail = () => import("../task/index");
this.$router.push({
name: "project-task",
params: {
id: this.curId
}
});
this.detail = () => import("../task/index");
// this.$router.push({
// name: "project-task",
// params: {
// id: this.curId
// }
// });
},
group() {
this.title = "项目成员";
this.detail = () => import("../groupUser/index1");
this.detail = () => import("../groupUser/index1");
},
log() {
log() {
this.title = "项目动态";
this.detail = () => import("../record/index1");
this.detail = () => import("../record/index1");
},
l(key) {
key = "project_main" + "." + key;
......
pages/project/record/add.vue
View file @ ed9a51b5
......@@ -4,7 +4,7 @@
<Col :span="12">
<FormItem :label="l('workHour')" prop="workHour">
<InputNumber v-model="entity.workHour"></InputNumber>
<InputNumber v-model="entity.workHour" :min="0"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
......@@ -51,7 +51,7 @@ export default {
deleterUserId: null,
projectId: "",
planId: "",
workHour: null,
workHour: 0,
status: null,
title: "",
note: "",
......
pages/project/record/index.vue
View file @ ed9a51b5
<template>
<div>
<DataGrid :columns="columns" ref="grid" :data="recordList" :easy="false" :set="false"><template slot="easySearch">
<DataGrid :columns="columns" ref="grid" :data="recordList" :easy="false" :set="false" :height="400"><template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"><Input placeholder="请输入关键字标题" v-model="easySearch.keys.value" /> </FormItem>
<FormItem><Button type="primary" @click="search">查询</Button></FormItem>
......@@ -51,8 +51,9 @@ export default {
columns: [{
key: "workHour",
title: this.l("workHour"),
align: "left",
high: true
align: "right",
high: true,
width: 120,
},
{
key: "title",
......@@ -61,6 +62,22 @@ export default {
easy: true,
high: true
},
{
key: "attachment",
title: this.l("attachment"),
align: "center",
high: true,
render: (h, params) => {
return h(
"a", {
on: {
click: () => this.viewFiles(params.row)
},
},
"查看附件"
);
},
},
{
title: '操作',
key: 'action',
......@@ -140,7 +157,7 @@ export default {
this.$refs.grid.reload(this.easySearch)
},
add() {
this.curId = 0;
this.curId = this.eid;
this.title = "新增";
this.detail = () => import('./add')
this.modal = true;
......@@ -171,6 +188,14 @@ export default {
}
})
},
viewFiles(row) {
if (row.attachment) {
this.parms.eid = row.attachment;
this.modal1 = true;
} else {
this.$Message.error("暂没上传附件");
}
},
cancel() {
this.curId = 0;
this.modal = false
......
pages/project/task/index.vue
View file @ ed9a51b5
......@@ -9,7 +9,7 @@
</a>
</div>
<Content class="content" :class="!showMenu?'con_bord':''">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :lazy="true">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :lazy="true" :set="false">
<template slot="easySearch">
<Form ref="formInline" inline>
<FormItem>
......@@ -56,11 +56,13 @@
</FormItem>
<FormItem prop="keys"><Input placeholder="请输入项目标题/计划名称/任务标题" v-model="easySearch.keys.value" v-width="240" /> </FormItem>
<FormItem><Button type="primary" @click="search">查询</Button></FormItem>
<!--
<FormItem>
<Button @click="highSearch" type="text">
<Icon type="md-search" />高级
</Button>
</FormItem>
-->
</Form>
</template>
<template slot="buttons">
......@@ -199,8 +201,8 @@ export default {
high: true,
},
{
key: "endDate",
title: '工时',
key: "workHour",
title: this.l("workHour"),
align: "center",
high: true,
render: (h, params) => {
......@@ -211,7 +213,7 @@ export default {
on: {
click: () => this.viewWork(params.row.id)
}
}, params.row.title)
}, params.row.workHour)
}
},
{
......@@ -251,7 +253,6 @@ export default {
type: "icon",
oprate: "edit",
title: params.row.status == 0 ? "开始" : params.row.status == 2 ? "继续" : '',
// color: "#19be6b",
//disable: (params.row.status == 0 || params.row.status == 2) ? false : true
},
on: {
......@@ -263,7 +264,6 @@ export default {
// icon: "ios-pause",
// type: "icon",
// title: "暂停",
// //color: "#19be6b",
// //disable: params.row.status == 1 ? false : true
// },
// on: {
......@@ -276,7 +276,6 @@ export default {
type: "icon",
oprate: "edit",
title: "完成",
//color: "#19be6b",
//disable: (params.row.status != 0 && params.row.status != 3) ? false : true
},
on: {
......@@ -289,7 +288,6 @@ export default {
type: "icon",
oprate: "add",
title: "新增记录",
//color: "#19be6b",
// disable: (params.row.status != 3 && params.row.status != 4) ? false : true
},
on: {
......@@ -302,7 +300,6 @@ export default {
type: "icon",
oprate: "edit",
title: "修改",
// color: "#2b85e4",
//disable: (params.row.status == 0 || params.row.status == 2) ? false : true
},
on: {
......@@ -315,7 +312,6 @@ export default {
type: "icon",
title: "删除",
oprate: 'delete',
//color: "#ed4014",
// disable: (params.row.status == 0 || params.row.status == 3) ? false : true
},
on: {
......@@ -335,6 +331,9 @@ export default {
planIdsCur: []
}
},
props: {
eid: String
},
async fetch({
store,
params
......@@ -342,15 +341,18 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
if (this.$route.params.id != '') {
this.projectId = this.$route.params.id
this.easySearch.projectId.value = this.$route.params.id
if (this.eid != '') {
this.projectId = this.eid
this.easySearch.projectId.value = this.eid
}
this.treeHeight = window.innerHeight - 150;
},
mounted() {
this.$refs.grid.reload(this.easySearch);
console.log(this.easySearch);
if (this.eid != "") {
this.easySearch.projectId.value = this.eid
this.$refs.grid.reload(this.easySearch);
}
},
methods: {
ok() {
......@@ -427,7 +429,7 @@ export default {
},
projectId: {
op: "Equal",
value: this.$route.params.id
value: this.eid
},
};
this.$refs.grid.reload(where);
......@@ -463,14 +465,14 @@ export default {
viewWork(id) {
this.curId = id;
this.title = "查看工时";
this.fullScreen = true;
this.fullScreen = false;
this.detail = () => import('../record')
this.modal = true;
},
addRecord(id) {
this.curId = id;
this.title = "新增记录";
this.fullScreen = true;
this.fullScreen = false;
this.detail = () => import('../record/add')
this.modal = true;
},
......@@ -478,6 +480,13 @@ export default {
let vkey = "project_task" + "." + key;
return this.$t(vkey) || key
}
},
watch: {
eid(v) {
if (v != "") {
this.eid = v
}
}
}
}
</script>
......
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