Commit 6fc8e6b8 authored by renjintao's avatar renjintao

iview

parent 2ca5a450
...@@ -30,13 +30,14 @@ ...@@ -30,13 +30,14 @@
<Col :span="8"> <Col :span="8">
<FormItem label> <FormItem label>
<span style="float:left">计划起止日期:&nbsp;</span> <span style="float:left">计划起止日期:&nbsp;</span>
<TimeDifference :timeValue="timeValuePlan" :work="1"></TimeDifference> <DateRange :timeValue="timeValuePlan">
</DateRange>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem label> <FormItem label>
<span style="float:left">实际起止日期:&nbsp;</span> <span style="float:left">实际起止日期:&nbsp;</span>
<TimeDifference :timeValue="timeValue" :work="1"></TimeDifference> <DateRange :timeValue="timeValue"></DateRange>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
......
...@@ -181,13 +181,12 @@ export default { ...@@ -181,13 +181,12 @@ export default {
high: true, high: true,
width: 200, width: 200,
render: (h, params) => { render: (h, params) => {
return h('TimeDifference', { return h('DateRange', {
props: { props: {
timeValue: { timeValue: {
startDate: params.row.plansToStartDate, startDate: params.row.plansToStartDate,
endDate: params.row.plansToEndTime, endDate: params.row.plansToEndTime,
}, }
work: 0
} }
}) })
} }
...@@ -199,13 +198,12 @@ export default { ...@@ -199,13 +198,12 @@ export default {
high: true, high: true,
width: 200, width: 200,
render: (h, params) => { render: (h, params) => {
return h('TimeDifference', { return h('DateRange', {
props: { props: {
timeValue: { timeValue: {
startDate: params.row.startDate, startDate: params.row.startDate,
endDate: params.row.endDate, endDate: params.row.endDate,
}, }
work: 1
} }
}) })
} }
......
...@@ -76,7 +76,7 @@ import InputCode from '@/components/page/inputCode.vue' ...@@ -76,7 +76,7 @@ import InputCode from '@/components/page/inputCode.vue'
import Pictrue from '@/components/page/pictrue.vue' import Pictrue from '@/components/page/pictrue.vue'
import WordTree from '@/components/page/wordTree.vue' import WordTree from '@/components/page/wordTree.vue'
import Actions from '@/components/page/actions.vue' import Actions from '@/components/page/actions.vue'
import DateDRange from '@/components/page/dateRange.vue' import DateRange from '@/components/page/dateRange.vue'
import FilesViewer from '@/components/page/filesViewer.vue' import FilesViewer from '@/components/page/filesViewer.vue'
...@@ -158,7 +158,7 @@ Vue.component("InputCode", InputCode) ...@@ -158,7 +158,7 @@ Vue.component("InputCode", InputCode)
Vue.component("Pictrue", Pictrue) Vue.component("Pictrue", Pictrue)
Vue.component("WordTree", WordTree) Vue.component("WordTree", WordTree)
Vue.component("Actions", Actions) Vue.component("Actions", Actions)
Vue.component("DateDRange", DateDRange) Vue.component("DateRange", DateRange)
Vue.component("Life", Life) Vue.component("Life", Life)
Vue.component("FilesViewer",FilesViewer) Vue.component("FilesViewer",FilesViewer)
......
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