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

components/page/dataGrid.vue

@@ -386,7 +386,7 @@ export default {
     //     }
     //   });
        this.columnsCur = items;
-      console.log("cur", items,this.columnsCur);
+      // console.log("cur", items,this.columnsCur);
     },
     //数据加载
     load() {

components/page/userGroup.vue

@@ -43,13 +43,13 @@ export default {
     methods: {
         load() {
             var params = {
-                // codition:[{fieldName: "groupId", fieldValue: "b9d6fa9e-e033-4a3e-9925-c1f4437d970c", conditionalType: "Equal"}]
-                codition: [{
+                conditions: [{
                     fieldName: "projectId",
                     fieldValue: this.projectId,
                     conditionalType: "Equal"
                 }]
             }
+            //
             this.$api.post(`${material}/projectgroupuser/list`, params).then(r => {
                 this.users = r.result;
             })
@@ -66,12 +66,9 @@ export default {
         // 加载人员
     },
     watch: {
-        value: {
-            handler(v, o) {
-                this.name = v;
-            },
-            deep: true,
-        },
+        projectId(v){
+            this.load();
+        }
     },
 };
 </script>

pages/project/groupUser/list.vue

@@ -12,12 +12,12 @@
           </FormItem>
         </Form>
       </Col>
-       <Col span="2" v-if="groupUsers.length>0">
+       <Col span="4" v-if="groupUsers.length>0">
         <label>可导入人员：{{ groupUsers.length }}</label>
         <Button type="primary" @click="importBtn">导入</Button>
       </Col>
-      <Col span="1" offset="17">
-        <Button type="primary" @click="clickTeams">保存</Button>
+      <Col span="1" offset="17" class="ar">
+        <Button  icon="md-construct" @click="clickTeams">存为团队</Button>
       </Col>
       <Modal v-model="modalFormk" :title="title" width="1200" footer-hide>
         <Form ref="modalForm" :model="modalForm"  :rules="rules" :label-width="90"  >

pages/project/task/index.vue

@@ -8,7 +8,7 @@
             <Icon type="ios-arrow-forward" size="24" />
         </a>
     </div>
-    <Content class="content" :class="!showMenu?'con_bord':''">
+    <Content class="content" :class="!showMenu?'con_bord':''" >
         <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :lazy="true">
             <template slot="easySearch">
                 <Form ref="formInline" inline>