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

pages/project/record/add.vue

@@ -12,13 +12,12 @@
         </Col>
         <Col :span="24">
         <FormItem :label="l('note')" prop="note">
-            <i-quill v-model="entity.note" :height="300" v-paste="handleImg" /></Input>
+            <i-quill v-model="entity.note" :height="300" v-paste="handleImg" />
         </FormItem>
         </Col>
         <Col :span="12">
         <FormItem :label="l('attachment')" prop="attachment">
             <files ref="refFile" :parms="parms" files />
-            </Input>
         </FormItem>
         </Col>
     </Row>

pages/project/record/edit.vue

@@ -12,13 +12,12 @@
         </Col>
         <Col :span="24">
         <FormItem :label="l('note')" prop="note">
-            <i-quill v-model="entity.note" :height="300" v-paste="handleImg" /></Input>
+            <i-quill v-model="entity.note" :height="300" v-paste="handleImg" />
         </FormItem>
         </Col>
         <Col :span="12">
         <FormItem :label="l('attachment')" prop="attachment">
             <files ref="refFile" :parms="parms" files />
-            </Input>
         </FormItem>
         </Col>
     </Row>

pages/project/record/index.vue

@@ -98,7 +98,7 @@ export default {
                 {
                     key: "creationTime",
                     title: this.l("creationTime"),
-                    align: "left",
+                    align: "center",
                     high: true,
                 },
                 {

pages/project/task/add.vue

@@ -12,12 +12,12 @@
         </Col>
         <Col :span="12">
         <FormItem :label="l('userId')" prop="userId">
-            <UserSelect ref="userSelected" v-model="entity.userId" />
+            <UserGroup ref="userSelected" v-model="entity.userId" :projectId="eid" />
         </FormItem>
         </Col>
         <Col :span="12">
-        <FormItem label="计划起止日期" prop="date">
-            <DatePicker type="datetimerange" format="yyyy-MM-dd" v-model="date" placeholder="请选择时间范围" @on-change="changeFormat" style="width: 300px"></DatePicker>
+        <FormItem label="计划日期" prop="date">
+            <DatePicker type="datetimerange" format="yyyy-MM-dd" placeholder="请选择时间范围" @on-change="changeFormat" style="width: 300px"></DatePicker>
         </FormItem>
         </Col>
         <Col :span="24">

pages/project/task/edit.vue

@@ -12,13 +12,14 @@
         </Col>
         <Col :span="12">
         <FormItem :label="l('userId')" prop="userId">
-            <UserSelect ref="userSelected" v-model="entity.userId" /></Input>
+            <UserGroup ref="userSelected" v-model="entity.userId" :projectId="eid" />
+
         </FormItem>
         </Col>
 
         <Col :span="24">
         <FormItem :label="l('note')" prop="note">
-            <i-quill v-model="entity.note" :height="300" v-paste="handleImg" /></Input>
+            <i-quill v-model="entity.note" :height="300" v-paste="handleImg" />
         </FormItem>
         </Col>
     </Row>