提交代码

build/utils.js

@@ -1,13 +1,13 @@
-"use strict";
-const path = require("path");
-const config = require("../config");
-const ExtractTextPlugin = require("extract-text-webpack-plugin");
-const packageConfig = require("../package.json");
-const HtmlWebpackPlugin = require("html-webpack-plugin");
-const merge = require("webpack-merge");
-const glob = require("glob");
-const pathSrc = path.resolve(__dirname, "../src"); // F:\webui\multiple-pages\demo\src
-const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应用下
+'use strict'
+const path = require('path')
+const config = require('../config')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const packageConfig = require('../package.json')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const merge = require('webpack-merge')
+const glob = require('glob')
+const pathSrc = path.resolve(__dirname, '../src') // F:\webui\multiple-pages\demo\src
+const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用下
 
 // 指定开发模式下需要加载的模块（可以做到只加载当前模块，提高开发效率）
 // index模块（登录）为必须，all 为所有
@@ -18,136 +18,137 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 //let devModules = ["index", "statisticalReport", "appoint", "sale","AMS","TMS"];
 let devModules=["all"]
 
-if (pathSrc.indexOf("node_modules") > -1) {
-  devModules = require("../../../cors.js").devModules;
+
+if (pathSrc.indexOf('node_modules') > -1) {
+  devModules = require('../../../cors.js').devModules
 }
 // 获取入口集合
 const getEntries = function(suffix, polyfill) {
   // 自动获取
-  const entryHtml = glob.sync(pathSrc + "/views/**/app.html"); // 根据html来
-  const devEntryHtml = glob.sync(devPathSrc + "/views/**/app.html"); // 根据html来
-  const entries = {};
+  const entryHtml = glob.sync(pathSrc + '/views/**/app.html') // 根据html来
+  const devEntryHtml = glob.sync(devPathSrc + '/views/**/app.html') // 根据html来
+  const entries = {}
   let setEntries = function(filePath, _chunk) {
-    _chunk = _chunk.substring(0, _chunk.lastIndexOf("/"));
-    let flag = true;
-    flag = false;
+    _chunk = _chunk.substring(0, _chunk.lastIndexOf('/'))
+    let flag = true
+    flag = false
     for (let item of devModules) {
-      if (item && (_chunk.indexOf("views/" + item) >= 0 || item === "all")) {
-        flag = true;
-        break;
+      if (item && (_chunk.indexOf('views/' + item) >= 0 || item === 'all')) {
+        flag = true
+        break
       }
     }
     if (flag) {
-      let arr = _chunk.split("/"),
+      let arr = _chunk.split('/'),
         larr = [],
-        rarr = [];
-      console.log("arr: ", arr);
-      larr = arr.slice(0, 2);
-      _chunk = larr.join("/");
+        rarr = []
+      console.log('arr: ', arr)
+      larr = arr.slice(0, 2)
+      _chunk = larr.join('/')
       if (arr.length > 2) {
-        rarr = arr.slice(2, arr.length);
-        _chunk = _chunk + "/" + rarr.join("-");
+        rarr = arr.slice(2, arr.length)
+        _chunk = _chunk + '/' + rarr.join('-')
       }
       if (suffix) {
-        filePath = filePath.replace(".html", suffix);
+        filePath = filePath.replace('.html', suffix)
       }
       if (polyfill) {
-        entries[_chunk] = ["babel-polyfill", filePath];
+        entries[_chunk] = ['babel-polyfill', filePath]
       } else {
-        entries[_chunk] = filePath;
+        entries[_chunk] = filePath
       }
     }
-  };
+  }
   entryHtml.forEach(filePath => {
     // views/index/app.html --> views/index   chunk有'/'则js/css会有相应的目录
-    let _chunk = filePath.split(pathSrc.replace(/\\/g, "/") + "/")[1]; // views/index/app.html
-    setEntries(filePath, _chunk);
-  });
+    let _chunk = filePath.split(pathSrc.replace(/\\/g, '/') + '/')[1] // views/index/app.html
+    setEntries(filePath, _chunk)
+  })
   devEntryHtml.forEach(filePath => {
     // views/index/app.html --> views/index   chunk有'/'则js/css会有相应的目录
-    let _chunk = filePath.split(devPathSrc.replace(/\\/g, "/") + "/")[1]; // views/index/app.html
-    setEntries(filePath, _chunk);
-  });
-  return entries;
-};
+    let _chunk = filePath.split(devPathSrc.replace(/\\/g, '/') + '/')[1] // views/index/app.html
+    setEntries(filePath, _chunk)
+  })
+  return entries
+}
 // 多入口配置（入口JS固定为main.js）
 exports.entries = function() {
   // ['babel-polyfill', './src/main.js']
-  let _entries = getEntries(".js", true);
-  return _entries;
-};
+  let _entries = getEntries('.js', true)
+  return _entries
+}
 //多页面输出配置
 exports.htmlPlugins = function() {
-  let entryHtmls = getEntries(".html");
-  let arr = [];
+  let entryHtmls = getEntries('.html')
+  let arr = []
   for (let _chunk in entryHtmls) {
-    console.log("loading chunk:", _chunk);
+    console.log('loading chunk:', _chunk)
     // _chunk ：views/index/index
     let conf = {
-      favicon: pathSrc + "/assets/img/favicon.ico", //favicon路径，通过webpack引入同时可以生成hash值
+      favicon: pathSrc + '/assets/img/favicon.ico', //favicon路径，通过webpack引入同时可以生成hash值
       template: entryHtmls[_chunk], // html模板路径
       // filename: 'views/' + fileName, // 生成的html存放路径，相对于path
-      filename: _chunk + ".html",
+      filename: _chunk + '.html',
       chunks: [_chunk],
       inject: true // js插入的位置，true/'head'/'body'/false
-    };
-    if (process.env.NODE_ENV === "production") {
-      console.log("package content: ", _chunk);
+    }
+    if (process.env.NODE_ENV === 'production') {
+      console.log('package content: ', _chunk)
       conf = merge(conf, {
-        chunks: ["manifest", "vendor", _chunk],
+        chunks: ['manifest', 'vendor', _chunk],
         minify: {
           // removeAttributeQuotes: true, // 删除可删除的引号
           removeComments: true, // 移除HTML中的注释
           collapseWhitespace: true // 删除空白符与换行符
         },
-        chunksSortMode: "dependency"
-      });
+        chunksSortMode: 'dependency'
+      })
     }
