aps

libs/henq.js

+import XLSX from 'xlsx';
 let henq = {};
 let pdfInfo = ''
 henq.clone = (obj) => {

package-lock.json

@@ -2559,7 +2559,7 @@
     },
     "adler-32": {
       "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/adler-32/download/adler-32-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz",
       "integrity": "sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=",
       "requires": {
         "exit-on-epipe": "~1.0.1",
@@ -4679,7 +4679,7 @@
     },
     "codepage": {
       "version": "1.14.0",
-      "resolved": "https://registry.npm.taobao.org/codepage/download/codepage-1.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz",
       "integrity": "sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k=",
       "requires": {
         "commander": "~2.14.1",
@@ -6085,11 +6085,11 @@
       }
     },
     "echarts": {
-      "version": "4.7.0",
-      "resolved": "http://r.cnpmjs.org/echarts/download/echarts-4.7.0.tgz",
-      "integrity": "sha1-Wzh1pML5HjkpQl+rq56s5+QJiz8=",
+      "version": "4.8.0",
+      "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.8.0.tgz",
+      "integrity": "sha1-ssHPuSKbE9No7hBPyO6mALV01MQ=",
       "requires": {
-        "zrender": "4.3.0"
+        "zrender": "4.3.1"
       }
     },
     "echarts-liquidfill": {
@@ -23634,9 +23634,9 @@
       }
     },
     "zrender": {
-      "version": "4.3.0",
-      "resolved": "http://r.cnpmjs.org/zrender/download/zrender-4.3.0.tgz",
-      "integrity": "sha1-nwVhIbILuuREFNKHv2oRn/cEJmE="
+      "version": "4.3.1",
+      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.1.tgz?cache=0&sync_timestamp=1597683748542&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-4.3.1.tgz",
+      "integrity": "sha1-uviqbcgYei+BlpLX1fm+36K5D6M="
     }
   }
 }

package.json

@@ -19,7 +19,7 @@
     "better-scroll": "^1.12.1",
     "cross-env": "^5.2.0",
     "dayjs": "^1.8.27",
-    "echarts": "^4.7.0",
+    "echarts": "^4.8.0",
     "echarts-liquidfill": "^2.0.5",
     "file-saver": "^2.0.2",
     "gantt-elastic": "^1.0.11",

pages/aps/plan/api.js

@@ -33,8 +33,8 @@ export default {
     },
     listbyuser(params) {//获取当前登录用户可操作的排产
         //authUrl
-        return Api.post(`http://39.100.148.168:10000/auth/setschedulecompany/listbyuser`, params);//168
-        // return Api.post(`${Platform}/setschedulecompany/listbyuser`, params);//61
+        //return Api.post(`http://39.100.148.168:10000/auth/setschedulecompany/listbyuser`, params);//168
+        return Api.post(`${Platform}/setschedulecompany/listbyuser`, params);//61
     },
     moveintoai(){////跳转进入智能排产池前判断
         return Api.post(`${PlanUrl}/messchedule/moveintoai`);

pages/import/process.vue

 <template>
   <div class="content">
-    <Upload action :before-upload="beforeUpload" ref="uploadfile" :format="formatList">
-      <Button icon="ios-cloud-upload-outline">重新上传</Button>
-    </Upload>
     <DataGrid
       border
       :height="tdHeightExcel"
       :columns="columnsImport"
       :data="excelData"
-      :tool="false"
       :page="false"
       :set="false"
-    ></DataGrid>
+    >
+      <template slot="easySearch">
+        <Form inline>
+          <FormItem><dictionary code="plan.order.taskType" style="width:240px"></dictionary></FormItem>
+          <FormItem><Button type="primary" >预览</Button></FormItem>
+        </Form>
+       
+        
+      </template>
+      <template slot="searchBack">
+        <Upload action :before-upload="beforeUpload" ref="uploadfile" :format="formatList">
+          <Button icon="ios-cloud-upload-outline">重新上传</Button>
+        </Upload>
+      </template>
+    </DataGrid>
     <p class="tr pt10">
       <span v-if="excelData.length>0">共 {{excelData.length}} 条数据</span>
       <Button @click="cancelExcel">取消</Button>

plugins/iview.js

@@ -70,9 +70,6 @@ import VueEditor from "vue2-editor"
 
 import echarts from 'echarts'
 
-
-Vue.use(XLSX)
-
 // Vue.use(FormMaking, {
 //   lang: 'zh-CN'
 // })
@@ -90,6 +87,7 @@ Viewer.setDefaults({
 // 内置组件
 import iLink from '@/components/link';
 Vue.component("iLink", iLink)
+Vue.use(XLSX)
 
 Vue.prototype.$echarts = echarts
 Vue.component("Tools", Tools)