groupUser

components/page/userSelect.vue

@@ -39,7 +39,7 @@
         </div>
     </div>
 
-    <Select v-else :placeholder="placeholder" v-model="name" @on-change="change" :multiple="multiple" :departmentId="departmentId" clearable filterable>
+    <Select v-else :placeholder="placeholder" v-model="name" @on-change="change" :multiple="multiple" :departmentId="departmentId" clearable filterable transfer>
         <Option v-for="item in datas ? datas : dic" :value="item.value" :key="item.value" :label="item.label">
             <div>
                 {{ item.label }}

i18n/locale/zh-CN.js

@@ -1911,5 +1911,8 @@ export default {
     status: '状态',
     groupName: '项目组名称',
     groupId: '项目组Id',
+    authority:'权限',
+    wHour:'可用工日',
+    wHourPD:'可用工时/天'
   }
 }

pages/project/group/add.vue

@@ -97,7 +97,7 @@ export default {
             this.entity = this.$u.clone(this.v)
         },
         eid(v) {
-            if (v != '') {
+            if (v != '' && v != null) {
                 this.load(v);
             }
         }

pages/project/group/index.vue

 <template>
-<div class="full">
+<div>
     <DataGrid :columns="columns" ref="grid" :action="action"><template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>
                 <FormItem prop="keys"><Input placeholder="请输入关键字名称" v-model="easySearch.keys.value" /> </FormItem>

pages/project/groupUser/add.vue

@@ -8,30 +8,16 @@
         </Col>
         <Col :span="12">
         <FormItem :label="l('role')" prop="role">
-            <Dictionary code="mes.project_group_user.Role" v-model="entity.role"></Dictionary>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('projectId')" prop="projectId">
-            <InputNumber v-model="entity.projectId"></InputNumber>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('planId')" prop="planId">
-            <InputNumber v-model="entity.planId"></InputNumber>
-        </FormItem>
-        </Col>
-        <Col :span="12">
-        <FormItem :label="l('note')" prop="note"> <Input v-model="entity.note"> </Input>
+            <Dictionary code="project.group.role" v-model="entity.role"></Dictionary>
         </FormItem>
         </Col>
         <Col :span="12">
         <FormItem :label="l('status')" prop="status">
-            <Dictionary code="mes.project_group_user.Status" v-model="entity.status"></Dictionary>
+            <Dictionary code="project.group.status" v-model="entity.status"></Dictionary>
         </FormItem>
         </Col>
         <Col :span="12">
-        <FormItem :label="l('groupName')" prop="groupName"> <Input v-model="entity.groupName"> </Input>
+        <FormItem :label="l('note')" prop="note"> <Input v-model="entity.note"> </Input>
         </FormItem>
         </Col>
         <Col :span="12">
@@ -130,7 +116,7 @@ export default {
             this.entity = this.$u.clone(this.v)
         },
         eid(v) {
-            if (v > 0) {
+            if (v != '' && v != null) {
                 this.load(v);
             }
         }

pages/project/groupUser/edit.vue

@@ -3,7 +3,7 @@
     <Row>
         <Col :span="12">
         <FormItem :label="l('userId')" prop="userId">
-            <InputNumber v-model="entity.userId"></InputNumber>
+            <UserSelect ref="userSelected" v-model="entity.userId" />
         </FormItem>
         </Col>
         <Col :span="12">
@@ -12,14 +12,14 @@
         </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('status')" prop="status">
             <Dictionary code="project.group.status" v-model="entity.status"></Dictionary>
         </FormItem>
         </Col>
+        <Col :span="24">
+        <FormItem :label="l('note')" prop="note"> <Input v-model="entity.note"> </Input>
+        </FormItem>
+        </Col>
     </Row>
     <FormItem>
         <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
@@ -41,7 +41,19 @@ export default {
                     required: true,
                     message: '必填',
                     trigger: 'blur'
-                }]
+                }],
+                userId: [{
+                    required: true,
+                    message: "请选择人员",
+                    trigger: "change",
+                    type: "number"
+                }],
+                role: [{
+                    required: true,
+                    message: "请选择角色",
+                    trigger: "change",
+                    type: "number"
+                }],
             }
         }
     },