-    arr.push(new HtmlWebpackPlugin(conf));
+    arr.push(new HtmlWebpackPlugin(conf))
   }
-  console.log("arr:", arr);
-  return arr;
-};
+  console.log('arr:', arr)
+  return arr
+}
 
 exports.assetsPath = function(_path) {
   const assetsSubDirectory =
-    process.env.NODE_ENV === "production"
+    process.env.NODE_ENV === 'production'
       ? config.build.assetsSubDirectory
-      : config.dev.assetsSubDirectory;
+      : config.dev.assetsSubDirectory
 
-  return path.posix.join(assetsSubDirectory, _path);
-};
+  return path.posix.join(assetsSubDirectory, _path)
+}
 
 exports.cssLoaders = function(options) {
-  options = options || {};
+  options = options || {}
 
   const cssLoader = {
-    loader: "css-loader",
+    loader: 'css-loader',
     options: {
       sourceMap: options.sourceMap
     }
-  };
+  }
 
   const postcssLoader = {
-    loader: "postcss-loader",
+    loader: 'postcss-loader',
     options: {
       sourceMap: options.sourceMap
     }
-  };
+  }
 
   // generate loader string to be used with extract text plugin
   function generateLoaders(loader, loaderOptions) {
     const loaders = options.usePostCSS
       ? [cssLoader, postcssLoader]
-      : [cssLoader];
+      : [cssLoader]
 
     if (loader) {
       loaders.push({
-        loader: loader + "-loader",
+        loader: loader + '-loader',
         options: Object.assign({}, loaderOptions, {
           sourceMap: options.sourceMap
         })
-      });
+      })
     }
 
     // Extract CSS when that option is specified
