Skip to content

M
mes-ui
Commit 166767db authored by 周远喜's avatar 周远喜
Browse files
Options

时间控件修改

parent 2c8fbb84
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 288 additions and 238 deletions
components/page/dateRange.vue
View file @ 166767db
...@@ -119,9 +119,9 @@ export default { ...@@ -119,9 +119,9 @@ export default {
} }
}, },
watch: { watch: {
value(v){ // value(v){
this.value=[v[this.start],v[this.end]] // this.value=[v[this.start],v[this.end]]
} // }
}, },
}; };
</script> </script>
......
components/page/userGroup.vue
View file @ 166767db
<template> <template>
<div> <div>
<Select :placeholder="placeholder" v-model="name" @on-change="change" :multiple="multiple" clearable filterable transfer> <Select
<Option v-for="item in users" :value="item.userId" :key="item.userId" :label="item.note" :disabled="item.status==0"> :placeholder="placeholder"
<div class="user"> v-model="name"
<State code="project.group.authority" :value="item.authority" class="mr10" type="tag" /> {{item.note}} @on-change="change"
<State code="project.group.role" :value="item.role" class="mr10" type="tag" /> :multiple="multiple"
</div> clearable
</Option> filterable
transfer
>
<Option
v-for="item in users"
:value="item.userId"
:key="item.userId"
:label="item.note"
:disabled="item.status == 0"
>
<div class="user">
<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> </Select>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
model: { model: {
prop: "value", prop: "value",
event: "on-change", event: "on-change",
},
data() {
return {
name: this.value,
users: this.data,
};
},
created() {
this.load();
},
props: {
value: [String, Number, Array],
placeholder: {
type: String,
default: "请选择人员",
}, },
data() { multiple: {
return { type: Boolean,
name: this.value, default: false,
users: this.data,
};
},
created() {
this.load();
}, },
props: { projectId: {
value: [String, Number, Array], type: String,
placeholder: {
type: String,
default: "请选择人员",
},
multiple: {
type: Boolean,
default: false,
},
projectId: {
type: String
}
}, },
methods: { },
load() { methods: {
var params = { load() {
conditions: [{ if (this.projectId) {
fieldName: "projectId", var params = {
fieldValue: this.projectId, conditions: [
conditionalType: "Equal" {
}] fieldName: "projectId",
} fieldValue: this.projectId,
// conditionalType: "Equal",
this.$api.post(`${material}/projectgroupuser/list`, params).then(r => { },
this.users = r.result; ],
}) };
}, //
change(event) { this.$api
let name = ""; .post(`${material}/projectgroupuser/list`, params)
this.users.forEach((e) => { .then((r) => {
if (e.id == event) { this.users = r.result;
name = e.label; });
} }
});
this.$emit("on-change", event, name);
},
// 加载人员
}, },
watch: { change(event) {
projectId(v){ let name = "";
this.load(); this.users.forEach((e) => {
if (e.id == event) {
name = e.label;
} }
});
this.$emit("on-change", event, name);
},
// 加载人员
},
watch: {
projectId(v) {
if (v) {
this.load();
}
}, },
},
}; };
</script> </script>
<style lang="less"> <style lang="less">
@import "../../assets/css/custom.less"; @import "../../assets/css/custom.less";
.userGroup {} .userGroup {
}
</style> </style>
pages/project/plan/edit.vue
View file @ 166767db
...@@ -148,6 +148,7 @@ export default { ...@@ -148,6 +148,7 @@ export default {
}, },
props: { props: {
eid: [Number,String], eid: [Number,String],
v:Object
}, },
mounted() { mounted() {
if (this.eid) { if (this.eid) {
......
pages/project/plan/index.vue
View file @ 166767db
This diff is collapsed.
pages/project/project/add.vue
View file @ 166767db
...@@ -79,14 +79,8 @@ ...@@ -79,14 +79,8 @@
></Col> ></Col>
<Col :span="12"> <Col :span="12">
<FormItem label="开始结束时间" prop="date"> <FormItem label="开始结束时间" prop="date">
<DatePicker <DateRange v-model="entity" edit></DateRange>
type="datetimerange" </FormItem
format="yyyy-MM-dd"
v-model="date"
placeholder="请选择时间范围"
@on-change="changeFormat"
style="width: 300px"
></DatePicker> </FormItem
></Col> ></Col>
<Col :span="12" <Col :span="12"
......
pages/project/project/detail.vue
View file @ 166767db
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</li> </li>
<li> <li>
<a @click="template"> <a @click="template">
<Icon type="ios-photos" />模版 <Icon type="ios-photos" />目录
</a> </a>
&nbsp; &nbsp;
<span>|</span> <span>|</span>
......
pages/project/project/edit.vue
View file @ 166767db
...@@ -35,14 +35,7 @@ ...@@ -35,14 +35,7 @@
></Col> ></Col>
<Col :span="12"> <Col :span="12">
<FormItem label="开始结束时间" prop="date"> <FormItem label="开始结束时间" prop="date">
<DatePicker <DateRange v-model="entity" edit></DateRange> </FormItem
type="datetimerange"
format="yyyy-MM-dd"
v-model="date"
placeholder="请选择时间范围"
@on-change="changeFormat"
style="width: 300px"
></DatePicker> </FormItem
></Col> ></Col>
<!-- <Col :span="12" <!-- <Col :span="12"
><FormItem :label="l('startDate')" prop="startDate"> ><FormItem :label="l('startDate')" prop="startDate">
......
pages/project/project/index.vue
View file @ 166767db
...@@ -278,35 +278,47 @@ export default { ...@@ -278,35 +278,47 @@ export default {
// high: true, // high: true,
// code: "mes.project_main.Phase", // code: "mes.project_main.Phase",
// }, // },
{ // {
key: "startDate", // key: "startDate",
title: this.l("startDate"), // title: this.l("startDate"),
align: "center", // align: "center",
high: true, // high: true,
render: (h, params) => { // render: (h, params) => {
return h( // return h(
"span", // "span",
params.row.startDate // params.row.startDate
? this.sliceStr(params.row.startDate + " ", 0, 10) // ? this.sliceStr(params.row.startDate + " ", 0, 10)
: "" // : ""
); // );
}, // },
}, // },
// {
// key: "endDate",
// title: this.l("endDate"),
// align: "center",
// high: true,
// render: (h, params) => {
// return h(
// "span",
// params.row.endDate
// ? this.sliceStr(params.row.endDate + " ", 0, 10)
// : ""
// );
// },
// },
{ {
key: "endDate", key: "endDate",
title: this.l("endDate"), width: 250,
title: "计划日期",
align: "center", align: "center",
high: true, render(h, param) {
render: (h, params) => { return h("DateRange", {
return h( attrs: {
"span", value: param.row,
params.row.endDate },
? this.sliceStr(params.row.endDate + " ", 0, 10) });
: ""
);
}, },
}, },
{ {
key: "creationTime", key: "creationTime",
title: this.l("creationTime"), title: this.l("creationTime"),
......
pages/project/record/add.vue
View file @ 166767db
...@@ -59,12 +59,6 @@ export default { ...@@ -59,12 +59,6 @@ export default {
required: true, required: true,
message: '必填', message: '必填',
trigger: 'blur' trigger: 'blur'
}],
workHour: [{
required: true,
message: '必填',
trigger: 'blur',
type: "number"
}] }]
} }
} }
......
pages/project/task/add.vue
View file @ 166767db
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem label="计划日期" prop="date"> <FormItem label="计划日期" prop="date">
<DatePicker type="datetimerange" format="yyyy-MM-dd" placeholder="请选择时间范围" @on-change="changeFormat" style="width: 300px"></DatePicker> <DateRange v-model="entity" edit></DateRange>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col :span="24">
...@@ -53,8 +53,10 @@ export default { ...@@ -53,8 +53,10 @@ export default {
userIds: "", userIds: "",
userId: "", userId: "",
note: "", note: "",
plansToStartDate: null, startDate:null,
plansToEndTime: null, endDate:null,
// plansToStartDate: null,
// plansToEndTime: null,
}, },
rules: { rules: {
name: [{ name: [{
......
pages/project/task/edit.vue
View file @ 166767db
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem label="计划日期" prop="date"> <FormItem label="计划日期" prop="date">
<DatePicker type="datetimerange" format="yyyy-MM-dd" placeholder="请选择时间范围" v-model="planDate" @on-change="changeFormat" style="width: 300px"></DatePicker> <DateRange v-model="entity" edit></DateRange>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col :span="24">
...@@ -47,7 +47,10 @@ export default { ...@@ -47,7 +47,10 @@ export default {
data() { data() {
return { return {
disabled: false, disabled: false,
entity: {}, entity: {
startDate:null,
endDate:null,
},
planDate: [], planDate: [],
rules: { rules: {
name: [{ name: [{
...@@ -65,7 +68,8 @@ export default { ...@@ -65,7 +68,8 @@ export default {
} }
}, },
props: { props: {
eid: String eid: String,
row:Object,
}, },
mounted() { mounted() {
if (this.eid != '' && this.eid != null) { if (this.eid != '' && this.eid != null) {
...@@ -79,9 +83,9 @@ export default { ...@@ -79,9 +83,9 @@ export default {
}).then(r => { }).then(r => {
this.entity = r.result; this.entity = r.result;
this.entity.userId = parseInt(r.result.userId) this.entity.userId = parseInt(r.result.userId)
if (r.result.plansToStartDate && r.result.plansToStartDate != '' && r.result.plansToEndTime && r.result.plansToEndTime != '') { // if (r.result.plansToStartDate && r.result.plansToStartDate != '' && r.result.plansToEndTime && r.result.plansToEndTime != '') {
this.planDate = [r.result.plansToStartDate, r.result.plansToEndTime] // this.planDate = [r.result.plansToStartDate, r.result.plansToEndTime]
} // }
}) })
}, },
handleSubmit() { handleSubmit() {
......
pages/project/task/index.vue
View file @ 166767db
...@@ -167,7 +167,7 @@ export default { ...@@ -167,7 +167,7 @@ export default {
}, },
{ {
key: "startDate", key: "startDate",
title: '实际日期', title: '计划日期',
align: "center", align: "center",
high: true, high: true,
width: 280, width: 280,
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
}, },
{ {
key: "startDate", key: "startDate",
title: '计划日期', title: '执行日期',
align: "center", align: "center",
high: true, high: true,
width: 280, width: 280,
...@@ -189,8 +189,8 @@ export default { ...@@ -189,8 +189,8 @@ export default {
return h('DateRange', { return h('DateRange', {
props: { props: {
value: params.row, value: params.row,
start: "plansToStartDate", start: "runStartDate",
end: "plansToEndTime", end: "runEndDate",
} }
}) })
} }
......
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