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

components/page/userGroup.vue

 <template>
-  <div>
-    <Select
-      :placeholder="placeholder"
-      v-model="name"
-      @on-change="change"
-      :multiple="multiple"
-      clearable
-      filterable
-      transfer
-    >
-      <Option
-        v-for="item in users"
-        :value="item.userId"
-        :key="item.userId"
-        :label="item.note"
-        :disabled="item.status==0"
-      >
+<div>
+    <Select :placeholder="placeholder" v-model="name" @on-change="change" :multiple="multiple" clearable filterable transfer>
+        <Option v-for="item in users" :value="item.userId" :key="item.userId" :label="item.note" :disabled="item.status==0">
             <div class="user">
-        <State code="project.group.authority" :value="item.authority" class="mr10" type="tag"/> {{item.note}} 
-        <State code="project.group.role" :value="item.role" class="mr10" type="tag"/>
+                <State code="project.group.authority" :value="item.authority" class="mr10" type="tag" /> {{item.note}}
+                <State code="project.group.role" :value="item.role" class="mr10" type="tag" />
             </div>
         </Option>
     </Select>
-  </div>
+</div>
 </template>
 
 <script>
@@ -46,22 +32,26 @@ export default {
             type: String,
             default: "请选择人员",
         },
-    multiple:{
-      type:Boolean,
-      default:false,
+        multiple: {
+            type: Boolean,
+            default: false,
         },
-    projectId:{
-      type:String
+        projectId: {
+            type: String
         }
     },
     methods: {
         load() {
-      var params={
+            var params = {
                 // codition:[{fieldName: "groupId", fieldValue: "b9d6fa9e-e033-4a3e-9925-c1f4437d970c", conditionalType: "Equal"}]
-        codition:[{fieldName: "projectId", fieldValue: this.projectId, conditionalType: "Equal"}]
+                codition: [{
+                    fieldName: "projectId",
+                    fieldValue: this.projectId,
+                    conditionalType: "Equal"
+                }]
             }
-      this.$api.post(`${material}/projectgroupuser/list`, params).then(r=>{
-        this.users=r.result;
+            this.$api.post(`${material}/projectgroupuser/list`, params).then(r => {
+                this.users = r.result;
             })
         },
         change(event) {
@@ -75,12 +65,19 @@ export default {
         },
         // 加载人员
     },
+    watch: {
+        value: {
+            handler(v, o) {
+                this.name = v;
+            },
+            deep: true,
+        },
+    },
 };
 </script>
 
 <style lang="less">
 @import "../../assets/css/custom.less";
 
-.userGroup {
-}
+.userGroup {}
 </style>

pages/project/log/list.vue

@@ -12,17 +12,6 @@
               <MenuItem name="4"> 上周 </MenuItem>
               <MenuItem name="5"> 本月 </MenuItem>
               <MenuItem name="6"> 上月 </MenuItem>
-              <!-- <Submenu name="7">
-                <template slot="title"> 按用户查看 </template>
-                <MenuGroup title="按用户查看">
-                  <MenuItem
-                    v-for="(v, index) in list"
-                    :key="index"
-                    :name="v.userId"
-                    >{{ v.note }}</MenuItem
-                  >
-                </MenuGroup>
-              </Submenu> -->
             </Menu>
             <Dropdown @on-click="onSelectUser">
               <a href="javascript:void(0)">
@@ -85,7 +74,8 @@
                   v-if="recordList && recordList.length > 0"
                 >
                   <p class="TimelineItemli">
-                    <span class="timeSpan">{{ item.creationTime }}</span>
+                    <!-- <span class="timeSpan">{{ item.creationTime }}</span> -->
+                    <DTSpan class="timeSpan" :value="item.creationTime" />
                     <User :value="item.creatorUserId" />
 
                     <state code="mes.project_log.Action" :value="item.action" />
@@ -405,9 +395,9 @@ export default {
       Api.paged(params).then((r) => {
         if (r.success) {
           this.recordList = r.result.items;
-          this.recordList.forEach((e) => {
-            e.creationTime = e.creationTime.slice(11, 16);
-          });
+        //   this.recordList.forEach((e) => {
+        //     e.creationTime = e.creationTime.slice(11, 16);
+        //   });
         }
       });
     },
@@ -605,7 +595,7 @@ export default {
     position: relative;
     .timeSpan {
       position: absolute;
-      left: -98px;
+      left: -109px;
     }
   }
 }