@@ -158,11 +159,11 @@ exports.cssLoaders = function(options) {
         // 解决打包后背景图片路径不对的问题
         // static/css/views/index/index.css
         // ../../../../static/img/xx.jpg
-        publicPath: "../../../", // 注意: 此处根据路径, 自动更改
-        fallback: "vue-style-loader"
-      });
+        publicPath: '../../../', // 注意: 此处根据路径, 自动更改
+        fallback: 'vue-style-loader'
+      })
     } else {
-      return ["vue-style-loader"].concat(loaders);
+      return ['vue-style-loader'].concat(loaders)
     }
   }
 
@@ -170,46 +171,46 @@ exports.cssLoaders = function(options) {
   return {
     css: generateLoaders(),
     postcss: generateLoaders(),
-    less: generateLoaders("less"),
-    sass: generateLoaders("sass", {
+    less: generateLoaders('less'),
+    sass: generateLoaders('sass', {
       indentedSyntax: true
     }),
-    scss: generateLoaders("sass"),
-    stylus: generateLoaders("stylus"),
-    styl: generateLoaders("stylus")
-  };
-};
+    scss: generateLoaders('sass'),
+    stylus: generateLoaders('stylus'),
+    styl: generateLoaders('stylus')
+  }
+}
 
 // Generate loaders for standalone style files (outside of .vue)
 exports.styleLoaders = function(options) {
-  const output = [];
-  const loaders = exports.cssLoaders(options);
+  const output = []
+  const loaders = exports.cssLoaders(options)
 
   for (const extension in loaders) {
-    const loader = loaders[extension];
+    const loader = loaders[extension]
     output.push({
-      test: new RegExp("\\." + extension + "$"),
+      test: new RegExp('\\.' + extension + '$'),
       use: loader
-    });
+    })
   }
 
-  return output;
-};
+  return output
+}
 
 exports.createNotifierCallback = () => {
-  const notifier = require("node-notifier");
+  const notifier = require('node-notifier')
 
   return (severity, errors) => {
-    if (severity !== "error") return;
+    if (severity !== 'error') return
 
-    const error = errors[0];
-    const filename = error.file && error.file.split("!").pop();
+    const error = errors[0]
+    const filename = error.file && error.file.split('!').pop()
 
     notifier.notify({
       title: packageConfig.name,
-      message: severity + ": " + error.name,
-      subtitle: filename || "",
-      icon: path.join(__dirname, "logo.png")
-    });
-  };
-};
+      message: severity + ': ' + error.name,
+      subtitle: filename || '',
+      icon: path.join(__dirname, 'logo.png')
+    })
+  }
+}

config/index.js

@@ -1,111 +1,111 @@
-"use strict";
+'use strict'
 // Template version: 1.3.1
 // see http://vuejs-templates.github.io/webpack for documentation.
 
-const path = require("path");
+const path = require('path')
 
