Home Explore Help
Register Sign In
zfire-front
/
supply-front
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

【修改】bug

howie 2 years ago
parent
5bb660db8a
commit
7b0ff547cd
7 changed files with 56 additions and 12 deletions
Unified View Show Diff Stats
  1. 2 1
      public/index.html
  2. 4 1
      src/views/supply/implement/implement_list.vue
  3. 4 1
      src/views/supply/implement/implement_total_list.vue
  4. 11 4
      src/views/supply/implement/nsales_list.vue
  5. 3 1
      src/views/supply/price/difference_modify_list.vue
  6. 11 4
      src/views/supply/sales/sales_list.vue
  7. 21 0
      vue.config.js

+ 2 - 1
public/index.html
View File 

@@ -5,9 +5,10 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.png">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.png">
 
+    <link rel="stylesheet" type="text/css" media="print" href="https://cdn.jsdelivr.net/npm/vue-plugin-hiprint@latest/dist/print-lock.css">
 
     <title><%= webpackConfig.name %></title>
 
     <title><%= webpackConfig.name %></title>
 
     <style>
 
     <style>
 
-      
+
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>

+ 4 - 1
src/views/supply/implement/implement_list.vue
View File 

@@ -261,8 +261,11 @@ let that
 
 export default {
 
 export default {
 
   filters: {
 
   filters: {
 
     statusFilter(val) {
 
     statusFilter(val) {
 
-      let obj = that.statusList.find(o => o.value == val);
 
+      if (that.statusList.length) {
 
+        let obj = that.statusList.find(o => o.value == val);
 
       return obj ? obj.label : ''
 
       return obj ? obj.label : ''
 
+      }
 
+      return ''
 
     }
 
     }
 
   },
 
   },
 
   data() {
 
   data() {

+ 4 - 1
src/views/supply/implement/implement_total_list.vue
View File 

@@ -260,8 +260,11 @@ let that
 
 export default {
 
 export default {
 
   filters: {
 
   filters: {
 
     statusFilter(val) {
 
     statusFilter(val) {
 
-      let obj = that.statusList.find(o => o.value == val);
 
+      if (that.statusList.length) {
 
+        let obj = that.statusList.find(o => o.value == val);
 
       return obj ? obj.label : ''
 
       return obj ? obj.label : ''
 
+      }
 
+      return ''
 
     }
 
     }
 
   },
 
   },
 
   data() {
 
   data() {

+ 11 - 4
src/views/supply/implement/nsales_list.vue
View File 

@@ -507,12 +507,19 @@ export default {
 
   },
 
   },
 
   filters: {
 
   filters: {
 
     statusFilter(val) {
 
     statusFilter(val) {
 
-      let obj = that.statusList.find((o) => o.value == val);
 
-      return obj ? obj.label : "";
 
+      if (that.statusList.length) {
 
+        let obj = that.statusList.find(o => o.value == val);
 
+      return obj ? obj.label : ''
 
+      }
 
+      return ''
 
     },
 
     },
 
     orderTypeFilter(val) {
 
     orderTypeFilter(val) {
 
-      let obj = that.orderTypeList.find((o) => o.value == val);
 
-      return obj ? obj.label : "";
 
+
 
+      if (that.orderTypeList.length) {
 
+        let obj = that.orderTypeList.find(o => o.value == val);
 
+      return obj ? obj.label : ''
 
+      }
 
+      return ''
 
     },
 
     },
 
     billStatusFilter(val) {
 
     billStatusFilter(val) {
 
       const MAP = {
 
       const MAP = {

+ 3 - 1
src/views/supply/price/difference_modify_list.vue
View File 

@@ -828,7 +828,9 @@ export default {
 
     },
 
     },
 
     // 下载经销商模板
 
     // 下载经销商模板
 
     hanleDownloadFiles() {
 
     hanleDownloadFiles() {
 
-      downloadFiles('product-upd-price/download')
 
+      downloadFiles('product-upd-price/download',{
 
+        billType:'DIFF'
 
+      })
 
     },
 
     },
 
     tableRowClassName({row, rowIndex}) {
 
     tableRowClassName({row, rowIndex}) {
 
       // || row.examineStatus=='FAIL'
 
       // || row.examineStatus=='FAIL'

+ 11 - 4
src/views/supply/sales/sales_list.vue
View File 

@@ -550,12 +550,19 @@ export default {
 
   },
 
   },
 
   filters: {
 
   filters: {
 
     statusFilter(val) {
 
     statusFilter(val) {
 
-      let obj = that.statusList.find((o) => o.value == val);
 
-      return obj ? obj.label : "";
 
+      if (that.statusList.length) {
 
+        let obj = that.statusList.find(o => o.value == val);
 
+      return obj ? obj.label : ''
 
+      }
 
+      return ''
 
     },
 
     },
 
     orderTypeFilter(val) {
 
     orderTypeFilter(val) {
 
-      let obj = that.orderTypeList.find((o) => o.value == val);
 
-      return obj ? obj.label : "";
 
+      if (that.orderTypeList.length) {
 
+        let obj = that.orderTypeList.find(o => o.value == val);
 
+      return obj ? obj.label : ''
 
+      }
 
+      return ''
 
+
 
     },
 
     },
 
     billStatusFilter(val) {
 
     billStatusFilter(val) {
 
       const MAP = {
 
       const MAP = {

+ 21 - 0
vue.config.js
View File 

@@ -1,6 +1,7 @@
 
 'use strict'
 
 'use strict'
 
 const path = require('path')
 
 const path = require('path')
 
 const defaultSettings = require('./src/settings.js')
 
 const defaultSettings = require('./src/settings.js')
 
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 
 let webpack = require('webpack')
 
 let webpack = require('webpack')
 
 function resolve(dir) {
 
 function resolve(dir) {
 
   return path.join(__dirname, dir)
 
   return path.join(__dirname, dir)
 
@@ -57,12 +58,32 @@ module.exports = {
 
     plugins: [
 
     plugins: [
 
       new webpack.ProvidePlugin({
 
       new webpack.ProvidePlugin({
 
       }),
 
       }),
 
+
 
     ],
 
     ],
 
     resolve: {
 
     resolve: {
 
       alias: {
 
       alias: {
 
         '@': resolve('src')
 
         '@': resolve('src')
 
       },
 
       },
 
       extensions: ['*', '.js', '.vue', '.json']
 
       extensions: ['*', '.js', '.vue', '.json']
 
+    },
 
+    optimization:{
 
+      minimizer:[
 
+        new UglifyJsPlugin({
 
+            uglifyOptions:{
 
+              output:{
 
+                commons:false
 
+              },
 
+              compress:{
 
+               // warnings:false
 
+               drop_debugger:true,
 
+               drop_console:true,
 
+               pure_funcs:['console.log']
 
+              }
 
+            },
 
+            sourceMap:false,
 
+            parallel:true
 
+        })
 
+      ]
 
     }
 
     }
 
   },
 
   },
 
   chainWebpack(config) {
 
   chainWebpack(config) {