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

assets/css/base.less

@@ -21,7 +21,9 @@ ul,
 li {
   list-style: none;
 }
-
+.ivu-drawer-wrap{
+  z-index: 12000;
+}
 div::-webkit-scrollbar {
   width: 10px;
   height: 10px;

assets/css/iview-reset.less

@@ -18,7 +18,6 @@
   box-sizing: border-box;
   -webkit-tap-highlight-color: transparent;
 }
-
 .ivu-btn-primary {
   color: #fff;
   background-color: @primary-color;

components/page/treeGrid/EditGrid.vue

 <template>
-<div class="table-content1">
+  <div class="table-content1">
     <div class="table-tools">
       <div class="table-search">
         <slot name="easySearch"></slot>
       </div>
       <div class="btns">
         <slot name="buttons"></slot>
-            <!-- <Button @click="config=!config">
+        <Button @click="config = !config">
           <Icon type="md-build" class="table-set" size="14" title="列设置" />
-        </Button>-->
+        </Button>
       </div>
     </div>
     <div class="table-main" ref="main">
@@ -16,60 +16,132 @@
         <table class="table-head">
           <thead>
             <tr>
-                        <th v-for="(column, index) in columns" :key="index" :style="tdStyle(column)">
+              <th
+                v-for="(column, index) in columns"
+                :key="index"
+                :style="tdStyle(column)"
+              >
                 <label v-if="column.type === 'selection'">
-                                <Checkbox v-model="checkAll" @on-change="checked" :indeterminate="indeterminate"></Checkbox>
+                  <Checkbox
+                    v-model="checkAll"
+                    @on-change="allChecked"
+                    :indeterminate="indeterminate"
+                  ></Checkbox>
                 </label>
                 <label v-else>
                   {{ renderHeader(column, index) }}
                   <span class="ivu-table-sort" v-if="column.sortable">
-                                    <Icon type="arrow-up-b" :class="{ on: column._sortType === 'asc' }" @click.native="handleSort(index, 'asc')" />
-                                    <Icon type="arrow-down-b" :class="{ on: column._sortType === 'desc' }" @click.native="handleSort(index, 'desc')" />
+                    <Icon
+                      type="arrow-up-b"
+                      :class="{ on: column._sortType === 'asc' }"
+                      @click.native="handleSort(index, 'asc')"
+                    />
+                    <Icon
+                      type="arrow-down-b"
+                      :class="{ on: column._sortType === 'desc' }"
+                      @click.native="handleSort(index, 'desc')"
+                    />
                   </span>
                 </label>
               </th>
             </tr>
           </thead>
           <tbody>
-                    <tr v-for="(item, index) in trs" :key="item.id" class="treetr" :id="'tr' + index" v-show="show(item)" :draggable="drag && !item._drag" @dragstart="dragstart($event, index, item)" @drop="dragdrop($event, index, item)" @dragenter="dragenter($event, index, item)" @dragover="dragover($event, index, item)" @dragleave="dragleave($event, index, item)">
+            <tr
+              v-for="(item, index) in trs"
+              :key="item.id"
+              class="treetr"
+              :id="'tr' + index"
+              v-show="show(item)"
+              :draggable="drag && !item._drag"
+              @dragstart="dragstart($event, index, item)"
+              @drop="dragdrop($event, index, item)"
+              @dragenter="dragenter($event, index, item)"
+              @dragover="dragover($event, index, item)"
+              @dragleave="dragleave($event, index, item)"
+            >
               <!--  -->
-                        <td v-for="(column, snum) in columns" :key="column.key" :style="tdStyle(column)">
+              <td
+                v-for="(column, snum) in columns"
+                :key="column.key"
+                :style="tdStyle(column)"
+              >
                 <!-- 多选 -->
-                            <label v-if="column.type === 'selection'" @click="rowChecked(item, index, $event)">
-                                <Checkbox v-model="item._checked" :indeterminate="item._indeterminate"></Checkbox>
+                <label
+                  v-if="column.type === 'selection'"
+                  @click="rowChecked(item, index, $event)"
+                >
+                  <Checkbox
+                    v-model="item._checked"
+                    :indeterminate="item._indeterminate"
+                  ></Checkbox>
+                  {{ item._checked }}
                 </label>
 
-                            <Icon v-if="column.type === 'drag'" type="md-more" class="drag" />
-                            <DTSpan v-if="column.type == 'date'" :value="item[column.key]" />
+                <Icon
+                  v-if="column.type === 'drag'"
+                  type="md-more"
+                  class="drag"
+                />
+                <DTSpan
+                  v-if="column.type == 'date'"
+                  :value="item[column.key]"
+                />
                 <div v-if="column.type == 'user'">
                   <User :value="item[column.key]" />
                 </div>
-                            <div v-if="
+                <div
+                  v-if="
                     column.type == 'users' &&
                     item[column.key] &&
                     item[column.key].length > 0
-                  ">
-                                <User v-for="li in item[column.key]" :value="li" :key="li" class="ml10" />
+                  "
+                >
+                  <User
+                    v-for="li in item[column.key]"
+                    :value="li"
+                    :key="li"
+                    class="ml10"
+                  />
                 </div>
-                            <state v-if="column.code" :code="column.code" :value="item[column.key]" />
+                <state
+                  v-if="column.code"
+                  :code="column.code"
+                  :value="item[column.key]"
+                />
                 <!-- 树图标 -->
                 <span @click="toggle(index, item)" v-if="snum == treeColumn()">
                   <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>
+                    <Icon
+                      :type="!item._expanded ? 'ios-add' : 'ios-remove'"
+                    /> </a
+                  ><i v-else class="ms-tree-space"></i>
                 </span>
                 <!-- 菜单名称、排序、请求地址 -->
-                            <label v-if="
+                <label
+                  v-if="
                     !column.type &&
                     !column.code &&
                     !column.render &&
                     !column.slot
-                  ">
+                  "
+                >
                   {{ renderBody(item, column) }}
                 </label>
-                            <table-expand v-if="column.render && !column.type && !column.solt" :row="item" :column="column" :index="snum" :render="column.render"></table-expand>
-                            <column-slot v-if="column.slot" :row="item" :column="column" :index="snum"></column-slot>
+                <table-expand
+                  v-if="column.render && !column.type && !column.solt"
+                  :row="item"
+                  :column="column"
+                  :index="snum"
+                  :render="column.render"
+                ></table-expand>
+                <column-slot
+                  v-if="column.slot"
+                  :row="item"
+                  :column="column"
+                  :index="snum"
+                ></column-slot>
               </td>
             </tr>
           </tbody>
@@ -79,16 +151,43 @@
 
     <div class="table-footer">
       <slot name="footer"></slot>
-        <Page v-if="page" :total="search.total" :current="search.page" class="fr" show-total size="small" show-elevator show-sizer :page-size="search.pageSize" :page-size-opts="pageSizeOpts" @on-change="pageChange" @on-page-size-change="pageSizeChange" />
+      <Page
+        v-if="page"
+        :total="search.total"
+        :current="search.page"
+        class="fr"
+        show-total
+        size="small"
+        show-elevator
+        show-sizer
+        :page-size="search.pageSize"
+        :page-size-opts="pageSizeOpts"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+      />
     </div>
-    <Modal v-if="high" v-model="modalSearch" title="高级搜索" draggable width="800" ref="search">
+    <Modal
+      v-if="high"
+      v-model="modalSearch"
+      title="高级搜索"
+      draggable
+      width="800"
+      ref="search"
+    >
       <slot name="searchForm"></slot>
       <div slot="footer">
         <Button @click="modalSearch = false" class="mr20">取消</Button>
         <Button @click="complexSearch" type="primary" class="mr20">查询</Button>
       </div>
     </Modal>
-    <Drawer title="列设置" v-if="set" v-model="config" :scrollable="true" placement="left" :mask="false">
+    <Drawer
+      title="列设置"
+      v-if="set"
+      v-model="config"
+      :scrollable="true"
+      placement="left"
+      :mask="false"
+    >
       <div slot="header">
         列设置
         <a @click="undoConfig" class="ml50">
@@ -96,9 +195,17 @@
         </a>
       </div>
       <ul class="table-columns">
-            <li v-for="(li, index) in columnsCur" :key="index" v-dragging="{ item: li, list: columnsCur, group: 'li' }">
+        <li
+          v-for="(li, index) in columnsCur"
+          :key="index"
+          v-dragging="{ item: li, list: columnsCur, group: 'li' }"
+        >
           <label @click="columnChange(li, index)" :class="{ dis: li.hide }">
-                    <Icon :type="li.hide ? 'md-eye-off' : 'md-eye'" size="16" class="mr10" />
+            <Icon
+              :type="li.hide ? 'md-eye-off' : 'md-eye'"
+              size="16"
+              class="mr10"
+            />
             <span>{{ li.title }}</span>
           </label>
           <Icon type="ios-move" class="move" size="18" />
@@ -106,11 +213,11 @@
       </ul>
     </Drawer>
     <FooterToolbar v-if="batch" v-show="footerToolbar" class="ftball">
-        <div class="tip">已选{{ selectItems.length }}项</div>
+      <div class="ib">已选{{ selectItems.length }}项</div>
       <slot name="batch"></slot>
       <Button @click="cancelBatch">取消</Button>
     </FooterToolbar>
-</div>
+  </div>
 </template>
 
 <script>
@@ -120,7 +227,7 @@ export default {
   name: "treeGrid",
   components: {
     TableExpand,
-        ColumnSlot
+    ColumnSlot,
   },
   props: {
     mode: {
@@ -199,14 +306,14 @@ export default {
     items: {
       //接收树形数据
       type: Array,
-            default () {
+      default() {
         return [];
       },
     },
     data: {
       //接收UpId型数据
       type: Array,
-            default () {
+      default() {
         return [];
       },
     },
@@ -308,12 +415,6 @@ export default {
     items() {
       if (this.items) {
         this.trs = this.treeToList(this.items);
-                this.checkGroup = this.renderCheck(this.items);
-                if (this.checkGroup.length == this.dataLength) {
-                    this.checks = true;
-                } else {
-                    this.checks = false;
-                }
       }
     },
     data(v) {},
@@ -323,24 +424,15 @@ export default {
       },
       deep: true,
     },
-        checkGroup(data) {
-            this.checkAllGroupChange(data);
-        },
     exportTitle(v) {
-            this.exportTitle = v
-        }
+      this.exportTitle = v;
+    },
   },
   mounted() {
     this.getAllUser(); //获取所有用户
     if (this.items && this.items.length > 0) {
       this.trs = this.treeToList(this.items);
       this.columnsCur = this.makeColumns();
-            this.checkGroup = this.renderCheck(this.items);
-            if (this.checkGroup.length == this.dataLength) {
-                this.checks = true;
-            } else {
-                this.checks = false;
-            }
     }
   },
   methods: {
@@ -519,7 +611,11 @@ export default {
     },
     // 点击check勾选框,判断是否有children节点 如果有就一并勾选
     rowChecked(data, index, event) {
+      //   this.$set(this.trs, index, data);
       var boys = this.getChildrens(data);
+      if(boys.length){
+          
+      }
       this.trs.forEach((u, i) => {
         var items = boys.filter((b) => {
           return b[this.keyname] == u[this.keyname];
@@ -533,12 +629,14 @@ export default {
         this.trs.filter((u) => {
           return !u._checked;
         }).length;
+      this.$nextTick(() => {
+        this.selectionChange();
+      });
     },
     getChildrens(data) {
       var childrens = [];
       var that = this;
       getChildren(data);
-
       function getChildren(f) {
         that.trs.forEach((u) => {
           if (u[that.upname] == f[that.keyname]) {
@@ -550,11 +648,22 @@ export default {
       return childrens;
     },
     // checkbox 全选 选择事件
-        checked(v) {
+    allChecked(v) {
       this.trs.forEach((u, i) => {
         this.$set(this.trs[i], "_checked", v);
       });
-            // this.$emit('on-selection-change', this.checkGroup)
+      this.$nextTick(() => {
+        this.selectionChange();
+      });
+    },
+    selectionChange() {
+      var items = this.trs.filter((u) => {
+        return u._checked === true;
+      });
+      this.selectItems = items;
+      this.$emit("on-selection-change", items, this.trs);
+      this.footerToolbar = items.length > 0;
+      console.log("footerToolbar", items, this.trs);
     },
     // 数组去重
     getArray(a) {
@@ -569,14 +678,6 @@ export default {
       }
       return result;
     },
-        checkAllGroupChange(data) {
-            if (this.dataLength > 0 && data.length === this.dataLength) {
-                this.checks = true;
-            } else {
-                this.checks = false;
-            }
-            this.$emit("on-selection-change", this.checkGroup);
-        },
     All(data) {
       let arr = [];
       data.forEach((item) => {
@@ -625,19 +726,6 @@ export default {
     renderBody(row, column, index) {
       return row[column.key];
     },
-        // 默认选中
-        renderCheck(data) {
-            let arr = [];
-            data.forEach((item) => {
-                if (item._checked) {
-                    arr.push(item.id);
-                }
-                if (item.children && item.children.length > 0) {
-                    arr = arr.concat(this.renderCheck(item.children));
-                }
-            });
-            return arr;
-        },
     //分页选择
     pageChange(page) {
       this.search.page = page;
@@ -654,11 +742,7 @@ export default {
       this.$set(this.columnsCur, item, i);
       this.saveUserconfig();
     },
-        selectionChange(items) {
-            this.$emit("on-selection-change", items);
-            this.selectItems = items;
-            this.footerToolbar = items.length > 0;
-        },
+
     onSelect(rows, row) {
       this.$emit("on-change", rows, row);
     },
@@ -673,12 +757,10 @@ export default {
     //批量取消
     cancelBatch() {
       this.footerToolbar = false;
-            this.$refs.table.selectAll(false);
+      // this.$refs.table.selectAll(false);
     },
     //导出excel
     export2Excel() {
-            //col
-            //list
       //当前显示数据
       let list = [];
       list = this.trs;
@@ -728,8 +810,10 @@ export default {
       });
       list.forEach((e) => {
         tempCol.forEach((elem) => {
-
-                    if ((e[elem.key] && e[elem.key] != "" && e[elem.key] != null) || e[elem.key] == 0) {
+          if (
+            (e[elem.key] && e[elem.key] != "" && e[elem.key] != null) ||
+            e[elem.key] == 0
+          ) {
             //如果数据字典项对应的DirName字段存在，通过name查询到对应的code，然后赋值。
             let codeArr = [];
             let keyValue = e[elem.key];
@@ -786,25 +870,30 @@ export default {
         //导出username相关信息
         tempColUser.forEach((eluser) => {
           if (Array.isArray(e[eluser.key]) && e[eluser.key].length > 0) {
-                        let temUsers = this.$u.clone(e[eluser.key])
-                        let temUserName = ''
-                        temUsers.forEach(u => {
+            let temUsers = this.$u.clone(e[eluser.key]);
+            let temUserName = "";
+            temUsers.forEach((u) => {
               temUserName = temUserName + this.getUserName(u);
-                        })
-                        e[eluser.key] = temUserName
+            });
+            e[eluser.key] = temUserName;
           }
-                    if (e[eluser.key] && typeof (e[eluser.key]) == 'string' && e[eluser.key] != "" && e[eluser.key] != null) {
+          if (
+            e[eluser.key] &&
+            typeof e[eluser.key] == "string" &&
+            e[eluser.key] != "" &&
+            e[eluser.key] != null
+          ) {
             e[eluser.key] = this.getUserName(e[eluser.key]);
           }
         });
         tempColUsers.forEach((elusers) => {
           if (e[elusers.key].length > 0) {
-                        let temUsers = this.$u.clone(e[elusers.key])
-                        let temUserName = ''
-                        temUsers.forEach(u => {
-                            temUserName = temUserName + this.getUserName(u) + ',';
-                        })
-                        e[elusers.key] = temUserName.substr(0, temUserName.length - 1)
+            let temUsers = this.$u.clone(e[elusers.key]);
+            let temUserName = "";
+            temUsers.forEach((u) => {
+              temUserName = temUserName + this.getUserName(u) + ",";
+            });
+            e[elusers.key] = temUserName.substr(0, temUserName.length - 1);
           }
         });
       });
@@ -819,8 +908,7 @@ export default {
           filterVal,
           list
         );
-            })
-
+      });
     },
     //获取所有用户信息
     getAllUser() {
@@ -863,7 +951,6 @@ export default {
 @table_line_height: 50px;
 @table_hover: #f2f8fe;
 @table_border: #e8e9eb;
-
 // @table_theme: #2680eb;
 // @table_head: #e9f2fd;
 // @table_line_height: 50px;

pages/project/plan/index.vue

 <template>
 <div>
     <Card>
-        <EditGrid :columns="columns" ref="grid" :items="list" :level="8" :drag="true" :exportTitle="exportTl">
+        <EditGrid :columns="columns" ref="grid" :batch="true" :items="list" :level="8" :drag="true" :exportTitle="exportTl">
             <template slot="easySearch">
                 <Form ref="formInline" :model="easySearch" inline>
                     <FormItem prop="keys"><Input placeholder="请输入关键字标题" v-model="easySearch.keys.value" />