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

7.0.0

++ eslint-plugin-node@11.1.0
+added 3 packages from 2 contributors, updated 1 package and moved 1 package in 24.979s

components/page/inputExcel.vue

 <template>
-  <div>
+<div>
     <Input v-model="newName" placeholder="请选择上传文件" disabled>
     <Button v-if="view" icon="md-download" slot="prepend" @click="downFile(newName)"> </Button>
     <Button type="primary" icon="ios-cloud-upload-outline" slot="append" @click="handler">上传</Button>
     </Input>
-    <Upload
-      v-model="name"
-      :action="postUrl"
-      :on-success="uploadSuccess"
-      :on-error="uploadError"
-      :on-remove="removeFile"
-      :format="formatList"
-      :max-size="maxSize"
-      :on-exceeded-size="onExceededSize"
-      :on-format-error="onFormatError"
-      :show-upload-list="false"
-      :files="files"
-      :on-progress="onProgress"
-    >
+    <Upload v-model="name" :action="postUrl" :on-success="uploadSuccess" :on-error="uploadError" :on-remove="removeFile" :format="formatList" :max-size="maxSize" :on-exceeded-size="onExceededSize" :on-format-error="onFormatError" :show-upload-list="false" :files="files" :on-progress="onProgress">
         <Button v-show="1==2" type="primary" ref="upload">上传</Button>
     </Upload>
     <Progress :percent="per" :stroke-width="5" v-show="vshowPro" />
-  </div>
+</div>
 </template>
+
 <script>
 import util from "@/libs/util";
 export default {
@@ -38,13 +26,12 @@ export default {
             downUrl: fileUrlDown,
             fileUrlPath: "",
             nameList: [],
-      postUrl:
-        fileUrl +
+            postUrl: fileUrl +
                 "/upload/?token=Bearer " +
                 util.cookies.get("token") +
                 "&" +
                 this.parms,
-      formatList: ["xlsx", "xls"],
+            formatList: ["xlsx", "xls", "jpg", "gif", "png", "pdf", "docx", "doc", "txt", "rar", "zip"],
             newName: "",
             newPath: "",
             per: 0,
@@ -165,7 +152,7 @@ export default {
         nativeInputValue() {
             return this.value === null || this.value === undefined ? "" : this.value;
         },
-    view(){
+        view() {
             return true
         }
     },
@@ -176,5 +163,6 @@ export default {
     }
 };
 </script>
+
 <style lang="less">
 </style>

package.json

@@ -25,11 +25,8 @@
     "gantt-elastic": "^1.0.11",
     "gantt-elastic-header": "^0.1.11",
     "gojs": "^2.1.19",
-    "iview-loader": "^1.3.0",
     "iview-pro": "file:./iview-pro",
     "js-cookie": "^2.2.1",
-    "less": "^3.10.3",
-    "less-loader": "^5.0.0",
     "lodash": "^4.17.15",
     "lodash.chunk": "^4.2.0",
     "lowdb": "^1.0.0",
@@ -69,9 +66,11 @@
     "@vue/test-utils": "^1.0.0-beta.28",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^23.0.1",
+    "eslint": "^7.7.0",
+    "eslint-plugin-node": "^11.1.0",
     "iview-loader": "^1.3.0",
-    "less": "^2.7.3",
-    "less-loader": "^4.1.0",
+    "less": "^3.12.2",
+    "less-loader": "^5.0.0",
     "lint-staged": "^7.2.0",
     "script-loader": "^0.7.2",
     "svg-sprite-loader": "^3.8.0",

pages/import/detailExcel.vue

@@ -5,7 +5,7 @@
             <TablePaste hide-table :input-props="inputProps" @on-success="handleSuccess" @on-error="handleError" />
         </TabPane>
         <TabPane label="预览">
-            <Table border="true" :columns="columnsImport" :data="excelData" :height="tableHeight" ref="tableExcel" class="tableCommon"></Table>
+            <Table :border="true" :columns="columnsImport" :data="excelData" :height="tableHeight" ref="tableExcel" class="tableCommon"></Table>
         </TabPane>
     </Tabs>
 
@@ -27,6 +27,8 @@ export default {
                 rows: 10,
                 placeholder: "请从Excel复制一段表格数据，粘贴在这里",
             },
+            columnsImport: [],
+            excelData: []
 
         };
     },
@@ -51,14 +53,6 @@ export default {
         };
     },
     methods: {
-        load(v) {
-            Api.get({
-                id: v,
-            }).then((r) => {
-                this.entity = r.result;
-                this.$emit("on-load");
-            });
-        },
         handleClose() {
             this.$emit("on-close");
         },
@@ -77,10 +71,44 @@ export default {
                 }
             }
         },
-        l(key) {
-            key = "import_center" + "." + key;
-            return this.$t(key);
+        //粘贴excel成功
+        handleSuccess(tableData) {
+            //初始化数据
+            this.excelData = [];
+            this.columnsImport = [];
+            //处理colum和data
+            let tabColum = tableData.columns
+            let tabData = tableData.data
+            let arrData = []
+            tabData.forEach(ele => {
+                let objData = {}
+                tabColum.forEach(el => {
+                    objData[el.title] = ele[el.key]
+                })
+                arrData.push(objData)
+            })
+            //处理title和key一致
+            tabColum.forEach(el => {
+                el.key = el.title
+            })
+
+            this.columnsImport = tabColum;
+            this.columnsImport.unshift({
+                type: 'index',
+                width: 80,
+                align: 'right',
+                title: '序号'
+            })
+            this.excelData = arrData;
+            this.$emit("on-datalength", this.excelData.length)
+        },
+        //粘贴excel失败
+        handleError(tableData, errorIndex) {
+            //console.log(tableData, errorIndex);
+            this.$Message.error("表格数据有误");
         },
+        //粘贴excel相关end
+
     },
     watch: {
         eid(v) {

pages/import/processBack.vue

@@ -43,7 +43,7 @@
         <Form inline>
             <FormItem>
                 <Tabs :animated="false" :value="0" @on-click="sheetClick">
-                    <TabPane :label="item" v-for="(item,index) in sheetNames"></TabPane>
+                    <TabPane :label="item" v-for="(item,index) in sheetNames" :key="index"></TabPane>
                 </Tabs>
             </FormItem>
         </Form>

“5.0.0”

++ eslint@7.7.0
+added 51 packages from 29 contributors, removed 3 packages, updated 12 packages and moved 7 packages in 48.231s