日期范围选择和显示

components/page/dateRange.vue

@@ -128,17 +128,18 @@ export default {
 <style lang="less">
 .time-view {
   display: inline-block;
-  .jian-tou {
-    min-width: 55px;
+  span{size: 12px}
+  span.jian-tou {
+    min-width:60px;
     text-align: center;
-    padding: 0 5px 2px 5px;
+    display: inline-block;
     background-image: url("../../assets/imgicon/range.png");
     background-size: 100%;
     background-repeat: no-repeat;
-    background-position: bottom right;
+    background-position: 100% 80%;
     // border-bottom: #eee 2px solid;
     size: 12px;
-    font-weight: bold;
+    color: orange;
   }
 }
 </style>

pages/project/plan/edit.vue

-<template>
+    <template>
   <Form ref="form" :model="entity" :rules="rules" :label-width="90">
     <Row>
       <!-- <Col :span="12"
@@ -51,6 +51,23 @@
         ><FormItem :label="l('upId')" prop="upId">
           <Input v-model="entity.upId"></Input> </FormItem
       ></Col> -->
+      <Col :span="12"
+        ><FormItem :label="l('type')" prop="type">
+          <Dictionary
+            code="mes.project_plan.Type"
+            v-model="entity.type"
+            type="radio"
+          ></Dictionary> </FormItem
+      ></Col>
+      <Col :span="12"
+        ><FormItem :label="l('direction')" prop="direction">
+          <Dictionary
+            code="mes.project_plan.direction"
+            v-model="entity.direction"
+            type="radio"
+          ></Dictionary> </FormItem
+      ></Col>
+
       <Col :span="24"
         ><FormItem :label="l('title')" prop="title">
           <Input v-model="entity.title"> </Input> </FormItem
@@ -73,32 +90,34 @@
       ></Col>
       <Col :span="12"
         ><FormItem :label="l('startDate')" prop="startDate">
-          <DatePicker
-            type="date"
-            v-model="entity.startDate"
-          ></DatePicker> </FormItem
+          <DateRange v-model="entity" edit></DateRange> </FormItem
       ></Col>
-      <Col :span="12"
+      <!-- <Col :span="12"
         ><FormItem :label="l('endDate')" prop="endDate">
           <DatePicker
             type="date"
             v-model="entity.endDate"
           ></DatePicker> </FormItem
-      ></Col>
+      ></Col> -->
+
       <Col :span="12"
-        ><FormItem :label="l('type')" prop="type">
+        ><FormItem :label="l('executor')" prop="executor">
+          <UserGroup
+            v-model="entity.executor"
+            multiple
+            :projectId="v.projectId"
+          ></UserGroup>
+        </FormItem>
+      </Col>
+      <Col :span="12"
+        ><FormItem :label="l('deliverable')" prop="deliverable">
           <Dictionary
-            code="mes.project_plan.Type"
-            v-model="entity.type"
+            code="mes.project_plan.deliverable"
+            v-model="entity.deliverable"
             type="radio"
-          ></Dictionary> </FormItem
-      ></Col>
-      <Col :span="12"
-        ><FormItem :label="l('executor')" prop="executor">
-          <UserGroup v-model="entity.executor" multiple :projectId="entity.projectId"></UserGroup>
+          ></Dictionary>
         </FormItem>
-        </Col
-      >
+      </Col>
       <Col :span="24"
         ><FormItem :label="l('attachment')" prop="attachment">
           <files

pages/project/plan/index.vue

@@ -86,6 +86,7 @@ export default {
           key: "direction",
           title: this.l("direction"),
           align: "center",
+          code: "mes.project_plan.direction",
           width:80,
           easy: true,
           high: true,
@@ -137,6 +138,7 @@ export default {
           {
           key: "deliverable",
           title: this.l("deliverable"),
+            code: "mes.project_plan.deliverable",
           width:80,
           align: "center",
           easy: true,