-const pathSrc = path.resolve(__dirname, "../src");
+const pathSrc = path.resolve(__dirname, '../src')
 
 let proxyTable = {
-  "/icore.icp.web/pass/v1/sysusers/user/token": {
+  '/icore.icp.web/pass/v1/sysusers/user/token': {
     //https://portal.steerinfo.com/icore.icp.web/pass/sso/v1/sysusers/user/token
     //target: 'https://portal-dev.steerinfo.com/icore.icp.web/pass/sso/v1/sysusers/user/token',
-    target: "http://172.16.33.166:9001/v1/sysusers/user/token",
+    target: 'http://172.16.33.166:9001/v1/sysusers/user/token',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore.icp.web/pass/v1/sysusers/user/token": "/"
+      '^/icore.icp.web/pass/v1/sysusers/user/token': '/'
     }
   },
-  "/icore.icp.web/pass/v1": {
+  '/icore.icp.web/pass/v1': {
     //target: 'http://172.16.33.161:80/v1', //加http
-    target: "http://172.16.33.166:9001/v1",
+    target: 'http://172.16.33.166:9001/v1',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore.icp.web/pass/v1": "/" //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+      '^/icore.icp.web/pass/v1': '/' //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
       // 比如我要调用'http://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
     }
   },
-  "/icore.icp.web/pass/auth/login": {
+  '/icore.icp.web/pass/auth/login': {
     //target: 'http://sso-dev.steerinfo.com/icore.icp.web/pass/auth/login',
-    target: "http://172.16.33.166:9001/auth/login",
+    target: 'http://172.16.33.166:9001/auth/login',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore.icp.web/pass/auth/login": ""
+      '^/icore.icp.web/pass/auth/login': ''
     }
   },
-  "/icore-api": {
-    target: "http://172.16.33.166:9001",
+  '/icore-api': {
+    target: 'http://172.16.33.166:9001',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore-api": "/"
+      '^/icore-api': '/'
     }
   },
-  "/icore.icp.web/pass/act": {
-    target: "http://172.16.33.166:8095",
+  '/icore.icp.web/pass/act': {
+    target: 'http://172.16.33.166:8095',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore.icp.web/pass/act": "/"
+      '^/icore.icp.web/pass/act': '/'
     }
   },
   // 表格表单请求的域名地址
-  "/api/v1/cd": {
-    target: "http://172.16.33.161:8083",
+  '/api/v1/cd': {
+    target: 'http://172.16.33.161:8083',
     ws: true,
     pathRewrite: {
-      "^/api/v1/cd": "/api/v1/cd"
+      '^/api/v1/cd': '/api/v1/cd'
     }
   },
   //抽奖结果的接口
-  "/icore.icp.web/game/v1": {
-    target: "http://172.16.33.166:9002",
+  '/icore.icp.web/game/v1': {
+    target: 'http://172.16.33.166:9002',
     ws: true,
     pathRewrite: {
-      "^/icore.icp.web/game/v1": "/v1"
+      '^/icore.icp.web/game/v1': '/v1'
     }
   },
   // 所有数据的请求域名地址
-  "/api/v1": {
-    target: "http://172.16.33.166:80",
+  '/api/v1': {
+    target: 'http://172.16.33.166:80',
     //target: "http://localhost:8080",
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {
-      "^/api/v1": "/api/v1"
+      '^/api/v1': '/api/v1'
     }
   },
-  "/views/api/v1": {
+  '/views/api/v1': {
     //target: "http://172.16.33.166:80",
-    target: "http://172.16.33.166:80",
+    target: 'http://172.16.33.166:80',
     ws: true,
     pathRewrite: {
-      "^/views/api/v1": "/api/v1"
+      '^/views/api/v1': '/api/v1'
     }
   },
-  "/icore.icp.web/pass/logout": {
-    target: "http://172.16.33.166:9001/logout",
+  '/icore.icp.web/pass/logout': {
+    target: 'http://172.16.33.166:9001/logout',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore.icp.web/pass/logout": "/"
+      '^/icore.icp.web/pass/logout': '/'
     }
   }
-};
-let dist = "../dist";
-if (pathSrc.indexOf("node_modules") > -1) {
-  dist = "../../../dist";
-  let proxyTableGet = require("../../../cors.js").proxyTable;
+}
+let dist = '../dist'
+if (pathSrc.indexOf('node_modules') > -1) {
+  dist = '../../../dist'
+  let proxyTableGet = require('../../../cors.js').proxyTable
   for (let i in proxyTableGet) {
-    proxyTable[i] = proxyTableGet[i];
+    proxyTable[i] = proxyTableGet[i]
   }
 }
 
 module.exports = {
   dev: {
     // Paths
-    assetsSubDirectory: "static",
-    assetsPublicPath: "/",
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
     proxyTable: proxyTable,
     // Various Dev Server settings
-    host: "localhost", // can be overwritten by process.env.HOST
+    host: 'localhost', // can be overwritten by process.env.HOST
     port: 8802, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
@@ -144,12 +144,12 @@ module.exports = {
 
   build: {
     // Template for index.html
-    index: path.resolve(__dirname, dist + "/index.html"),
+    index: path.resolve(__dirname, dist + '/index.html'),
 
     // Paths
     assetsRoot: path.resolve(__dirname, dist),
-    assetsSubDirectory: "static", // 打包后 static放的位置
-    assetsPublicPath: "../", // html中webpack打包的JS -> ../static/xxx.js
+    assetsSubDirectory: 'static', // 打包后 static放的位置
+    assetsPublicPath: '../', // html中webpack打包的JS -> ../static/xxx.js
 
     /**
      * Source Maps
@@ -157,14 +157,14 @@ module.exports = {
 
     productionSourceMap: false,
     // https:       //webpack.js.org/configuration/devtool/#production
-    devtool: "#source-map",
+    devtool: '#source-map',
 
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
     productionGzip: false,
-    productionGzipExtensions: ["js", "css"],
+    productionGzipExtensions: ['js', 'css'],
 
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
@@ -172,4 +172,4 @@ module.exports = {
     // Set to `true` or `false` to always turn it on or off
     bundleAnalyzerReport: process.env.npm_config_report
   }
-};
+}

src/config/routerBefore.js

@@ -14,7 +14,8 @@ const whiteList = [
   '/dingtalkTaskMobileEnd',
   '/dingtalkWorkFlowMobileEnd',
   '/luckDraw',
-  '/printScan'
+  '/printScan',
+  '/printReceipt'
 ]
 
 /**
@@ -95,7 +96,6 @@ const breadcrumbFn = function(to, menu) {
 //  路由前置操作
 const routerBefore = function(router, constantRouterMap) {
   let flag = false
-  console.log('开始了')
   router.beforeEach((to, from, next) => {
     //  面包屑
     if (document.domain.indexOf('steerinfo.com') > -1) {

src/views/index/components/printReceipt.vue

@@ -28,8 +28,8 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin: auto; font-size: 20px"
-            width="1300px"
+            style="margin:auto; font-size: 20px"
+            width="1000px"
             class="tablePart0"
           >
             <tr>
@@ -44,11 +44,11 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="margin-top: 10px; text-align: center;height: 70px"
-            width="1300px"
+            style="margin-top: 10px; text-align: center"
+            width="1000px"
             class="tablePart1"
           >
-            <tr>
+            <tr style="height: 35px">
               <th style="width: 5%; text-align: center">序号</th>
               <th style="width: 23.5%; text-align: center">物资名称</th>
               <th style="width: 22.5%; text-align: center">规格型号</th>
@@ -56,7 +56,7 @@
               <th style="width: 35%">重量</th>
               <!--              <th style="width: 21%">订单日期</th>-->
             </tr>
-            <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
+            <tr style="height: 35px" v-for="(item, index) in deliveryOrderMaterialList" :key="index">
               <td>{{ index + 1 }}</td>
               <td>{{ item.materialName }}</td>
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
@@ -72,7 +72,7 @@
             cellpadding="10"
             cellspacing="0"
             style="border-top: 0px;height: 40px"
-            width="1300px"
+            width="1000px"
             class="tablePart2"
           >
             <tr>
@@ -89,7 +89,7 @@
             cellpadding="10"
             cellspacing="0"
             style="border-top: 0px;height: 40px"
-            width="1300px"
+            width="1000px"
             class="tablePart3"
           >
             <tr>
@@ -106,7 +106,7 @@
             cellpadding="10"
             cellspacing="0"
             style="border-top: 0px;height: 40px"
-            width="1300px"
+            width="1000px"
             class="tablePart4"
           >
             <tr>
@@ -122,8 +122,8 @@
             border="1"
             cellpadding="10"
             cellspacing="0"
-            style="border-top: 0px;height: 40px"
-            width="1300px"
+            style="border-top: 0px;height: 45px"
+            width="1000px"
             class="tablePart9"
           >
             <tr>
@@ -139,8 +139,8 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-left: 500px; font-size: 20px;height: 40px"
-            width="1300px"
+            style="margin-left: 190px; font-size: 20px;height: 45px"
+            width="1000px"
             class="tablePart6"
           >
             <tr>
@@ -174,8 +174,8 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-left: 500px; font-size: 20px;height: 40px"
-            width="1300px"
+            style="margin-left: 190px; font-size: 20px;height: 40px"
+            width="1000px"
             class="tablePart6"
           >
             <tr>
@@ -200,8 +200,9 @@
         </table>
       </div>-->
         <!--设置中间的间隔以及虚线-->
-        <div style="height: 80px"></div>
-        <hr width="1500px" style="border:1px dashed black;height:1px" />
+        <div style="height: 60px" v-show="index < 2"></div>
+        <hr width="1500px" style="border:1px dashed black" v-show="index < 2"/>
+        <div style="page-break-after:always" v-show="index ==1 && page"></div>
       </div>
     </div>
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
@@ -250,7 +251,9 @@ export default {
       htmlTitle: '客户换票送货单',
       note: '',
       dataList: ['1', '2', '3'],
-      timer1: ''
+      timer1: '',
+      //分页数据
+      page: '',
     }
   },
   created() {
@@ -269,12 +272,13 @@ export default {
     })
   },
   methods: {
-    getDeliveryOrder() {
+    async getDeliveryOrder() {
       let orderNumber = this.$route.query.orderNumber
-      this.axios
+      await this.axios
         .post('/api/v1/tms/getDeliveryOrder?orderNumber=' + orderNumber)
         .then(res => {
-          console.log(res)
+          console.log("查询出来的数据")
+          console.log(res.data)
           this.orderNumber = res.data.orderNumber
           this.carrierName = res.data.carrierName
           this.capacityNumber = res.data.capacityNumber
@@ -290,6 +294,10 @@ export default {
           this.deliveryAddress = res.data.deliveryAddress
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList
           this.note = res.data.note
+          console.log("数据的长度"+res.data.deliveryOrderMaterialList.length)
+          if (res.data.deliveryOrderMaterialList.length > 2){
+            this.page=true
+          }
           document.getElementById('printReceipt').click()
         })
     },

src/views/index/components/printScan.vue

@@ -16,9 +16,9 @@
       <div v-show="false">
         手动输入开关：
       </div>
-<!--      <i class="el-icon-full-screen" @click="fullScreen"
+      <!--      <i class="el-icon-full-screen" @click="fullScreen"
       v-show="edit1"></i>-->
-<!--      <el-switch
+      <!--      <el-switch
 =======
       <i class="el-icon-full-screen" @click="fullScreen" v-show="edit1"></i>
       <el-switch
@@ -38,10 +38,14 @@
       </el-switch>-->
     </div>
     <div class="tip">
-      手机二维码对准下方摄像头<br>
-      <i class="el-icon-bottom" style="padding-left: 450px;font-size: 300px;color: red"></i>
-      <span style="width: 300px;height: 200px;color: red;margin-left: 50px">zyf:***</span>
-
+      手机二维码对准下方摄像头<br />
+      <i
+        class="el-icon-bottom"
+        style="padding-left: 450px;font-size: 300px;color: red"
+      ></i>
+      <span style="width: 300px;height: 200px;color: red;margin-left: 50px"
+        >zyf:***</span
+      >
     </div>
   </div>
 </template>