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

assets/css/base.less

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

assets/css/iview-reset.less

@@ -23,6 +23,9 @@
   background-color: @primary-color;
   border-color: @primary-color;
 }
+.ivu-drawer-wrap,.tree-drawer{
+  z-index: 12000;
+}
 
 .ivu-btn-group:not(.ivu-btn-group-vertical) .ivu-btn-primary:first-child:not(:last-child) {
   border-right-color: @primary-color;

components/page/treeGrid/dataGrid.vue

@@ -51,7 +51,7 @@
             <Button @click="complexSearch" type="primary" style="margin-left: 10px">查询</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" class-name="tree-drawer">
         <div slot="header">
             列设置
             <a @click="undoConfig" class="ml50">

libs/henq.js

@@ -132,7 +132,7 @@ henq.toTree = (list, rootId, format, parentFiledName) => {
 
   function toTree(data, parentId, level) {
     let parents = data.filter(u => {
-      if(u[upId]=='')
+      if(u[upId]==='')
       {
         u[upId]=null
       }

pages/project/plan/api.js

@@ -26,6 +26,9 @@ export default {
       }
     });
   },
+  batch(ids) {
+    return Api.post(`${material}/projectplan/batchdelete`,ids);
+  },
   ///projecttemplate/list
   templates(params){
     return Api.post(`${material}/projecttemplate/list`,params)

pages/project/plan/index.vue

 <template>
 <div>
     <Card>
-        <EditGrid :columns="columns" ref="grid" :batch="true" :items="list" :level="8" :drag="true" :exportTitle="exportTl">
+        <EditGrid :columns="columns" ref="grid" :batch="true" :items="list" :level="8" :drag="true" :exportTitle="exportTl" @on-selection-change="batchChange">
             <template slot="easySearch">
                 <Form ref="formInline" :model="easySearch" inline>
                     <FormItem prop="keys"><Input placeholder="请输入关键字标题" v-model="easySearch.keys.value" />
@@ -30,6 +30,9 @@
                     </DropdownMenu>
                 </Dropdown>
             </template>
+            <template slot="batch">
+                <Button type="primary" @click="bacthRemove()">批量删除</Button>
+            </template>
         </EditGrid>
     </Card>
     <Submenus :show="showStatu" :data="tempItems" :params="params"></Submenus>
@@ -70,6 +73,7 @@ export default {
     data() {
         return {
             entity: {},
+            batchItems:[],
             row: {},
             action: Api.index,
             easySearch: {
@@ -88,13 +92,15 @@ export default {
                     key: "drag",
                     type: "drag",
                     width: 50,
-                    align: 'center'
+                    align: 'center',
+                     title: '移动',
                 },
                 {
                     key: "upId",
                     width: 50,
                     type: "selection",
-                    align: 'center'
+                    align: 'center',
+                     title: '选择',
                 },
                 {
                     key: "upTitle",
@@ -466,6 +472,21 @@ export default {
                 }
             ];
         },
+        batchChange(items,list){
+            this.batchItems=items;
+        },
+        bacthRemove(){
+            var ids=this.batchItems.map(u=>{
+                return u.id;
+            })
+            if(ids.length>0){
+                Api.batch(ids).then(r=>{
+                    if(r.success){
+                        this.search();
+                    }
+                })
+            }
+        },
         //批量导入start
         //导入功能
         openModalIm() {