分卡原因

pages/project/record/add.vue

@@ -8,16 +8,12 @@
         </FormItem>
         </Col>
         <Col :span="12">
-        <FormItem :label="l('status')" prop="status">
-            <Dictionary code="mes.project_plan_record.Status" v-model="entity.status"></Dictionary>
-        </FormItem>
-        </Col>
-        <Col :span="12">
         <FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input>
         </FormItem>
         </Col>
-        <Col :span="12">
-        <FormItem :label="l('note')" prop="note"> <Input v-model="entity.note"> </Input>
+        <Col :span="24">
+        <FormItem :label="l('note')" prop="note">
+            <i-quill v-model="entity.note" :height="300" v-paste="handleImg" /></Input>
         </FormItem>
         </Col>
         <Col :span="12">
@@ -34,8 +30,12 @@
 
 <script>
 import Api from './api'
+import iQuill from '@/components/quill'
 export default {
     name: 'Add',
+    components: {
+        iQuill
+    },
     data() {
         return {
             disabled: false,
@@ -107,6 +107,27 @@ export default {
                 this.entity.id = 0;
             });
         },
+        handleImg(e) {
+            console.warn(e)
+            let file = null
+            if (
+                e.clipboardData &&
+                e.clipboardData.items[0] &&
+                e.clipboardData.items[0].type &&
+                e.clipboardData.items[0].type.indexOf('image') > -1
+            ) {
+                //这里就是判断是否有粘贴进来的文件且文件为图片格式
+                file = e.clipboardData.items[0].getAsFile()
+                let reader = new FileReader()
+                reader.readAsDataURL(file)
+                setTimeout(() => {
+                    var img = '<img src="' + reader.result + '" alt=""/>'
+                    this.entity.note += img
+                }, 1000)
+
+                // new R
+            }
+        },
         l(key) {
             key = "project_plan_record" + "." + key;
             return this.$t(key)

pages/project/task/add.vue

@@ -5,71 +5,19 @@
         <FormItem :label="l('title')" prop="title"> <Input v-model="entity.title"> </Input>
         </FormItem>
         </Col>
-
         <Col :span="12">
         <FormItem :label="l('level')" prop="level">
             <Dictionary code="project.task.level" v-model="entity.level"></Dictionary>
         </FormItem>
         </Col>
         <Col :span="12">
-        <FormItem :label="l('projectTitle')" prop="projectTitle"> <Input v-model="entity.projectTitle"> </Input>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('planTitle')" prop="planTitle"> <Input v-model="entity.planTitle"> </Input>
-        </FormItem>
-        </Col>
-        <Col :span="12" v-if="false">
-        <FormItem :label="l('planId')" prop="planId">
-            <Input v-model="entity.planId"></Input>
-        </FormItem>
-        </Col>
-        <Col :span="12" v-if="false">
-        <FormItem :label="l('projectId')" prop="projectId">
-            <Input v-model="entity.projectId"></Input>
-        </FormItem>
-        </Col>
-        <Col :span="12">
         <FormItem :label="l('userId')" prop="userId">
-            <UserSelect ref="userSelected" v-model="entity.userId" /></Input>
+            <UserSelect ref="userSelected" v-model="entity.userId" />
         </FormItem>
         </Col>
         <Col :span="24">
-        <FormItem :label="l('userIds')" prop="userIds"> <Input v-model="entity.userIds" type="textarea" :rows="5"></Input>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('startDate')" prop="startDate">
-            <DatePicker type="date" v-model="entity.startDate"></DatePicker>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('endDate')" prop="endDate">
-            <DatePicker type="date" v-model="entity.endDate"></DatePicker>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('plansToStartDate')" prop="plansToStartDate">
-            <DatePicker type="date" v-model="entity.plansToStartDate"></DatePicker>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('plansToEndTime')" prop="plansToEndTime">
-            <DatePicker type="date" v-model="entity.plansToEndTime"></DatePicker>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('completePercentage')" prop="completePercentage">
-            <InputNumber v-model="entity.completePercentage"></InputNumber>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('note')" prop="note"> <Input v-model="entity.note"> </Input>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('upTaskId')" prop="upTaskId">
-            <InputNumber v-model="entity.upTaskId"></InputNumber>
+        <FormItem :label="l('note')" prop="note">
+            <i-quill v-model="entity.note" :height="300" v-paste="handleImg" />
         </FormItem>
         </Col>
     </Row>
@@ -82,8 +30,12 @@
 
 <script>
 import Api from './api'
+import iQuill from '@/components/quill'
 export default {
     name: 'Add',
+    components: {
+        iQuill
+    },
     data() {
         return {
             disabled: false,
@@ -169,6 +121,27 @@ export default {
                 this.entity.id = 0;
             });
         },
+        handleImg(e) {
+            console.warn(e)
+            let file = null
+            if (
+                e.clipboardData &&
+                e.clipboardData.items[0] &&
+                e.clipboardData.items[0].type &&
+                e.clipboardData.items[0].type.indexOf('image') > -1
+            ) {
+                //这里就是判断是否有粘贴进来的文件且文件为图片格式
+                file = e.clipboardData.items[0].getAsFile()
+                let reader = new FileReader()
+                reader.readAsDataURL(file)
+                setTimeout(() => {
+                    var img = '<img src="' + reader.result + '" alt=""/>'
+                    this.entity.note += img
+                }, 1000)
+
+                // new R
+            }
+        },
         l(key) {
             key = "project_task" + "." + key;
             return this.$t(key)

pages/project/task/detail.vue

@@ -10,15 +10,12 @@
         <Filed :span="6" :name="l('status')">{{entity.status}}</Filed>
         <Filed :span="6" :name="l('projectTitle')">{{entity.projectTitle}}</Filed>
         <Filed :span="6" :name="l('planTitle')">{{entity.planTitle}}</Filed>
-        <Filed :span="6" :name="l('userIds')">{{entity.userIds}}</Filed>
         <Filed :span="6" :name="l('userId')">{{entity.userId}}</Filed>
-        <Filed :span="6" :name="l('endDate')">{{entity.endDate}}</Filed>
-        <Filed :span="6" :name="l('note')">{{entity.note}}</Filed>
         <Filed :span="6" :name="l('startDate')">{{entity.startDate}}</Filed>
-        <Filed :span="6" :name="l('plansToStartDate')">{{entity.plansToStartDate}}</Filed>
-        <Filed :span="6" :name="l('plansToEndTime')">{{entity.plansToEndTime}}</Filed>
-        <Filed :span="6" :name="l('completePercentage')">{{entity.completePercentage}}</Filed>
-        <Filed :span="6" :name="l('upTaskId')">{{entity.upTaskId}}</Filed>
+        <Filed :span="6" :name="l('endDate')">{{entity.endDate}}</Filed>
+        <Filed :span="12">&nbsp;</Filed>
+        <Filed :span="24" :name="l('note')">{{entity.note}}</Filed>
+
     </Row>
     <component :is="detail" :eid="curId" />
 </div>

pages/project/task/edit.vue

@@ -85,6 +85,9 @@
 </template>
 
 <script>
+import {
+    replace
+} from 'lodash';
 import Api from './api'
 export default {
     name: 'Edit',
@@ -121,6 +124,7 @@ export default {
                 id: v
             }).then(r => {
                 this.entity = r.result;
+                this.entity.userId = parseInt(r.result.userId)
             })
         },
         handleSubmit() {

pages/project/task/index.vue

@@ -188,26 +188,6 @@ export default {
                     high: true,
                     type: 'date'
                 },
-                {
-                    key: "plansToStartDate",
-                    title: this.l("plansToStartDate"),
-                    align: "center",
-                    high: true,
-                    type: 'date'
-                },
-                {
-                    key: "plansToEndTime",
-                    title: this.l("plansToEndTime"),
-                    align: "center",
-                    high: true,
-                    type: 'date'
-                },
-                {
-                    key: "completePercentage",
-                    title: this.l("completePercentage"),
-                    align: "left",
-                    high: true
-                },
                 {
                     key: "note",
                     title: this.l("note"),