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

npm-shrinkwrap.json

@@ -4938,7 +4938,7 @@
       "dependencies": {
         "commander": {
           "version": "2.14.1",
-          "resolved": "http://r.cnpmjs.org/commander/download/commander-2.14.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
           "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
         }
       }
@@ -5467,7 +5467,7 @@
     },
     "crc-32": {
       "version": "1.2.0",
-      "resolved": "http://r.cnpmjs.org/crc-32/download/crc-32-1.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz",
       "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
       "requires": {
         "exit-on-epipe": "~1.0.1",
@@ -7364,7 +7364,7 @@
     },
     "exit-on-epipe": {
       "version": "1.0.1",
-      "resolved": "http://r.cnpmjs.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
       "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
     },
     "expand-brackets": {
@@ -8015,7 +8015,7 @@
     },
     "frac": {
       "version": "1.1.2",
-      "resolved": "http://r.cnpmjs.org/frac/download/frac-1.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz",
       "integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
     },
     "fragment-cache": {
@@ -15087,7 +15087,7 @@
     },
     "printj": {
       "version": "1.1.2",
-      "resolved": "http://r.cnpmjs.org/printj/download/printj-1.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/printj/download/printj-1.1.2.tgz",
       "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
     },
     "private": {
@@ -20540,7 +20540,7 @@
     },
     "script-loader": {
       "version": "0.7.2",
-      "resolved": "http://r.cnpmjs.org/script-loader/download/script-loader-0.7.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/script-loader/download/script-loader-0.7.2.tgz",
       "integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=",
       "dev": true,
       "requires": {
@@ -21128,7 +21128,7 @@
     },
     "ssf": {
       "version": "0.10.3",
-      "resolved": "http://r.cnpmjs.org/ssf/download/ssf-0.10.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
       "integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
       "requires": {
         "frac": "~1.1.2"
@@ -23778,7 +23778,7 @@
     },
     "wmf": {
       "version": "1.0.2",
-      "resolved": "http://r.cnpmjs.org/wmf/download/wmf-1.0.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
       "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
     },
     "word-wrap": {
@@ -23933,7 +23933,7 @@
     },
     "xlsx": {
       "version": "0.15.6",
-      "resolved": "http://r.cnpmjs.org/xlsx/download/xlsx-0.15.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1597272342311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz",
       "integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
       "requires": {
         "adler-32": "~1.2.0",
@@ -23948,7 +23948,7 @@
       "dependencies": {
         "commander": {
           "version": "2.17.1",
-          "resolved": "http://r.cnpmjs.org/commander/download/commander-2.17.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
           "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
         }
       }

pages/project/groupUser/api.js

@@ -23,7 +23,8 @@ export default {
         return Api.post(`${material}/projectgroupuser/batchdelete`, params);
     },
     groundPaged(params) {
-        return Api.post(`${material}/projectgroup/paged`, params);
+        // return Api.post(`${material}/projectgroup/paged`, params);
+        return Api.post(`${material}/projectgroup/list`, params);
     },
     importTeam(params) { //批量添加
         return Api.post(`${material}/projectgroupuser/createbatch`, params);

pages/project/groupUser/index1.vue

@@ -289,17 +289,11 @@ export default {
         });
       }
     },
-    groundTeam() {
-      let data = {
-        conditions: [],
-        isDesc: true,
-        pageIndex: 1,
-        pageSize: 20,
-        sortBy: "id",
-      };
+     groundTeam() {
+      let data = { conditions: []  };
       Api.groundPaged(data).then((r) => {
         if (r.success) {
-          this.teams = r.result.items;
+          this.teams = r.result;
         }
       });
     },

pages/project/groupUser/list.vue

@@ -426,16 +426,10 @@ export default {
       this.modalFormk = false;
     },
     groundTeam() {
-      let data = {
-        conditions: [],
-        isDesc: true,
-        pageIndex: 1,
-        pageSize: 20,
-        sortBy: "id",
-      };
+      let data = { conditions: []};
       Api.groundPaged(data).then((r) => {
         if (r.success) {
-          this.teams = r.result.items;
+          this.teams = r.result;
         }
       });
     },

pages/project/log/api.js

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

pages/project/log/list.vue

@@ -4,7 +4,7 @@
       <Form ref="formInline" :model="easySearch" inline>
         <FormItem>
           <div class="taskMenu">
-            <Menu mode="horizontal" active-name="1" @on-select="onSelectTime">
+            <Menu mode="horizontal" active-name="0" @on-select="onSelectTime">
               <MenuItem name="0"> 所有 </MenuItem>
               <MenuItem name="1"> 今天 </MenuItem>
               <MenuItem name="2"> 昨天 </MenuItem>
@@ -75,7 +75,7 @@
                 >
                   <p class="TimelineItemli">
                     <!-- <span class="timeSpan">{{ item.creationTime }}</span> -->
-                    <DTSpan class="timeSpan" :value="item.creationTime" />
+                    <DTSpan class="timeSpan" :value="item.creationTime " />
                     <User :value="item.creatorUserId" />
 
                     <state code="mes.project_log.Action" :value="item.action" />
@@ -373,10 +373,6 @@ export default {
             conditionalType: "Equal",
           },
         ],
-        isDesc: true,
-        pageIndex: 1,
-        pageSize: 20,
-        sortBy: "id",
       };
       if (this.startTime && this.endTime) {
         params.conditions.push({
@@ -392,9 +388,9 @@ export default {
           fieldValue: this.users,
         });
       }
-      Api.paged(params).then((r) => {
+      Api.listall(params).then((r) => {
         if (r.success) {
-          this.recordList = r.result.items;
+          this.recordList = r.result;
         //   this.recordList.forEach((e) => {
         //     e.creationTime = e.creationTime.slice(11, 16);
         //   });
@@ -545,7 +541,7 @@ export default {
   watch: {
     eid(v) {
       if (v != "" && v != null) {
-        this.load(v);
+        this.load();
       }
     },
   },

pages/project/task/add.vue

@@ -12,7 +12,7 @@
         </Col>
         <Col :span="12">
         <FormItem :label="l('userId')" prop="userId">
-            <UserGroup ref="userSelected" v-model="entity.userId" :projectId="eid" />
+            <UserGroup v-model="entity.userId" :projectId="eid" />
         </FormItem>
         </Col>
         <Col :span="12">

pages/project/task/edit.vue

@@ -12,7 +12,7 @@
         </Col>
         <Col :span="12">
         <FormItem :label="l('userId')" prop="userId">
-            <UserGroup ref="userSelected" v-model="entity.userId" :projectId="entity.projectId" />
+            <UserGroup v-model="entity.userId" :projectId="entity.projectId" />
         </FormItem>
         </Col>
         <Col :span="12">

pages/project/task/index.vue

@@ -190,7 +190,7 @@ export default {
                             props: {
                                 value: params.row,
                                 start: "plansToStartDate",
-                                start: "plansToEndTime",
+                                end: "plansToEndTime",
                             }
                         })
                     }