import

components/page/dataGrid.vue

@@ -21,10 +21,7 @@
         </div>
         <div class="btns">
             <slot name="buttons"></slot>
-            <Button @click="openImportModal">
-                导入
-            </Button>
-            <Button @click="export2Excel">
+            <Button @click="export2Excel" v-if="exportTitle.length>0">
                 导出
             </Button>
             <Button v-if="set&&type=='table'" @click="config=!config">
@@ -70,9 +67,7 @@
             </li>
         </ul>
     </Drawer>
-    <Modal v-model="ImportModal" title="导入" fullscreen footer-hide>
-        <ImportExcel v-if="ImportModal" @on-get-data="getData" :columns="columnsNow" />
-    </Modal>
+
     <FooterToolbar v-if="batch" v-show="footerToolbar">
         <div class="tip">已选{{selectItems.length}}项</div>
         <slot name="batch"></slot>
@@ -105,7 +100,6 @@ export default {
             userConfig: null, //用户页面配置信息。,
             // userId: 1
             userId: this.$store.state.userInfo.userId,
-            ImportModal: false,
         };
     },
     props: {
@@ -222,9 +216,9 @@ export default {
             type: Number,
             default: 40,
         },
-        title: {
+        exportTitle: {
             type: String,
-            default: "导出数据",
+            default: "",
         }
     },
     created() {
@@ -476,17 +470,7 @@ export default {
             this.footerToolbar = false;
             this.$refs.table.selectAll(false);
         },
-        //导入功能
-        openImportModal() {
-            this.ImportModal = true
-        },
-        getData(val) {
-            // alert(JSON.stringify(val))
-            this.$emit("on-import-data", val)
-        },
-        closeImport() {
-            this.ImportModal = false
-        },
+
         //导出excel
         export2Excel() {
             //当前显示数据
@@ -531,7 +515,7 @@ export default {
                 var tempCol = [];
                 var columnsCur = this.$u.clone(this.columnsNow); //导出列标题信息griddata  this.$refs.grid.columnsCur
                 columnsCur.forEach((el) => {
-                    if ((el.hide && !el.import) || (!el.hide && el.key != "action" && el.type != "selection")) {
+                    if ((el.hide && !el.import) || (!el.hide && el.key != "action" && el.type != "selection" && el.key != "ico")) {
                         if (el.code) {
                             tempCol.push({
                                 key: el.key,
@@ -553,7 +537,7 @@ export default {
                 });
                 let nowDate = this.$u.getNowTime(); //年月日时分秒yyyyMMddhhmmss
                 //获取导出数据结束
-                this.$u.outExcel(this.title +
+                this.$u.outExcel(this.exportTitle +
                     "(" + nowDate + ")",
                     tHeader,
                     filterVal,
@@ -561,7 +545,6 @@ export default {
                 );
             });
         },
-        //导入excel
     },
     computed: {
         columnsNow() {

components/page/import/process.vue

 <template>
-<div class="table-content">
+<Modal v-model="ImportModal" title="导入" fullscreen footer-hide @on-cancel="cancelModal">
+    <div class="table-content">
+
         <div class="table-tools">
             <div class="table-search">
                 <Form inline>
@@ -55,7 +57,8 @@
                 <Button type="primary" @click="importOk" v-show="imBtn">确定导入</Button>
             </div>
         </Modal>
-</div>
+    </div>
+</Modal>
 </template>
 
 <script>
@@ -93,6 +96,8 @@ export default {
             titleInfo: '',
             noDataText: '暂无数据',
             imBtn: true,
+            columnsIm: this.columns,
+            ImportModal: this.open
         };
     },
     props: {
@@ -109,6 +114,10 @@ export default {
             type: Array,
             default: [],
         },
+        open: {
+            type: Boolean,
+            default: false
+        }
     },
     created() {
         this.tdHeightExcel = window.innerHeight - 180;
@@ -143,7 +152,7 @@ export default {
                 title: '序号'
             })
             tempCol.forEach((ele, index) => {
-                if (ele.key == "action" || ele.type == "selection") {
+                if (ele.key == "action" || ele.type == "selection" || ele.key == "ico") {
                     ele.hide = true;
                 }
             });
@@ -298,7 +307,7 @@ export default {
         openInfoModal() {
             if ((this.excelType == '0' && this.excelData.length > 0) || (this.excelType == '1' && this.$refs.comExcel.excelData.length > 0)) {
                 this.imBtn = true;
-                this.loadColum(this.columns);
+                this.loadColum(this.columnsIm);
                 this.titleInfo = "批量导入";
                 this.infoModal = true
             } else {
@@ -339,6 +348,9 @@ export default {
                 this.btnIm = false
             }
         },
+        cancelModal() {
+            this.$emit('on-cancel')
+        },
         l(key) {
             key = "user" + "." + key;
             return this.$t(key);
@@ -352,7 +364,11 @@ export default {
                 }
             });
             this.colsIm = this.$u.clone(this.columns);
+            this.columnsIm = this.$u.clone(this.columns)
         },
+        open(v) {
+            this.ImportModal = v
+        }
     },
 };
 </script>

pages/import/index.vue

 <template>
 <div class="h100">
-    <DataGrid :columns="columns" ref="grid" :action="action" title="导入中心">
+    <DataGrid :columns="columns" ref="grid" :action="action" exportTitle="导入中心">
         <template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>
                 <FormItem prop="keys">

pages/mesPlan/index.vue

@@ -24,7 +24,7 @@
     </div>
     <Content class="content" :class="!showMenu?'con_bord':''">
         <!--:data="dataT"-->
-        <DataGrid :action="action" :columns="columns" :conditions="easySearch" ref="grid" @on-selection-change="onSelect" :batch="true" :border="false" rowKey="id" title="订单管理" @on-import-data="onImportData">
+        <DataGrid :action="action" :columns="columns" :conditions="easySearch" ref="grid" @on-selection-change="onSelect" :batch="true" :border="false" rowKey="id" exportTitle="订单管理" @on-import-data="onImportData">
             <template slot="easySearch">
                 <Form ref="formInline" :model="easySearch" inline>
                     <FormItem prop="keys">
@@ -1045,10 +1045,7 @@ export default {
             this.dataT = this.$u.clone(this.dataT);
         },
         //批量导入start
-        onImportData(val) {
-            alert(JSON.stringify(val))
-            this.$refs.grid.closeImport()
-        },
+
         //批量导入end
     }
 };

pages/resource/resource/api.js

@@ -44,5 +44,9 @@ export default {
     getmaterialdefinitionproperty(params){
         return Api.get(`${material}/custompropertydefinition/getmaterialdefinitionproperty`,params);
     },
+     //批量导入
+     import(params) {
+        return Api.post(`${resourceUrl}/resourceimportservice/import`, params);
+    },
    
 }
\ No newline at end of file

pages/resource/resource/index.vue

 <template>
-  <Layout class="full">
+<Layout class="full">
     <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
         <StoreTree @on-hide="onHide" @on-select="productSearch" />
     </Sider>
@@ -9,25 +9,11 @@
         </a>
     </div>
     <Content class="content" :class="!showMenu?'con_bord':''">
-      <DataGrid
-        :columns="columns"
-        ref="grid"
-        :action="action"
-        :conditions="easySearch"
-        :batch="true"
-        :format="checkData"
-        @all-change="allchange"
-        @on-selection-change="onSelect"
-      >
+        <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :batch="true" :format="checkData" @all-change="allchange" @on-selection-change="onSelect" exportTitle="制造资源">
             <template slot="easySearch">
                 <Form ref="formInline" :model="easySearch" inline>
                     <FormItem prop="keys">
-              <Input
-                clearable
-                placeholder="请输入资源名称/资源编码/编码"
-                v-model.trim="easySearch.keys.value"
-                v-width="260"
-              />
+                        <Input clearable placeholder="请输入资源名称/资源编码/编码" v-model.trim="easySearch.keys.value" v-width="260" />
                     </FormItem>
                     <FormItem>
                         <Button type="primary" @click="search">查询</Button>
@@ -43,29 +29,20 @@
                 <Badge :count="this.$store.state.count" overflow-count="99" style="margin-right:5px;">
                     <Button icon="md-cart" @click="showCart">借出车</Button>
                 </Badge>
+                <Button @click="openModalIm">导入</Button>
             </template>
             <template slot="batch">
                 <Button type="primary" class="mr10 ml10" @click="addCart">加入借出车</Button>
             </template>
         </DataGrid>
         <Modal v-model="modal" :title="title" width="1200" footer-hide :fullscreen="fscreeen">
-        <component
-          :is="detail"
-          :eid="curId"
-          :rootName="rootName"
-          :storeTitle="storeTitle"
-          :materialType="materialType"
-          :storeId="storeId"
-          :mcode="mCode"
-          :cartList="this.$u.clone(this.$store.state.cart)"
-          @on-close="cancel"
-          @on-ok="ok"
-          @substr="substr"
-        />
+            <component :is="detail" :eid="curId" :rootName="rootName" :storeTitle="storeTitle" :materialType="materialType" :storeId="storeId" :mcode="mCode" :cartList="this.$u.clone(this.$store.state.cart)" @on-close="cancel" @on-ok="ok" @substr="substr" />
         </Modal>
+        <ImportExcel ref="importExcel" :open="ModalIm" @on-get-data="getData" :columns="columnsNow" @on-cancel="ModalImCancel" />
     </Content>
-  </Layout>
+</Layout>
 </template>
+
 <script>
 import Api from "./api";
 import Search from "./search";
@@ -84,7 +61,10 @@ export default {
             action: Api.index,
             showMenu: true,
             easySearch: {
-        keys: { op: "nameOfResource,code,resourceCode", value: null },
+                keys: {
+                    op: "nameOfResource,code,resourceCode",
+                    value: null
+                },
             },
             fscreeen: false,
             modal: false,
@@ -96,8 +76,7 @@ export default {
             storeTitle: "",
             materialType: "",
             mCode: "",
-      columns: [
-        {
+            columns: [{
                     key: "selection",
                     type: "selection",
                     width: 50,
@@ -119,13 +98,17 @@ export default {
                     high: true,
                     width: 60,
                     render: (h, params) => {
-            return h("div", { class: "action" }, [
+                        return h("div", {
+                            class: "action"
+                        }, [
                             h(params.row.numberAvailable > 0 ? "op" : "", {
                                 attrs: {
                                     icon: "ios-cart-outline",
                                     type: "icon",
                                 },
-                on: { click: () => this.addCart(params.row) },
+                                on: {
+                                    click: () => this.addCart(params.row)
+                                },
                             }),
                         ]);
                     },
@@ -266,32 +249,35 @@ export default {
                     title: "操作",
                     width: 190,
                     align: "center",
+                    key: "action",
                     hide: false,
                     render: (h, params) => {
-            return h("div", { class: "action" }, [
+                        return h("div", {
+                            class: "action"
+                        }, [
                             h(
-                "op",
-                {
+                                "op", {
                                     attrs: {
                                         oprate: "delete",
                                         title: "删除",
                                     },
-                  class:
-                    params.row.totalNum === params.row.numberAvailable
-                      ? "remove"
-                      : "disable",
-                  on: { click: () => this.remove(params.row) },
+                                    class: params.row.totalNum === params.row.numberAvailable ?
+                                        "remove" : "disable",
+                                    on: {
+                                        click: () => this.remove(params.row)
+                                    },
                                 },
                                 "删除"
                             ),
                             h(
-                "op",
-                {
+                                "op", {
                                     attrs: {
                                         oprate: "detail",
                                         title: "查看日志",
                                     },
-                  on: { click: () => this.logDetail(params.row.id) },
+                                    on: {
+                                        click: () => this.logDetail(params.row.id)
+                                    },
                                 },
                                 "查看日志"
                             ),
@@ -307,6 +293,8 @@ export default {
             cartList: [],
             cartListCount: 0,
             selectRows: [],
+            //导入
+            ModalIm: false,
         };
     },
     created() {
@@ -321,7 +309,10 @@ export default {
             })();
         };
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     computed: {},
@@ -380,7 +371,10 @@ export default {
                     newArr.forEach((item2, index, thisArr) => {
                         if (item.id == item2.id) {
                             hasPush = true;
-              thisArr[index] = { ...item, ...item2 };
+                            thisArr[index] = {
+                                ...item,
+                                ...item2
+                            };
                             return;
                         }
                     });
@@ -489,7 +483,12 @@ export default {
             this.storeTitle = item.title;
             this.rootName = rootName.join(" / ");
             this.materialType = item.materialType;
-      let where = { storeId: { op: "In", value: ids } };
+            let where = {
+                storeId: {
+                    op: "In",
+                    value: ids
+                }
+            };
             this.$refs.grid.reload(where);
         },
         setNum(row) {
@@ -499,6 +498,66 @@ export default {
             this.fscreeen = false;
             this.modal = true;
         },
+        //批量导入start
+        //导入功能
+        openModalIm() {
+            this.ModalIm = true
+        },
+        ModalImCancel() {
+            this.ModalIm = false
+        },
+        getData(val) {
+            alert(JSON.stringify(val))
+
+        },
+        onImportData(val) {
+            //alert(JSON.stringify(val))
+            //this.$refs.grid.closeImport()
+            //this.$refs.grid.closeImport(url, coloums, format, ok);
+            this.$refs.importExcel.deelData(url, coloums, format, ok)
+            let tempData = this.$u.clone(val);
+            let tempList = [];
+            //tempData.forEach((ele) => {
+            //let obj = {
+            // userName: ele.userName,
+            //cardNo: ele.cardNo,
+            // gender: ele.gender,
+            //birthday: ele.birthday,
+            //degreeId: ele.degreeId,
+            //departmentId: ele.departmentId,
+            //status: ele.status,
+            //phone: ele.phone,
+            //email: ele.email,
+            //licensedToWork: ele.licensedToWork,
+            //positionId: ele.positionId,
+            //titleId: ele.titleId,
+            //departmentTitle: ele.departmentTitle,
+            //};
+            //if (ele.userName && ele.userName != '' && ele.cardNo && ele.cardNo != '' && ele.departmentId && ele.departmentId != '' && ele.phone && ele.phone != '') {
+            // tempList.push(obj);
+            // }
+
+            // });
+            tempList = tempData
+            if (tempList.length == 0) {
+                this.$Message.error("所有导入的数据均不合法！");
+            } else {
+                let parms = {
+                    list: tempList,
+                };
+                alert(JSON.stringify(tempList))
+                //Api.import(parms).then((res) => {
+                //if (res.success) {
+                //this.$Message.success("成功批量导入用户管理成功模块 " + tempList.length + " 条数据");
+                //this.imBtn = false;
+                //this.$refs.grid.closeImport()
+                // } else {
+                // this.$Message.error("批量导入用户管理失败！");
+                //}
+                //});
+            }
+        },
+        //批量导入end
         l(key) {
             let vkey = "resource" + "." + key;
             return this.$t(vkey) || key;
@@ -506,15 +565,19 @@ export default {
     },
 };
 </script>
+
 <style lang="less">
 .full {
     margin-top: 0;
+
     .content {
         margin-top: 10px;
         padding-top: 10px;
+
         .ivu-icon-ios-add:before {
             content: "\f341";
         }
+
         .ivu-icon-ios-remove:before {
             content: "\f33d";
         }