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

components/page/projectTaskTree.vue

@@ -66,7 +66,6 @@ export default {
   props: {
     curId: {
       type: String,
-      default: "",
     },
   },
   created() {
@@ -93,9 +92,18 @@ export default {
       this.$api.post(`${material}/projectmain/list`, data).then((r) => {
         if (r.result) {
           this.projectList = r.result;
+          if (this.curId) {
+            this.projectList.map(u=>{
+              if(u.id==this.curId){
+                this.downName = u.title;
+              }
+            })
+          } else {
             this.downName = this.projectList[0].title;
             this.curdId = this.projectList[0].id;
-          this.loadTree(this.projectList[0].id);
+            
+          }
+          this.loadTree(this.curId);
         }
       });
     },
@@ -221,17 +229,15 @@ export default {
 </script>
 
 <style lang="less">
-.tree-menu{
-border: 1px solid #ddd;
-.p-list {
+.tree-menu {
+  border: 1px solid #ddd;
+  .p-list {
     position: relative;
-  
-}
-.icon-d {
+  }
+  .icon-d {
     position: absolute;
     top: 0;
     right: 0;
+  }
 }
-}
-
 </style>

components/page/treeGrid/EditGrid.vue

@@ -104,9 +104,7 @@
               <span class="ib" v-width="spaceWidth * item._level"></span>
               <a v-if="item._count > 0" class="expand"
                 ><Icon :type="!item._expanded ? 'ios-add' : 'ios-remove'" /> </a
-              ><i v-else class="ms-tree-space"></i> {{ item._level }}v{{
-                item._count
-              }}:{{ show(item) }}
+              ><i v-else class="ms-tree-space"></i>
             </span>
             <!-- 菜单名称、排序、请求地址 -->
             <label

components/page/user.vue

 <template>
   <Poptip placement="bottom-start" trigger="hover" width="240" transfer>
     <label v-if="mode=='text'" :class="css">{{ user.name }}</label>
-    <Avatar v-else  :style="{background:user.gender=='男'?'#1479D7':'red'}"
-        :icon="user.gender=='男'?'md-person':'md-woman'" shape="square" :src="img">{{user.name}}</Avatar>
+    <Avatar v-else  :style="{background:user.gender=='男'?'#1479D7':'#f56a00'}"
+         :src="img">{{user.name}}</Avatar>
     <div slot="content">
       <Avatar v-if="user.face" size="large" :src="img"></Avatar>
       <Avatar

components/page/userGroup.vue

@@ -17,12 +17,9 @@
         :disabled="item.status == 0"
       >
         <div class="user">
-          <State
-            code="project.group.authority"
-            :value="item.authority"
-            class="mr10"
-            type="tag"
-          />
+          <Icon v-if="item.authority==1" type="md-person" size="18" color="gold"/>
+          <Icon v-if="item.authority==2" type="md-person" size="18" color="green"/>
+          <Icon v-if="item.authority==0" type="md-person" size="18" />
           {{ item.note }}
           <State
             code="project.group.role"

pages/project/project/api.js

@@ -4,6 +4,9 @@ export default {
     paged(params){
     return Api.post(`${material}/projectmain/paged`,params);
     },
+    users(params){
+        return Api.post(`${material}/projectgroupuser/list`,params);
+        },
     get(params){
     return Api.get(`${material}/projectmain/get`,params);
     },

pages/project/project/detail.vue

 <template>
-<div class=".detail-document">
+  <div class=".detail-document">
     <div class="top-title">
       <div class="new-detail row-left">
         <Row>
@@ -9,46 +9,44 @@
           </Filed>
           <!-- <Filed :span="12" :name="l('phase')">{{ entity.phase }}</Filed> -->
           <Filed :span="12" :name="l('date') + '：'">
-                    <DateRange v-model="entity"/>
+            <DateRange v-model="entity" />
           </Filed>
-              <Filed :span="24" :name="l('users')+ '：'">
-                  <User :value="1" mode="face"/>
-                  <a><Avatar icon="md-add" size="24" /></a>
+          <Filed :span="24" :name="l('users') + '：'">
+            <User v-for="(u,i) in users" :value="u.userId" :key="u.userId" mode="text" class="mr10" />
+            <a @click="group"><Avatar icon="md-add"  /></a>
           </Filed>
         </Row>
       </div>
       <ul>
         <li>
-                <a @click="details">
-                    <Icon type="ios-log-in" />详情
-                </a>
-                &nbsp;
+          <a @click="details"> <Icon type="md-apps" size="18" />详情 </a>
           <span>|</span>
         </li>
         <li>
           <a @click="template">
-                    <Icon type="ios-photos" />目录
+            <Icon
+              type="md-git-network"
+              style="transform: rotate(180deg)"
+              size="18"
+            />
+            目录
           </a>
           &nbsp;
           <span>|</span>
         </li>
         <li>
-                <a @click="task">
-                    <Icon type="md-create" />任务
-                </a>
+          <a @click="task"> <Icon type="ios-list-box" size="18" />任务 </a>
           &nbsp;
           <span>|</span>
         </li>
         <li>
-                <a @click="group">
-                    <Icon type="md-create" />成员
-                </a>
+          <a @click="group"> <Icon type="ios-people" size="18" />成员 </a>
           &nbsp;
           <span>|</span>
         </li>
         <li>
           <a @click="log">
-                    <Icon type="md-create" />动态
+            <Icon type="md-notifications-outline" size="18" />动态
           </a>
           &nbsp;
           <span>|</span>
@@ -62,7 +60,7 @@
             
         </keep-alive> -->
     </div>
-</div>
+  </div>
 </template>
 
 <script>
@@ -77,17 +75,22 @@ export default {
       curId: this.eid,
       avatorPath: "",
       entity: {},
+      users:[],
       rules: {
-                name: [{
+        name: [
+          {
             required: true,
             message: "必填",
-                    trigger: "blur"
-                }],
-                code: [{
+            trigger: "blur",
+          },
+        ],
+        code: [
+          {
             required: true,
             message: "必填",
-                    trigger: "blur"
-                }],
+            trigger: "blur",
+          },
+        ],
       },
       fileds: [],
       parms: {
@@ -108,11 +111,12 @@ export default {
   methods: {
     load(v) {
       Api.get({
-                id: v
+        id: v,
       }).then((r) => {
         this.entity = r.result;
         // this.$emit("on-load");
       });
+      this.loadUsers();
     },
 
     details() {
@@ -148,6 +152,22 @@ export default {
       key = "project_main" + "." + key;
       return this.$t(key);
     },
+    loadUsers() {
+      let params = {
+        conditions: [
+          {
+            fieldName: "projectId",
+            fieldValue: this.eid,
+            conditionalType: "Equal",
+          },
+        ],
+      };
+      Api.users(params).then((r) => {
+        if (r.success) {
+          this.users = r.result;
+        }
+      });
+    },
   },
   watch: {
     eid(v) {
@@ -169,6 +189,7 @@ export default {
 
   .row-left {
     width: 1100px;
+    padding-bottom: 10px;
   }
 
   ul {

pages/project/task/index.vue

@@ -14,21 +14,21 @@
                 <Form ref="formInline" inline>
                     <FormItem>
                         <div class="taskMenu">
-                            <Menu mode="horizontal" active-name="2" @on-select="onSelect">
+                            <Menu mode="horizontal" active-name="1" @on-select="onSelect">
                                 <MenuItem name="1">
                                 所有
                                 </MenuItem>
                                 <MenuItem name="2">
-                                未关闭
+                                待确认
                                 </MenuItem>
                                 <MenuItem name="3">
-                                指派给我
+                                工作中
                                 </MenuItem>
                                 <MenuItem name="4">
-                                由我参与
+                                已完成
                                 </MenuItem>
                                 <MenuItem name="5">
-                                已延期
+                                已冻结
                                 </MenuItem>
                                 <!--
                                 <Submenu name="6">