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

components/page/opration.vue

@@ -81,17 +81,18 @@ export default {
     },
     methods: {
         handler() {
-
-            if (this.oprate == "delete" || this.oprate == "remove") {
-                this.$Modal.confirm({
-                    title: this.title,
-                    content: "<p>" + this.msg + "</p>",
-                    onOk: () => {
-                        this.$emit("click", event);
-                    }
-                });
-            } else {
-                this.$emit("click", event);
+            if (this.disable == 0) {
+                if (this.oprate == "delete" || this.oprate == "remove") {
+                    this.$Modal.confirm({
+                        title: this.title,
+                        content: "<p>" + this.msg + "</p>",
+                        onOk: () => {
+                            this.$emit("click", event);
+                        }
+                    });
+                } else {
+                    this.$emit("click", event);
+                }
             }
         }
     },

pages/project/record/index.vue

@@ -88,6 +88,19 @@ export default {
                         );
                     },
                 },
+                {
+                    key: "creatorUserId",
+                    title: this.l("creatorUserId"),
+                    align: "left",
+                    high: true,
+                    type: 'user'
+                },
+                {
+                    key: "creationTime",
+                    title: this.l("creationTime"),
+                    align: "left",
+                    high: true,
+                },
                 {
                     title: '操作',
                     key: 'action',

pages/project/task/add.vue

@@ -15,6 +15,11 @@
             <UserSelect ref="userSelected" v-model="entity.userId" />
         </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>
+        </Col>
         <Col :span="24">
         <FormItem :label="l('note')" prop="note">
             <i-quill v-model="entity.note" :height="300" v-paste="handleImg" />
@@ -40,29 +45,16 @@ export default {
         return {
             disabled: false,
             entity: {
-                creationTime: null,
-                creatorUserId: null,
-                lastModificationTime: null,
-                lastModifierUserId: null,
-                isDeleted: null,
-                deletionTime: null,
-                deleterUserId: null,
                 title: "",
-                planId: null,
-                projectId: null,
+                planId: '',
+                projectId: '',
                 level: null,
                 status: null,
-                projectTitle: "",
-                planTitle: "",
                 userIds: "",
                 userId: "",
-                endDate: null,
                 note: "",
-                startDate: null,
-                plansToStartDate: null,
-                plansToEndTime: null,
-                completePercentage: null,
-                upTaskId: null
+                planstartdate: null,
+                planenddate: null,
             },
             rules: {
                 name: [{
@@ -124,6 +116,10 @@ export default {
                 this.entity.id = 0;
             });
         },
+        changeFormat(val) {
+            this.entity.planstartdate = val[0];
+            this.entity.planenddate = val[1];
+        },
         handleImg(e) {
             console.warn(e)
             let file = null

pages/project/task/detail.vue

 <template>
 <div class="detail" style="width:100%">
     <Row style="height:284px">
-        <Filed :span="6" :name="l('creationTime')">{{entity.creationTime}}</Filed>
-        <Filed :span="6" :name="l('creatorUserId')">
-            <User :value="entity.creatorUserId"></User>
-        </Filed>
         <Filed :span="6" :name="l('title')">{{entity.title}}</Filed>
         <Filed :span="6" :name="l('level')">
             <state code="project.task.level" :value="entity.level" type="text"></state>
@@ -12,14 +8,25 @@
         <Filed :span="6" :name="l('status')">
             <state code="project.task.status" :value="entity.status" type="text"></state>
         </Filed>
-        <Filed :span="6" :name="l('userId')">{{entity.userId}}</Filed>
-        <Filed :span="6" :name="l('endDate')">{{entity.endDate}}</Filed>
-        <Filed :span="6" :name="l('startDate')">{{entity.startDate}}</Filed>
+        <Filed :span="6" :name="l('userId')">
+            <User :value="parseInt(entity.userId)"></User>
+        </Filed>
+        <Filed :span="12" name="计划起止日期">
+            <TimeDifference :timeValue="timeValuePlan" :work="1"></TimeDifference>
+        </Filed>
+        <Filed :span="12" name="实际起止日期">
+            <TimeDifference :timeValue="timeValue" :work="1"></TimeDifference>
+        </Filed>
+
         <Filed :span="24" :name="l('note')">
             <div style="height:200px" v-html="entity.note" class="tex_in10"></div>
         </Filed>
+        <Filed :span="6" :name="l('creationTime')">{{entity.creationTime}}</Filed>
+        <Filed :span="6" :name="l('creatorUserId')">
+            <User :value="entity.creatorUserId"></User>
+        </Filed>
     </Row>
-    <component :is="detail" :eid="curId" />
+    <component :is="detail" :eid="curId" v-if="false" />
 </div>
 </template>
 
@@ -30,6 +37,14 @@ export default {
     data() {
         return {
             entity: {},
+            timeValue: {
+                startDate: "",
+                endDate: "",
+            },
+            timeValuePlan: {
+                planStartDate: "",
+                planEndDate: "",
+            },
             rules: {
                 name: [{
                     required: true,
@@ -60,9 +75,17 @@ export default {
                 id: v
             }).then(r => {
                 this.entity = r.result;
-                this.$emit('on-load')
-                this.curId = v
-                this.detail = () => import('../record/index1')
+                this.timeValue = {
+                        startDate: r.result.startDate,
+                        endDate: r.result.endDate,
+                    },
+                    this.timeValuePlan = {
+                        planStartDate: r.result.planStartDate,
+                        planEndDate: r.result.planEndDate,
+                    },
+                    this.$emit('on-load')
+                // this.curId = v
+                //this.detail = () => import('../record/index1')
             })
 
         },