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

components/page/filesView.vue

+<template>
+  <div class="files-view">
+    <Tag v-for="(item, index) in nameList" :key="index" :name="item.id">
+      <a @click="downFile(item)" target="_blank">{{ item.fileName }}</a>
+    </Tag>
+    <Modal
+      v-model="modal"
+      title="查看"
+      width="800"
+      footer-hide
+      :mask-closable="false"
+    >
+      <div class="img">
+        <img :src="avatorPath" width="100%" height="100%" />
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+export default {
+  name: "",
+  data() {
+    return {
+      downUrl: fileUrlDown,
+      avatorPath: "",
+      nameList: [],
+      modal: false,
+    };
+  },
+  props: {
+    parms: {
+      type: [String, Object],
+      default: "",
+    },
+  },
+
+  mounted() {
+    if (this.parms.eid) {
+      this.filesList();
+    }
+  },
+  methods: {
+    filesList() {
+      //查询上传到文件服务器上的文件
+      this.$http.sysUser.getFile(this.parms).then((res) => {
+        if (res.data != [] && res.data.length > 0) {
+          var items = [];
+          res.data.forEach((data) => {
+            let objImag = {};
+            objImag.fileName = data.fileName;
+            objImag.filePath = data.downloadPath;
+            objImag.id = data.id;
+            objImag.fileType = data.fileType;
+            items.push(objImag);
+          });
+          this.nameList = items;
+        }
+      });
+    },
+    downFile(item) {
+      console.log(item);
+      if (
+        item.fileType == "jpg" ||
+        item.fileType == "gif" ||
+        item.fileType == "png"
+      ) {
+        this.avatorPath = this.downUrl + item.filePath;
+        this.modal = true;
+      } else {
+        window.open(this.downUrl + item.filePath, "_blank");
+      }
+    },
+  },
+  watch: {
+    "parms.eid"(v) {
+      if (v) {
+        this.filesList();
+      }
+    },
+  },
+};
+</script>
+<style lang="less">
+.files-view {
+}
+</style>

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,9 @@ export default {
     status: '状态',
     groupName: '项目组名称',
     groupId: '项目组Id',
+    authority:'权限',
+    whour:'可用工日',
+    whourpd:'可用工时/天',
+    joindate:'加入日期'
   }
 }

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>
@@ -125,7 +125,7 @@ export default {
         }
     },
     mounted() {
-        console.log(this);
+        //.log(this);
     },
     async fetch({
         store,

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"
+                }],
             }
         }
     },

pages/project/groupUser/index.vue

@@ -186,7 +186,7 @@ export default {
         }
     },
     mounted() {
-        console.log(this);
+        //console.log(this);
     },
     async fetch({
         store,

pages/project/project/detail.vue

@@ -53,7 +53,6 @@ export default {
       detail: null,
       curId: this.eid,
       avatorPath: "",
-      downUrl: fileUrlDown,
       entity: {},
       rules: {
         name: [{ required: true, message: "必填", trigger: "blur" }],

pages/project/project/details.vue

@@ -47,7 +47,6 @@ export default {
   data() {
     return {
       avatorPath: "",
-      downUrl: fileUrlDown,
       entity: this.row,
       parms: {
         app: "material",

pages/project/project/index.vue

@@ -123,6 +123,15 @@
     >
       <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
     </Modal>
+    <Modal
+      v-model="modal1"
+      title="查看附件"
+      width="800"
+      footer-hide
+      :mask-closable="false"
+    >
+      <FilesView ref="refFile" :parms="parms" class="files-detail" />
+    </Modal>
   </div>
 </template>
 <script>
@@ -235,21 +244,21 @@ export default {
             );
           },
         },
-        // {
-        //   key: "attachment",
-        //   title: this.l("attachment"),
-        //   align: "center",
-        //   high: true,
-        //   render: (h, params) => {
-        //     return h(
-        //       "a",
-        //       {
-        //         on: { click: () => this.view(params.row.id) },
-        //       },
-        //       "查看附件"
-        //     );
-        //   },
-        // },
+        {
+          key: "attachment",
+          title: this.l("attachment"),
+          align: "center",
+          high: true,
+          render: (h, params) => {
+            return h(
+              "a",
+              {
+                on: { click: () => this.viewFiles(params.row) },
+              },
+              "查看附件"
+            );
+          },
+        },
         // {
         //   key: "phase",
         //   title: this.l("phase"),
@@ -285,12 +294,7 @@ export default {
             );
           },
         },
-        // {
-        //   key: "businessUnits",
-        //   title: this.l("businessUnits"),
-        //   align: "left",
-        //   high: true,
-        // },
+
         {
           key: "creationTime",
           title: this.l("creationTime"),
@@ -304,6 +308,13 @@ export default {
           high: true,
           type: "user",
         },
+        {
+          key: "note",
+          title: this.l("note"),
+          align: "left",
+          high: true,
+          tooltip: true,
+        },
         {
           title: "操作",
           key: "action",
@@ -343,10 +354,17 @@ export default {
       typeInfo: "table",
       iconInfo: "md-list",
       titleInfo: "列表模式",
+      parms: {
+        app: "material",
+        eid: null,
+        name: "",
+        field: "",
+      },
+      modal1: false,
     };
   },
   mounted() {
-    console.log(this);
+    this.parms.eid = this.$u.guid();
   },
   async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
@@ -388,6 +406,12 @@ export default {
       console.log(row);
       window.open(fileUrlDown + row.picture, "_blank");
     },
+    viewFiles(row) {
+      console.log(row);
+      this.parms.eid = row.attachment;
+
+      this.modal1 = true;
+    },
     ok() {
       this.$refs.grid.load();
       this.modal = false;
@@ -538,4 +562,7 @@ export default {
     }
   }
 }
+.files-detail {
+  min-height: 300px;
+}
 </style>
\ No newline at end of file

plugins/iview.js

@@ -51,6 +51,8 @@ import NewInputFile from '@/components/page/newInputFile.vue'
 import imgUploadFile from '@/components/page/imgUploadFile.vue'
 import files from '@/components/page/files.vue'
 import FilesList from '@/components/page/filesList.vue'
+import FilesView from '@/components/page/filesView.vue'
+
 import DataGrid from '@/components/page/dataGrid.vue'
 import TreeGrid from '@/components/page/treeGrid/index.vue'
 import EditGrid from '@/components/page/treeGrid/editGrid.vue'
@@ -113,6 +115,7 @@ Vue.component("imgUploadFile", imgUploadFile)
 Vue.component("InputIcon", InputIcon)
 Vue.component("files", files)
 Vue.component("FilesList", FilesList)
+Vue.component("FilesView", FilesView)
 Vue.component("DataGrid", DataGrid)
 Vue.component("TreeGrid", TreeGrid)
 Vue.component("EditGrid", EditGrid)