浏览代码

【修改】全局美化

howie 2 年之前
父节点
当前提交
471aafdbaf
共有 100 个文件被更改,包括 3324 次插入3046 次删除
  1. 159 90
      .eslintrc.js
  2. 0 2
      .history/src/api/stock_20220818144734.js
  3. 2 6
      .history/src/views/basic_data/stock/product_list_20220818143421.vue
  4. 2 6
      .history/src/views/basic_data/stock/product_list_20220818143532.vue
  5. 14 8
      .history/src/views/basic_data/stock/product_list_20220818143704.vue
  6. 14 8
      .history/src/views/basic_data/stock/product_list_20220818143730.vue
  7. 8 7
      .history/src/views/basic_data/stock/product_list_20220818143739.vue
  8. 16 10
      .history/src/views/basic_data/stock/product_list_20220818144052.vue
  9. 23 17
      .history/src/views/basic_data/stock/product_list_20220818144133.vue
  10. 39 20
      .history/src/views/basic_data/stock/product_list_20220818144316.vue
  11. 40 22
      .history/src/views/basic_data/stock/product_list_20220818144338.vue
  12. 42 24
      .history/src/views/basic_data/stock/product_list_20220818144428.vue
  13. 45 26
      .history/src/views/basic_data/stock/product_list_20220818144456.vue
  14. 45 26
      .history/src/views/basic_data/stock/product_list_20220818144523.vue
  15. 35 64
      .history/src/views/basic_data/stock/product_list_20220818144541.vue
  16. 7 36
      .history/src/views/basic_data/stock/product_list_20220818144800.vue
  17. 7 36
      .history/src/views/basic_data/stock/product_list_20220818144930.vue
  18. 7 36
      .history/src/views/basic_data/stock/product_list_20220818144933.vue
  19. 7 36
      .history/src/views/basic_data/stock/product_list_20220818144956.vue
  20. 7 36
      .history/src/views/basic_data/stock/product_list_20220818145008.vue
  21. 7 36
      .history/src/views/basic_data/stock/product_list_20220818145018.vue
  22. 40 71
      .history/src/views/basic_data/stock/product_list_20220818145031.vue
  23. 1 3
      .history/src/views/stock/product_list_20220818143351.vue
  24. 1 3
      .history/src/views/stock/product_list_20220818143354.vue
  25. 2 6
      .history/src/views/stock/product_list_20220818143422.vue
  26. 9 8
      .prettierrc
  27. 2 2
      README-zh.md
  28. 2 3
      README.md
  29. 3 3
      babel.config.js
  30. 8 9
      jest.config.js
  31. 1 1
      jsconfig.json
  32. 3 7
      mock/index.js
  33. 25 21
      mock/mock-server.js
  34. 10 8
      mock/table.js
  35. 1 2
      mock/user.js
  36. 525 159
      package-lock.json
  37. 4 1
      package.json
  38. 2 2
      postcss.config.js
  39. 15 9
      public/index.html
  40. 2 6
      src/App.vue
  41. 81 81
      src/api/basic_data/dealer.js
  42. 2 6
      src/api/basic_data/logistics.js
  43. 48 75
      src/api/basic_data/material.js
  44. 0 1
      src/api/basic_data/supplier.js
  45. 1 1
      src/api/basic_data/taker.js
  46. 17 17
      src/api/basic_data/wallet_list.js
  47. 69 69
      src/api/basic_data/warehouse.js
  48. 0 1
      src/api/dashboard.js
  49. 3 11
      src/api/engin_deposit.js
  50. 36 38
      src/api/engin_deposit/refund_list.js
  51. 21 21
      src/api/finance/account_list.js
  52. 13 13
      src/api/finance/blance_sum.js
  53. 23 24
      src/api/finance/change_apply.js
  54. 29 29
      src/api/finance/change_list.js
  55. 48 49
      src/api/finance/credit_list.js
  56. 12 12
      src/api/finance/finance_sum.js
  57. 27 27
      src/api/finance/rebate_form.js
  58. 49 49
      src/api/finance/rebate_list.js
  59. 17 17
      src/api/finance/receipt_list.js
  60. 41 41
      src/api/finance/receivable_list.js
  61. 17 17
      src/api/finance/standbook_list.js
  62. 11 12
      src/api/finance/tax_rate.js
  63. 21 21
      src/api/finance/wallet.js
  64. 1 1
      src/api/issue.js
  65. 1 2
      src/api/merchant.js
  66. 1 1
      src/api/notice.js
  67. 0 1
      src/api/policy_list.js
  68. 1 1
      src/api/sales_region.js
  69. 220 220
      src/api/setting.js
  70. 0 4
      src/api/stock.js
  71. 1 1
      src/api/supply/adjust.js
  72. 1 1
      src/api/supply/allot.js
  73. 1 4
      src/api/supply/apply.js
  74. 24 24
      src/api/supply/commercial_list.js
  75. 1 1
      src/api/supply/deliver.js
  76. 1 4
      src/api/supply/displace.js
  77. 1 14
      src/api/supply/engin.js
  78. 2 2
      src/api/supply/pickup.js
  79. 101 101
      src/api/supply/policy.js
  80. 1 1
      src/api/supply/purchase.js
  81. 0 2
      src/api/supply/reserve.js
  82. 81 81
      src/api/supply/retail.js
  83. 1 1
      src/api/supply/return.js
  84. 1 8
      src/api/supply/sales.js
  85. 28 28
      src/api/user.js
  86. 5 3
      src/components/Breadcrumb/index.vue
  87. 80 28
      src/components/Common/check-order.vue
  88. 16 21
      src/components/Common/copy-button.vue
  89. 17 15
      src/components/Common/edit-date-dialog.vue
  90. 16 24
      src/components/Common/edit-date-time-dialog.vue
  91. 17 15
      src/components/Common/examine-dialog.vue
  92. 6 6
      src/components/Common/export-button.vue
  93. 98 98
      src/components/Common/file-upload.vue
  94. 125 178
      src/components/Common/image-upload.vue
  95. 30 26
      src/components/Common/import-button.vue
  96. 150 153
      src/components/Common/print-common.vue
  97. 141 146
      src/components/Common/print-foshan.vue
  98. 138 144
      src/components/Common/print-guangzhou.vue
  99. 135 141
      src/components/Common/print-shaoguan.vue
  100. 113 37
      src/components/Common/print-test.vue

+ 159 - 90
.eslintrc.js

@@ -7,68 +7,100 @@ module.exports = {
   env: {
     browser: true,
     node: true,
-    es6: true,
+    es6: true
   },
   extends: ['plugin:vue/recommended', 'eslint:recommended'],
 
   // add your custom rules here
   //it is base on https://github.com/vuejs/eslint-config-vue
   rules: {
-    "vue/max-attributes-per-line": [2, {
-      "singleline": 10,
-      "multiline": {
-        "max": 1,
-        "allowFirstLine": false
-      }
-    }],
-    "vue/singleline-html-element-content-newline": "off",
-    "vue/multiline-html-element-content-newline":"off",
-    "vue/name-property-casing": ["error", "PascalCase"],
-    "vue/no-v-html": "off",
+    'vue/max-attributes-per-line': [
+      2,
+      {
+        singleline: 10,
+        multiline: {
+          max: 1,
+          allowFirstLine: false
+        }
+      }
+    ],
+    'vue/singleline-html-element-content-newline': 'off',
+    'vue/multiline-html-element-content-newline': 'off',
+    'vue/name-property-casing': ['error', 'PascalCase'],
+    'vue/no-v-html': 'off',
     'accessor-pairs': 2,
-    'arrow-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
+    'arrow-spacing': [
+      2,
+      {
+        before: true,
+        after: true
+      }
+    ],
     'block-spacing': [2, 'always'],
-    'brace-style': [2, '1tbs', {
-      'allowSingleLine': true
-    }],
-    'camelcase': [0, {
-      'properties': 'always'
-    }],
+    'brace-style': [
+      2,
+      '1tbs',
+      {
+        allowSingleLine: true
+      }
+    ],
+    camelcase: [
+      0,
+      {
+        properties: 'always'
+      }
+    ],
     'comma-dangle': [2, 'never'],
-    'comma-spacing': [2, {
-      'before': false,
-      'after': true
-    }],
+    'comma-spacing': [
+      2,
+      {
+        before: false,
+        after: true
+      }
+    ],
     'comma-style': [2, 'last'],
     'constructor-super': 2,
-    'curly': [2, 'multi-line'],
+    curly: [2, 'multi-line'],
     'dot-location': [2, 'property'],
     'eol-last': 2,
-    'eqeqeq': ["error", "always", {"null": "ignore"}],
-    'generator-star-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
+    eqeqeq: ['error', 'always', { null: 'ignore' }],
+    'generator-star-spacing': [
+      2,
+      {
+        before: true,
+        after: true
+      }
+    ],
     'handle-callback-err': [2, '^(err|error)$'],
-    'indent': [2, 2, {
-      'SwitchCase': 1
-    }],
+    indent: [
+      2,
+      2,
+      {
+        SwitchCase: 1
+      }
+    ],
     'jsx-quotes': [2, 'prefer-single'],
-    'key-spacing': [2, {
-      'beforeColon': false,
-      'afterColon': true
-    }],
-    'keyword-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
-    'new-cap': [2, {
-      'newIsCap': true,
-      'capIsNew': false
-    }],
+    'key-spacing': [
+      2,
+      {
+        beforeColon: false,
+        afterColon: true
+      }
+    ],
+    'keyword-spacing': [
+      2,
+      {
+        before: true,
+        after: true
+      }
+    ],
+    'new-cap': [
+      2,
+      {
+        newIsCap: true,
+        capIsNew: false
+      }
+    ],
     'new-parens': 2,
     'no-array-constructor': 2,
     'no-caller': 2,
@@ -99,17 +131,23 @@ module.exports = {
     'no-irregular-whitespace': 2,
     'no-iterator': 2,
     'no-label-var': 2,
-    'no-labels': [2, {
-      'allowLoop': false,
-      'allowSwitch': false
-    }],
+    'no-labels': [
+      2,
+      {
+        allowLoop: false,
+        allowSwitch: false
+      }
+    ],
     'no-lone-blocks': 2,
     'no-mixed-spaces-and-tabs': 2,
     'no-multi-spaces': 2,
     'no-multi-str': 2,
-    'no-multiple-empty-lines': [2, {
-      'max': 1
-    }],
+    'no-multiple-empty-lines': [
+      2,
+      {
+        max: 1
+      }
+    ],
     'no-native-reassign': 2,
     'no-negated-in-lhs': 2,
     'no-new-object': 2,
@@ -137,62 +175,93 @@ module.exports = {
     'no-undef-init': 2,
     'no-unexpected-multiline': 2,
     'no-unmodified-loop-condition': 2,
-    'no-unneeded-ternary': [2, {
-      'defaultAssignment': false
-    }],
+    'no-unneeded-ternary': [
+      2,
+      {
+        defaultAssignment: false
+      }
+    ],
     'no-unreachable': 2,
     'no-unsafe-finally': 2,
-    'no-unused-vars': [2, {
-      'vars': 'all',
-      'args': 'none'
-    }],
+    'no-unused-vars': [
+      2,
+      {
+        vars: 'all',
+        args: 'none'
+      }
+    ],
     'no-useless-call': 2,
     'no-useless-computed-key': 2,
     'no-useless-constructor': 2,
     'no-useless-escape': 0,
     'no-whitespace-before-property': 2,
     'no-with': 2,
-    'one-var': [2, {
-      'initialized': 'never'
-    }],
-    'operator-linebreak': [2, 'after', {
-      'overrides': {
-        '?': 'before',
-        ':': 'before'
-      }
-    }],
+    'one-var': [
+      2,
+      {
+        initialized: 'never'
+      }
+    ],
+    'operator-linebreak': [
+      2,
+      'after',
+      {
+        overrides: {
+          '?': 'before',
+          ':': 'before'
+        }
+      }
+    ],
     'padded-blocks': [2, 'never'],
-    'quotes': [2, 'single', {
-      'avoidEscape': true,
-      'allowTemplateLiterals': true
-    }],
-    'semi': [2, 'never'],
-    'semi-spacing': [2, {
-      'before': false,
-      'after': true
-    }],
+    quotes: [
+      2,
+      'single',
+      {
+        avoidEscape: true,
+        allowTemplateLiterals: true
+      }
+    ],
+    semi: [2, 'never'],
+    'semi-spacing': [
+      2,
+      {
+        before: false,
+        after: true
+      }
+    ],
     'space-before-blocks': [2, 'always'],
     'space-before-function-paren': [2, 'never'],
     'space-in-parens': [2, 'never'],
     'space-infix-ops': 2,
-    'space-unary-ops': [2, {
-      'words': true,
-      'nonwords': false
-    }],
-    'spaced-comment': [2, 'always', {
-      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
-    }],
+    'space-unary-ops': [
+      2,
+      {
+        words: true,
+        nonwords: false
+      }
+    ],
+    'spaced-comment': [
+      2,
+      'always',
+      {
+        markers: ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
+      }
+    ],
     'template-curly-spacing': [2, 'never'],
     'use-isnan': 2,
     'valid-typeof': 2,
     'wrap-iife': [2, 'any'],
     'yield-star-spacing': [2, 'both'],
-    'yoda': [2, 'never'],
+    yoda: [2, 'never'],
     'prefer-const': 2,
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'object-curly-spacing': [2, 'always', {
-      objectsInObjects: false
-    }],
+    'object-curly-spacing': [
+      2,
+      'always',
+      {
+        objectsInObjects: false
+      }
+    ],
     'array-bracket-spacing': [2, 'never']
   }
 }

+ 0 - 2
.history/src/api/stock_20220818144734.js

@@ -36,8 +36,6 @@ export function getReservedList(params) {
   })
 }
 
-
-
 // 获取仓库现存列表
 export function getListStockToDay(params) {
   return request({

+ 2 - 6
.history/src/views/basic_data/stock/product_list_20220818143421.vue

@@ -1,11 +1,7 @@
 <template>
-  <div class="app-container">
-      554
-  </div>
+  <div class="app-container">554</div>
 </template>
 
 <script>
-export default {
-
-}
+export default {}
 </script>

+ 2 - 6
.history/src/views/basic_data/stock/product_list_20220818143532.vue

@@ -1,11 +1,7 @@
 <template>
-  <div class="app-container">
-      554
-  </div>
+  <div class="app-container">554</div>
 </template>
 
 <script>
-export default {
-
-}
+export default {}
 </script>

+ 14 - 8
.history/src/views/basic_data/stock/product_list_20220818143704.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="app-container">
-      <!-- 筛选条件 -->
+    <!-- 筛选条件 -->
     <div class="screen-container">
       <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品大类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择产品大类" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -51,17 +56,18 @@
 
 <script>
 export default {
-    data() {
-      return {
-         screenForm: { // 筛选表单数据
+  data() {
+    return {
+      screenForm: {
+        // 筛选表单数据
         type: '',
         goodsName: '',
         goodsNum: '',
         model: '',
         jxsName: '',
-        jxsNum: '',
-      },
+        jxsNum: ''
       }
-    },
+    }
+  }
 }
 </script>

+ 14 - 8
.history/src/views/basic_data/stock/product_list_20220818143730.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="app-container">
-      <!-- 筛选条件 -->
+    <!-- 筛选条件 -->
     <div class="screen-container">
       <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品大类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择产品大类" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -51,17 +56,18 @@
 
 <script>
 export default {
-    data() {
-      return {
-         screenForm: { // 筛选表单数据
+  data() {
+    return {
+      screenForm: {
+        // 筛选表单数据
         type: '',
         goodsName: '',
         goodsNum: '',
         model: '',
         jxsName: '',
-        jxsNum: '',
-      },
+        jxsNum: ''
       }
-    },
+    }
+  }
 }
 </script>

+ 8 - 7
.history/src/views/basic_data/stock/product_list_20220818143739.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-      <!-- 筛选条件 -->
+    <!-- 筛选条件 -->
     <div class="screen-container">
       <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
@@ -51,17 +51,18 @@
 
 <script>
 export default {
-    data() {
-      return {
-         screenForm: { // 筛选表单数据
+  data() {
+    return {
+      screenForm: {
+        // 筛选表单数据
         type: '',
         goodsName: '',
         goodsNum: '',
         model: '',
         jxsName: '',
-        jxsNum: '',
-      },
+        jxsNum: ''
       }
-    },
+    }
+  }
 }
 </script>

+ 16 - 10
.history/src/views/basic_data/stock/product_list_20220818144052.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-      <!-- 筛选条件 -->
+    <!-- 筛选条件 -->
     <div class="screen-container">
       <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
@@ -17,12 +17,12 @@
               <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
               <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
               <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
@@ -30,7 +30,12 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -49,17 +54,18 @@
 
 <script>
 export default {
-    data() {
-      return {
-         screenForm: { // 筛选表单数据
+  data() {
+    return {
+      screenForm: {
+        // 筛选表单数据
         type: '',
         goodsName: '',
         goodsNum: '',
         model: '',
         jxsName: '',
-        jxsNum: '',
-      },
+        jxsNum: ''
       }
-    },
+    }
+  }
 }
 </script>

+ 23 - 17
.history/src/views/basic_data/stock/product_list_20220818144133.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-      <!-- 筛选条件 -->
+    <!-- 筛选条件 -->
     <div class="screen-container">
       <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
@@ -17,12 +17,12 @@
               <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
               <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
               <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
@@ -30,7 +30,12 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -50,26 +55,27 @@
 <script>
 import { getDictList } from '@/api/common'
 export default {
-    data() {
-      return {
-         screenForm: { // 筛选表单数据
+  data() {
+    return {
+      screenForm: {
+        // 筛选表单数据
         type: '',
         goodsName: '',
         goodsNum: '',
         model: '',
         jxsName: '',
-        jxsNum: '',
+        jxsNum: ''
       },
-      typeList: [],
-      }
-    },
+      typeList: []
+    }
+  },
 
-    methods: {
-        getDictList() {
-      getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
-        this.typeList = res.data;
+  methods: {
+    getDictList() {
+      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
+        this.typeList = res.data
       })
-    },
-    },
+    }
+  }
 }
 </script>

+ 39 - 20
.history/src/views/basic_data/stock/product_list_20220818144316.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="app-container">
-      <!-- 筛选条件 -->
+    <!-- 筛选条件 -->
     <div class="screen-container">
       <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -16,12 +21,12 @@
               <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
               <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
               <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
@@ -29,7 +34,12 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -50,11 +60,19 @@
         </div>
       </div>
       <div class="table">
-        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{scope.row.customerNumber}}</span>
+              <span>{{ scope.row.customerNumber }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -66,26 +84,27 @@
 <script>
 import { getDictList } from '@/api/common'
 export default {
-    data() {
-      return {
-         screenForm: { // 筛选表单数据
+  data() {
+    return {
+      screenForm: {
+        // 筛选表单数据
         type: '',
         goodsName: '',
         goodsNum: '',
         model: '',
         jxsName: '',
-        jxsNum: '',
+        jxsNum: ''
       },
-      typeList: [],
-      }
-    },
+      typeList: []
+    }
+  },
 
-    methods: {
-        getDictList() {
-      getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
-        this.typeList = res.data;
+  methods: {
+    getDictList() {
+      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
+        this.typeList = res.data
       })
-    },
-    },
+    }
+  }
 }
 </script>

+ 40 - 22
.history/src/views/basic_data/stock/product_list_20220818144338.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="app-container">
-      <!-- 筛选条件 -->
+    <!-- 筛选条件 -->
     <div class="screen-container">
       <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -16,12 +21,12 @@
               <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
               <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
               <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
@@ -29,7 +34,12 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -50,11 +60,19 @@
         </div>
       </div>
       <div class="table">
-        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{scope.row.customerNumber}}</span>
+              <span>{{ scope.row.customerNumber }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -66,29 +84,29 @@
 <script>
 import { getDictList } from '@/api/common'
 export default {
-    data() {
-      return {
-         screenForm: { // 筛选表单数据
+  data() {
+    return {
+      screenForm: {
+        // 筛选表单数据
         type: '',
         goodsName: '',
         goodsNum: '',
         model: '',
         jxsName: '',
-        jxsNum: '',
+        jxsNum: ''
       },
       typeList: [],
-      dataList:[],
-      listLoading:false,
-
-      }
-    },
+      dataList: [],
+      listLoading: false
+    }
+  },
 
-    methods: {
-        getDictList() {
-      getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
-        this.typeList = res.data;
+  methods: {
+    getDictList() {
+      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
+        this.typeList = res.data
       })
-    },
-    },
+    }
+  }
 }
 </script>

+ 42 - 24
.history/src/views/basic_data/stock/product_list_20220818144428.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="app-container">
-      <!-- 筛选条件 -->
+    <!-- 筛选条件 -->
     <div class="screen-container">
       <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -16,12 +21,12 @@
               <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
               <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
               <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
@@ -29,7 +34,12 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -50,11 +60,19 @@
         </div>
       </div>
       <div class="table">
-        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{scope.row.customerNumber}}</span>
+              <span>{{ scope.row.customerNumber }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -66,22 +84,22 @@
 <script>
 import { getDictList } from '@/api/common'
 export default {
-    data() {
-      return {
-         screenForm: { // 筛选表单数据
+  data() {
+    return {
+      screenForm: {
+        // 筛选表单数据
         type: '',
         goodsName: '',
         goodsNum: '',
         model: '',
         jxsName: '',
-        jxsNum: '',
+        jxsNum: ''
       },
       typeList: [],
-      dataList:[],
-      listLoading:false,
-
-      }
-    },
+      dataList: [],
+      listLoading: false
+    }
+  },
 
   computed: {
     exParams() {
@@ -91,16 +109,16 @@ export default {
         specification: this.screenForm.model,
         mainNumber: this.screenForm.type,
         customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
+        customerNumber: this.screenForm.jxsNum
       }
-    },
+    }
   },
-    methods: {
-        getDictList() {
-      getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
-        this.typeList = res.data;
+  methods: {
+    getDictList() {
+      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
+        this.typeList = res.data
       })
-    },
-    },
+    }
+  }
 }
 </script>

+ 45 - 26
.history/src/views/basic_data/stock/product_list_20220818144456.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="app-container">
-      <!-- 筛选条件 -->
+    <!-- 筛选条件 -->
     <div class="screen-container">
       <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -16,12 +21,12 @@
               <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
               <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
               <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
@@ -29,7 +34,12 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -50,17 +60,25 @@
         </div>
       </div>
       <div class="table">
-        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{scope.row.customerNumber}}</span>
+              <span>{{ scope.row.customerNumber }}</span>
             </template>
           </el-table-column>
         </el-table>
       </div>
     </div>
-       <div class="pagination clearfix">
+    <div class="pagination clearfix">
       <div class="fr">
         <el-pagination
           @size-change="handleSizeChange"
@@ -69,7 +87,8 @@
           :page-sizes="[10, 20, 30, 50]"
           :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal">
+          :total="listTotal"
+        >
         </el-pagination>
       </div>
     </div>
@@ -79,22 +98,22 @@
 <script>
 import { getDictList } from '@/api/common'
 export default {
-    data() {
-      return {
-         screenForm: { // 筛选表单数据
+  data() {
+    return {
+      screenForm: {
+        // 筛选表单数据
         type: '',
         goodsName: '',
         goodsNum: '',
         model: '',
         jxsName: '',
-        jxsNum: '',
+        jxsNum: ''
       },
       typeList: [],
-      dataList:[],
-      listLoading:false,
-
-      }
-    },
+      dataList: [],
+      listLoading: false
+    }
+  },
 
   computed: {
     exParams() {
@@ -104,16 +123,16 @@ export default {
         specification: this.screenForm.model,
         mainNumber: this.screenForm.type,
         customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
+        customerNumber: this.screenForm.jxsNum
       }
-    },
+    }
   },
-    methods: {
-        getDictList() {
-      getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
-        this.typeList = res.data;
+  methods: {
+    getDictList() {
+      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
+        this.typeList = res.data
       })
-    },
-    },
+    }
+  }
 }
 </script>

+ 45 - 26
.history/src/views/basic_data/stock/product_list_20220818144523.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="app-container">
-      <!-- 筛选条件 -->
+    <!-- 筛选条件 -->
     <div class="screen-container">
       <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -16,12 +21,12 @@
               <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
-           <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
               <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
               <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
@@ -29,7 +34,12 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.dictCode"
+                  :label="item.dictValue"
+                  :value="item.dictCode"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -50,17 +60,25 @@
         </div>
       </div>
       <div class="table">
-        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{scope.row.customerNumber}}</span>
+              <span>{{ scope.row.customerNumber }}</span>
             </template>
           </el-table-column>
         </el-table>
       </div>
     </div>
-       <div class="pagination clearfix">
+    <div class="pagination clearfix">
       <div class="fr">
         <el-pagination
           @size-change="handleSizeChange"
@@ -69,7 +87,8 @@
           :page-sizes="[10, 20, 30, 50]"
           :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal">
+          :total="listTotal"
+        >
         </el-pagination>
       </div>
     </div>
@@ -79,25 +98,25 @@
 <script>
 import { getDictList } from '@/api/common'
 export default {
-    data() {
-      return {
-              currentPage: 1, // 当前页码
+  data() {
+    return {
+      currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-         screenForm: { // 筛选表单数据
+      screenForm: {
+        // 筛选表单数据
         type: '',
         goodsName: '',
         goodsNum: '',
         model: '',
         jxsName: '',
-        jxsNum: '',
+        jxsNum: ''
       },
-      typeList: [],
-
-      }
-    },
+      typeList: []
+    }
+  },
 
   computed: {
     exParams() {
@@ -107,16 +126,16 @@ export default {
         specification: this.screenForm.model,
         mainNumber: this.screenForm.type,
         customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
+        customerNumber: this.screenForm.jxsNum
       }
-    },
+    }
   },
-    methods: {
-        getDictList() {
-      getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
-        this.typeList = res.data;
+  methods: {
+    getDictList() {
+      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
+        this.typeList = res.data
       })
-    },
-    },
+    }
+  }
 }
 </script>

+ 35 - 64
.history/src/views/basic_data/stock/product_list_20220818144541.vue

@@ -2,21 +2,11 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form
-        ref="screenForm"
-        :model="screenForm"
-        label-width="90px"
-        size="mini"
-        label-position="left"
-      >
+      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择仓库"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -28,35 +18,22 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品编码" prop="goodsNum">
-              <el-input
-                v-model="screenForm.goodsNum"
-                placeholder="请输入产品编码"
-              ></el-input>
+              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
-              <el-input
-                v-model="screenForm.model"
-                placeholder="请输入厂产品代码"
-              ></el-input>
+              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
-              <el-input
-                v-model="screenForm.goodsName"
-                placeholder="请输入产品名称"
-              ></el-input>
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择品类"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -92,13 +69,7 @@
           highlight-current-row
           stripe
         >
-          <el-table-column
-            align="left"
-            label="经销商编码"
-            prop="customerNumber"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
               <span>{{ scope.row.customerNumber }}</span>
@@ -125,7 +96,7 @@
 </template>
 
 <script>
-import { getDictList } from "@/api/common";
+import { getDictList } from '@/api/common'
 export default {
   data() {
     return {
@@ -136,15 +107,15 @@ export default {
       listLoading: false, // 列表加载loading
       screenForm: {
         // 筛选表单数据
-        type: "",
-        goodsName: "",
-        goodsNum: "",
-        model: "",
-        jxsName: "",
-        jxsNum: "",
+        type: '',
+        goodsName: '',
+        goodsNum: '',
+        model: '',
+        jxsName: '',
+        jxsNum: ''
       },
-      typeList: [],
-    };
+      typeList: []
+    }
   },
 
   computed: {
@@ -155,41 +126,41 @@ export default {
         specification: this.screenForm.model,
         mainNumber: this.screenForm.type,
         customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
-      };
-    },
+        customerNumber: this.screenForm.jxsNum
+      }
+    }
   },
   methods: {
     getDictList() {
-      getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
-        this.typeList = res.data;
-      });
+      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
+        this.typeList = res.data
+      })
     },
     // 提交筛选表单
     submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
+      this.currentPage = 1
+      this.getList()
     },
 
     // 重置筛选表单
     resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
+      this.$refs.screenForm.resetFields()
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改每页数量
     handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
+      this.pageSize = val
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改当前页
     handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
-  },
-};
+      this.currentPage = val
+      this.getList()
+    }
+  }
+}
 </script>

+ 7 - 36
.history/src/views/basic_data/stock/product_list_20220818144800.vue

@@ -2,21 +2,11 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form
-        ref="screenForm"
-        :model="screenForm"
-        label-width="90px"
-        size="mini"
-        label-position="left"
-      >
+      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择仓库"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -28,35 +18,22 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品编码" prop="goodsNum">
-              <el-input
-                v-model="screenForm.goodsNum"
-                placeholder="请输入产品编码"
-              ></el-input>
+              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
-              <el-input
-                v-model="screenForm.model"
-                placeholder="请输入厂产品代码"
-              ></el-input>
+              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
-              <el-input
-                v-model="screenForm.goodsName"
-                placeholder="请输入产品名称"
-              ></el-input>
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择品类"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -92,13 +69,7 @@
           highlight-current-row
           stripe
         >
-          <el-table-column
-            align="left"
-            label="经销商编码"
-            prop="customerNumber"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
               <span>{{ scope.row.customerNumber }}</span>

+ 7 - 36
.history/src/views/basic_data/stock/product_list_20220818144930.vue

@@ -2,21 +2,11 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form
-        ref="screenForm"
-        :model="screenForm"
-        label-width="90px"
-        size="mini"
-        label-position="left"
-      >
+      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择仓库"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -28,35 +18,22 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品编码" prop="goodsNum">
-              <el-input
-                v-model="screenForm.goodsNum"
-                placeholder="请输入产品编码"
-              ></el-input>
+              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
-              <el-input
-                v-model="screenForm.model"
-                placeholder="请输入厂产品代码"
-              ></el-input>
+              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
-              <el-input
-                v-model="screenForm.goodsName"
-                placeholder="请输入产品名称"
-              ></el-input>
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择品类"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -92,13 +69,7 @@
           highlight-current-row
           stripe
         >
-          <el-table-column
-            align="left"
-            label="经销商编码"
-            prop="customerNumber"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
               <span>{{ scope.row.customerNumber }}</span>

+ 7 - 36
.history/src/views/basic_data/stock/product_list_20220818144933.vue

@@ -2,21 +2,11 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form
-        ref="screenForm"
-        :model="screenForm"
-        label-width="90px"
-        size="mini"
-        label-position="left"
-      >
+      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择仓库"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -28,35 +18,22 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品编码" prop="goodsNum">
-              <el-input
-                v-model="screenForm.goodsNum"
-                placeholder="请输入产品编码"
-              ></el-input>
+              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
-              <el-input
-                v-model="screenForm.model"
-                placeholder="请输入厂产品代码"
-              ></el-input>
+              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
-              <el-input
-                v-model="screenForm.goodsName"
-                placeholder="请输入产品名称"
-              ></el-input>
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择品类"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -92,13 +69,7 @@
           highlight-current-row
           stripe
         >
-          <el-table-column
-            align="left"
-            label="经销商编码"
-            prop="customerNumber"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
               <span>{{ scope.row.customerNumber }}</span>

+ 7 - 36
.history/src/views/basic_data/stock/product_list_20220818144956.vue

@@ -2,21 +2,11 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form
-        ref="screenForm"
-        :model="screenForm"
-        label-width="90px"
-        size="mini"
-        label-position="left"
-      >
+      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择仓库"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -28,35 +18,22 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品编码" prop="goodsNum">
-              <el-input
-                v-model="screenForm.goodsNum"
-                placeholder="请输入产品编码"
-              ></el-input>
+              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
-              <el-input
-                v-model="screenForm.model"
-                placeholder="请输入厂产品代码"
-              ></el-input>
+              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
-              <el-input
-                v-model="screenForm.goodsName"
-                placeholder="请输入产品名称"
-              ></el-input>
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择品类"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -92,13 +69,7 @@
           highlight-current-row
           stripe
         >
-          <el-table-column
-            align="left"
-            label="经销商编码"
-            prop="customerNumber"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
               <span>{{ scope.row.customerNumber }}</span>

+ 7 - 36
.history/src/views/basic_data/stock/product_list_20220818145008.vue

@@ -2,21 +2,11 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form
-        ref="screenForm"
-        :model="screenForm"
-        label-width="90px"
-        size="mini"
-        label-position="left"
-      >
+      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择仓库"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -28,35 +18,22 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品编码" prop="goodsNum">
-              <el-input
-                v-model="screenForm.goodsNum"
-                placeholder="请输入产品编码"
-              ></el-input>
+              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
-              <el-input
-                v-model="screenForm.model"
-                placeholder="请输入厂产品代码"
-              ></el-input>
+              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
-              <el-input
-                v-model="screenForm.goodsName"
-                placeholder="请输入产品名称"
-              ></el-input>
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择品类"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -92,13 +69,7 @@
           highlight-current-row
           stripe
         >
-          <el-table-column
-            align="left"
-            label="经销商编码"
-            prop="customerNumber"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
               <span>{{ scope.row.customerNumber }}</span>

+ 7 - 36
.history/src/views/basic_data/stock/product_list_20220818145018.vue

@@ -2,21 +2,11 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form
-        ref="screenForm"
-        :model="screenForm"
-        label-width="90px"
-        size="mini"
-        label-position="left"
-      >
+      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择仓库"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -28,35 +18,22 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品编码" prop="goodsNum">
-              <el-input
-                v-model="screenForm.goodsNum"
-                placeholder="请输入产品编码"
-              ></el-input>
+              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
-              <el-input
-                v-model="screenForm.model"
-                placeholder="请输入厂产品代码"
-              ></el-input>
+              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
-              <el-input
-                v-model="screenForm.goodsName"
-                placeholder="请输入产品名称"
-              ></el-input>
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择品类"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -92,13 +69,7 @@
           highlight-current-row
           stripe
         >
-          <el-table-column
-            align="left"
-            label="经销商编码"
-            prop="customerNumber"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
               <span>{{ scope.row.customerNumber }}</span>

+ 40 - 71
.history/src/views/basic_data/stock/product_list_20220818145031.vue

@@ -2,21 +2,11 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form
-        ref="screenForm"
-        :model="screenForm"
-        label-width="90px"
-        size="mini"
-        label-position="left"
-      >
+      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择仓库"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择仓库" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -28,35 +18,22 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品编码" prop="goodsNum">
-              <el-input
-                v-model="screenForm.goodsNum"
-                placeholder="请输入产品编码"
-              ></el-input>
+              <el-input v-model="screenForm.goodsNum" placeholder="请输入产品编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="厂产品代码" prop="model">
-              <el-input
-                v-model="screenForm.model"
-                placeholder="请输入厂产品代码"
-              ></el-input>
+              <el-input v-model="screenForm.model" placeholder="请输入厂产品代码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
-              <el-input
-                v-model="screenForm.goodsName"
-                placeholder="请输入产品名称"
-              ></el-input>
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="品类" prop="type">
-              <el-select
-                v-model="screenForm.type"
-                placeholder="请选择品类"
-                clearable
-              >
+              <el-select v-model="screenForm.type" placeholder="请选择品类" clearable>
                 <el-option
                   v-for="item in typeList"
                   :key="item.dictCode"
@@ -92,13 +69,7 @@
           highlight-current-row
           stripe
         >
-          <el-table-column
-            align="left"
-            label="经销商编码"
-            prop="customerNumber"
-            min-width="100"
-            show-overflow-tooltip
-          >
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerNumber" />
               <span>{{ scope.row.customerNumber }}</span>
@@ -125,8 +96,8 @@
 </template>
 
 <script>
-import { getListStockToDay } from "@/api/stock";
-import { getDictList } from "@/api/common";
+import { getListStockToDay } from '@/api/stock'
+import { getDictList } from '@/api/common'
 export default {
   data() {
     return {
@@ -137,15 +108,15 @@ export default {
       listLoading: false, // 列表加载loading
       screenForm: {
         // 筛选表单数据
-        type: "",
-        goodsName: "",
-        goodsNum: "",
-        model: "",
-        jxsName: "",
-        jxsNum: "",
+        type: '',
+        goodsName: '',
+        goodsNum: '',
+        model: '',
+        jxsName: '',
+        jxsNum: ''
       },
-      typeList: [],
-    };
+      typeList: []
+    }
   },
 
   computed: {
@@ -156,51 +127,49 @@ export default {
         specification: this.screenForm.model,
         mainNumber: this.screenForm.type,
         customerName: this.screenForm.jxsName,
-        customerNumber: this.screenForm.jxsNum,
-      };
-    },
+        customerNumber: this.screenForm.jxsNum
+      }
+    }
   },
   methods: {
-
-    getList(){
+    getList() {
       const parmas = {
-        pageNum:1
+        pageNum: 1
       }
-      getListStockToDay().then(res=>{
+      getListStockToDay().then(res => {
         this.dataList = res.data.records
       })
-    }
-      ,
+    },
     getDictList() {
-      getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
-        this.typeList = res.data;
-      });
+      getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then(res => {
+        this.typeList = res.data
+      })
     },
     // 提交筛选表单
     submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
+      this.currentPage = 1
+      this.getList()
     },
 
     // 重置筛选表单
     resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
+      this.$refs.screenForm.resetFields()
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改每页数量
     handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
+      this.pageSize = val
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改当前页
     handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
-    },
-  },
-};
+      this.currentPage = val
+      this.getList()
+    }
+  }
+}
 </script>

+ 1 - 3
.history/src/views/stock/product_list_20220818143351.vue

@@ -1,5 +1,3 @@
 <template>
-  <div class="app-container">
-
-  </div>
+  <div class="app-container"></div>
 </template>

+ 1 - 3
.history/src/views/stock/product_list_20220818143354.vue

@@ -1,5 +1,3 @@
 <template>
-  <div class="app-container">
-      554
-  </div>
+  <div class="app-container">554</div>
 </template>

+ 2 - 6
.history/src/views/stock/product_list_20220818143422.vue

@@ -1,11 +1,7 @@
 <template>
-  <div class="app-container">
-      554
-  </div>
+  <div class="app-container">554</div>
 </template>
 
 <script>
-export default {
-
-}
+export default {}
 </script>

+ 9 - 8
.prettierrc

@@ -1,9 +1,10 @@
-module.exports = {
-  printWidth: 120, // 超过最大值换行
-  semi: false, // 结尾使用分号
-  singleQuote: true, // 使用单引号
-  tabWidth: 2, // 缩进字节数
-  trailingComma: 'es5', // 在对象或数组最后一个元素后面是否加逗号(在ES5中加尾逗号)
-  arrowParens: 'avoid', // (x) => {} 箭头函数参数只有一个时是否要有小括号。avoid:省略括号
-  endOfLine: 'auto', // 结尾换行 (\n|\r|\n\r) : 'lf' | 'crlf' | 'auto'
+{
+  "printWidth": 120,
+  "semi": false,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "none",
+  "arrowParens": "avoid",
+  "endOfLine": "auto",
+  "bracketSpacing": true
 }

+ 2 - 2
README-zh.md

@@ -92,8 +92,8 @@ npm run lint -- --fix
 Modern browsers and Internet Explorer 10+.
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
-| --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| IE10, IE11, Edge                                                                                                                                                                                                | last 2 versions                                                                                                                                                                                                   | last 2 versions                                                                                                                                                                                               | last 2 versions                                                                                                                                                                                               |
 
 ## License
 

+ 2 - 3
README.md

@@ -6,7 +6,6 @@ English | [简体中文](./README-zh.md)
 
 **Live demo:** http://panjiachen.github.io/vue-admin-template
 
-
 **The current version is `v4.0+` build on `vue-cli`. If you want to use the old version , you can switch branch to [tag/3.11.0](https://github.com/PanJiaChen/vue-admin-template/tree/tag/3.11.0), it does not rely on `vue-cli`**
 
 ## Build Setup
@@ -80,8 +79,8 @@ For `typescript` version, you can use [vue-typescript-admin-template](https://gi
 Modern browsers and Internet Explorer 10+.
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
-| --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| IE10, IE11, Edge                                                                                                                                                                                                | last 2 versions                                                                                                                                                                                                   | last 2 versions                                                                                                                                                                                               | last 2 versions                                                                                                                                                                                               |
 
 ## License
 

+ 3 - 3
babel.config.js

@@ -3,12 +3,12 @@ module.exports = {
     // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
     '@vue/cli-plugin-babel/preset'
   ],
-  'env': {
-    'development': {
+  env: {
+    development: {
       // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
       // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
       // https://panjiachen.github.io/vue-element-admin-site/guide/advanced/lazy-loading.html
-      'plugins': ['dynamic-import-node']
+      plugins: ['dynamic-import-node']
     }
   }
 }

+ 8 - 9
jest.config.js

@@ -2,23 +2,22 @@ module.exports = {
   moduleFileExtensions: ['js', 'jsx', 'json', 'vue'],
   transform: {
     '^.+\\.vue$': 'vue-jest',
-    '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$':
-      'jest-transform-stub',
+    '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
     '^.+\\.jsx?$': 'babel-jest'
   },
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/src/$1'
   },
   snapshotSerializers: ['jest-serializer-vue'],
-  testMatch: [
-    '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
+  testMatch: ['**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'],
+  collectCoverageFrom: [
+    'src/utils/**/*.{js,vue}',
+    '!src/utils/auth.js',
+    '!src/utils/request.js',
+    'src/components/**/*.{js,vue}'
   ],
-  collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'],
   coverageDirectory: '<rootDir>/tests/unit/coverage',
   // 'collectCoverage': true,
-  'coverageReporters': [
-    'lcov',
-    'text-summary'
-  ],
+  coverageReporters: ['lcov', 'text-summary'],
   testURL: 'http://localhost/'
 }

+ 1 - 1
jsconfig.json

@@ -3,7 +3,7 @@
     "baseUrl": "./",
     "jsx": "preserve",
     "paths": {
-        "@/*": ["src/*"]
+      "@/*": ["src/*"]
     }
   },
   "exclude": ["node_modules", "dist"]

+ 3 - 7
mock/index.js

@@ -4,10 +4,7 @@ const { param2Obj } = require('./utils')
 const user = require('./user')
 const table = require('./table')
 
-const mocks = [
-  ...user,
-  ...table
-]
+const mocks = [...user, ...table]
 
 // for front mock
 // please use it cautiously, it will redefine XMLHttpRequest,
@@ -16,7 +13,7 @@ function mockXHR() {
   // mock patch
   // https://github.com/nuysoft/Mock/issues/300
   Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send
-  Mock.XHR.prototype.send = function() {
+  Mock.XHR.prototype.send = function () {
     if (this.custom.xhr) {
       this.custom.xhr.withCredentials = this.withCredentials || false
 
@@ -28,7 +25,7 @@ function mockXHR() {
   }
 
   function XHR2ExpressReqWrap(respond) {
-    return function(options) {
+    return function (options) {
       let result = null
       if (respond instanceof Function) {
         const { body, type, url } = options
@@ -54,4 +51,3 @@ module.exports = {
   mocks,
   mockXHR
 }
-

+ 25 - 21
mock/mock-server.js

@@ -47,35 +47,39 @@ module.exports = app => {
   // parse app.body
   // https://expressjs.com/en/4x/api.html#req.body
   app.use(bodyParser.json())
-  app.use(bodyParser.urlencoded({
-    extended: true
-  }))
+  app.use(
+    bodyParser.urlencoded({
+      extended: true
+    })
+  )
 
   const mockRoutes = registerRoutes(app)
   var mockRoutesLength = mockRoutes.mockRoutesLength
   var mockStartIndex = mockRoutes.mockStartIndex
 
   // watch files, hot reload mock server
-  chokidar.watch(mockDir, {
-    ignored: /mock-server/,
-    ignoreInitial: true
-  }).on('all', (event, path) => {
-    if (event === 'change' || event === 'add') {
-      try {
-        // remove mock routes stack
-        app._router.stack.splice(mockStartIndex, mockRoutesLength)
+  chokidar
+    .watch(mockDir, {
+      ignored: /mock-server/,
+      ignoreInitial: true
+    })
+    .on('all', (event, path) => {
+      if (event === 'change' || event === 'add') {
+        try {
+          // remove mock routes stack
+          app._router.stack.splice(mockStartIndex, mockRoutesLength)
 
-        // clear routes cache
-        unregisterRoutes()
+          // clear routes cache
+          unregisterRoutes()
 
-        const mockRoutes = registerRoutes(app)
-        mockRoutesLength = mockRoutes.mockRoutesLength
-        mockStartIndex = mockRoutes.mockStartIndex
+          const mockRoutes = registerRoutes(app)
+          mockRoutesLength = mockRoutes.mockRoutesLength
+          mockStartIndex = mockRoutes.mockStartIndex
 
-        console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
-      } catch (error) {
-        console.log(chalk.redBright(error))
+          console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
+        } catch (error) {
+          console.log(chalk.redBright(error))
+        }
       }
-    }
-  })
+    })
 }

+ 10 - 8
mock/table.js

@@ -1,14 +1,16 @@
 const Mock = require('mockjs')
 
 const data = Mock.mock({
-  'items|30': [{
-    id: '@id',
-    title: '@sentence(10, 20)',
-    'status|1': ['published', 'draft', 'deleted'],
-    author: 'name',
-    display_time: '@datetime',
-    pageviews: '@integer(300, 5000)'
-  }]
+  'items|30': [
+    {
+      id: '@id',
+      title: '@sentence(10, 20)',
+      'status|1': ['published', 'draft', 'deleted'],
+      author: 'name',
+      display_time: '@datetime',
+      pageviews: '@integer(300, 5000)'
+    }
+  ]
 })
 
 module.exports = [

+ 1 - 2
mock/user.js

@@ -1,4 +1,3 @@
-
 const tokens = {
   admin: {
     token: 'admin-token'
@@ -49,7 +48,7 @@ module.exports = [
 
   // get user info
   {
-    url: '/vue-admin-template/user/info\.*',
+    url: '/vue-admin-template/user/info.*',
     type: 'get',
     response: config => {
       const { token } = config.query

文件差异内容过多而无法显示
+ 525 - 159
package-lock.json


+ 4 - 1
package.json

@@ -4,9 +4,10 @@
   "description": "A vue admin template with Element UI & axios & iconfont & permission control & lint",
   "author": "Pan <panfree23@gmail.com>",
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "vue-cli-service serve ",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
+    "prettier": "npx prettier --write .",
     "preview": "node build/index.js --preview",
     "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
     "lint": "eslint --ext .js,.vue src",
@@ -34,6 +35,7 @@
     "vue-quill-editor": "^3.0.6",
     "vue-router": "3.0.6",
     "vuex": "3.1.0",
+    "webpack": "^4.46.0",
     "yarn": "^1.22.18"
   },
   "devDependencies": {
@@ -47,6 +49,7 @@
     "babel-jest": "23.6.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "2.4.2",
+    "compression-webpack-plugin": "4.0",
     "connect": "3.6.6",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "6.2.2",

+ 2 - 2
postcss.config.js

@@ -1,8 +1,8 @@
 // https://github.com/michael-ciniawsky/postcss-load-config
 
 module.exports = {
-  'plugins': {
+  plugins: {
     // to edit target browsers: use "browserslist" field in package.json
-    'autoprefixer': {}
+    autoprefixer: {}
   }
 }

+ 15 - 9
public/index.html

@@ -1,19 +1,25 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="utf-8">
-    <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">
-    <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">
+    <meta charset="utf-8" />
+    <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" />
+    <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>
-    <style>
-
-    </style>
+    <style></style>
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong
+        >We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it to
+        continue.</strong
+      >
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->

+ 2 - 6
src/App.vue

@@ -8,13 +8,9 @@
 export default {
   name: 'App',
   data() {
-    return {
-
-    }
+    return {}
   },
 
-  methods: {
-
-  }
+  methods: {}
 }
 </script>

+ 81 - 81
src/api/basic_data/dealer.js

@@ -1,164 +1,164 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 //获取经销商列表
 export function getDealerList(params) {
   return request({
-    url: "/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/list',
+    method: 'get',
+    params
+  })
 }
 //经销商详情
 export function getDealerInfo(params) {
   return request({
-    url: "/customer/detail",
-    method: "get",
-    params,
-  });
+    url: '/customer/detail',
+    method: 'get',
+    params
+  })
 }
 
 //经销商客户存货分类列表
 export function getDealerStockList(params) {
   return request({
-    url: "/customer/pt/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/pt/list',
+    method: 'get',
+    params
+  })
 }
 //新增经销商客户存货分类
 export function getDealerStockAdd(data) {
   return request({
-    url: "/customer/pt/add",
-    method: "post",
-    data,
-  });
+    url: '/customer/pt/add',
+    method: 'post',
+    data
+  })
 }
 //删除经销商客户存货分类
 export function deleDealerStockList(params) {
   return request({
-    url: "/customer/pt/delete",
-    method: "post",
-    params,
-  });
+    url: '/customer/pt/delete',
+    method: 'post',
+    params
+  })
 }
 //经销商工程机配置列表
 export function getDealerDepositList(params) {
   return request({
-    url: "/customer/deposit/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/deposit/list',
+    method: 'get',
+    params
+  })
 }
 //新增经销商工程机配置
 export function getDealerDepositAdd(data) {
   return request({
-    url: "/customer/deposit/add",
-    method: "post",
-    data,
-  });
+    url: '/customer/deposit/add',
+    method: 'post',
+    data
+  })
 }
 //删除经销商工程机配置
 export function deleDealerDeposit(params) {
   return request({
-    url: "/customer/deposit/delete",
-    method: "post",
-    params,
-  });
+    url: '/customer/deposit/delete',
+    method: 'post',
+    params
+  })
 }
 //修改经销商工程机配置
 export function editDealerDeposit(data) {
   return request({
-    url: "/customer/deposit/update",
-    method: "post",
-    data,
-  });
+    url: '/customer/deposit/update',
+    method: 'post',
+    data
+  })
 }
 //经销商工程机配置详情
 export function infoDealerDeposit(params) {
   return request({
-    url: "/customer/deposit/detail",
-    method: "get",
-    params,
-  });
+    url: '/customer/deposit/detail',
+    method: 'get',
+    params
+  })
 }
 //经销商申请列表
 export function getDealerApplyList(params) {
   return request({
-    url: "/customer/apply/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/apply/list',
+    method: 'get',
+    params
+  })
 }
 
 //字典
 export function getDictionaries(params) {
   return request({
-    url: "/common/dict/list",
-    method: "get",
-    params,
-  });
+    url: '/common/dict/list',
+    method: 'get',
+    params
+  })
 }
 //产品类别列表
 export function getProductCategoryList(params) {
   return request({
-    url: "/product-category/list",
-    method: "get",
-    params,
-  });
+    url: '/product-category/list',
+    method: 'get',
+    params
+  })
 }
 //根据父级查询部门
 export function getAdminWebsitByparent(params) {
   return request({
-    url: "/admin/websit/byparent",
-    method: "get",
-    params,
-  });
+    url: '/admin/websit/byparent',
+    method: 'get',
+    params
+  })
 }
 //帐号列表
 export function getAdminUserList(params) {
   return request({
-    url: "/admin/user/list",
-    method: "get",
-    params,
-  });
+    url: '/admin/user/list',
+    method: 'get',
+    params
+  })
 }
 //经销商客户存货分类-详情
 export function getCustomerPtDetail(params) {
   return request({
-    url: "/customer/pt/detail",
-    method: "get",
-    params,
-  });
+    url: '/customer/pt/detail',
+    method: 'get',
+    params
+  })
 }
 //修改经销商客户存货分类
 export function getCustomerPtUpdate(data) {
   return request({
-    url: "/customer/pt/update",
-    method: "post",
-    data,
-  });
+    url: '/customer/pt/update',
+    method: 'post',
+    data
+  })
 }
 //经销商钱包列表
 export function getWalletCustomerList(params) {
   return request({
-    url: "/wallet/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/wallet/customer/list',
+    method: 'get',
+    params
+  })
 }
 //经销商工程机配置详情列表
 export function getCustomerDepositDetailList(params) {
   return request({
-    url: "/customer/deposit/detailList",
-    method: "get",
-    params,
-  });
+    url: '/customer/deposit/detailList',
+    method: 'get',
+    params
+  })
 }
 //获取经销商
 export function getListCustomer(params) {
   return request({
-    url: "/pick/listCustomer",
-    method: "get",
-    params,
-  });
+    url: '/pick/listCustomer',
+    method: 'get',
+    params
+  })
 }

+ 2 - 6
src/api/basic_data/logistics.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-var qs = require('qs');
+var qs = require('qs')
 export function getList(params) {
   return request({
     url: '/admin/user/mch/list',
@@ -8,7 +8,6 @@ export function getList(params) {
   })
 }
 
-
 export function getLogisticsList(params) {
   return request({
     url: '/logistics/list',
@@ -17,7 +16,6 @@ export function getLogisticsList(params) {
   })
 }
 
-
 export function addInof(params) {
   return request({
     url: '/logistics/add',
@@ -26,7 +24,6 @@ export function addInof(params) {
   })
 }
 
-
 export function updateInfo(params) {
   return request({
     url: '/logistics/update',
@@ -35,12 +32,11 @@ export function updateInfo(params) {
   })
 }
 
-
 export function deleteInfo(params) {
   return request({
     url: '/logistics/delete',
     method: 'post',
-    data: params,
+    data: params
     // headers: {
     //   'Content-Type': 'application/x-www-form-urlencoded'
     // }

+ 48 - 75
src/api/basic_data/material.js

@@ -19,11 +19,10 @@ export function editCategory(params) {
   return request({
     url: '/k3/material/edit',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
-
 export function getMaterialList(params) {
   return request({
     url: '/k3/material/list',
@@ -32,7 +31,6 @@ export function getMaterialList(params) {
   })
 }
 
-
 export function getMaterialDetail(params) {
   return request({
     url: '/k3/material/detail',
@@ -45,7 +43,7 @@ export function getProductDelete(params) {
   return request({
     url: '/product-price/delete',
     method: 'post',
-    params: {ids:params.join(',')}
+    params: { ids: params.join(',') }
   })
 }
 
@@ -57,12 +55,11 @@ export function getMachineLlist(params) {
   })
 }
 
-
 export function getMachineEdit(params) {
   return request({
     url: '/machine-record/edit',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
@@ -70,16 +67,15 @@ export function getMachineDel(params) {
   return request({
     url: '/machine-record/del',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
-
 export function getMachineAdd(params) {
   return request({
-    url:'/machine-record/add',
+    url: '/machine-record/add',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
@@ -87,15 +83,15 @@ export function getMachineAdd(params) {
 
 export function getProductAdd(params) {
   return request({
-    url:'/product-compose/add',
+    url: '/product-compose/add',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
 export function getProductDel(params) {
   return request({
-    url:'/product-compose/del',
+    url: '/product-compose/del',
     method: 'post',
     params
   })
@@ -103,7 +99,7 @@ export function getProductDel(params) {
 
 export function getProductDetail(params) {
   return request({
-    url:'/product-compose/detail',
+    url: '/product-compose/detail',
     method: 'get',
     params
   })
@@ -111,37 +107,35 @@ export function getProductDetail(params) {
 
 export function getProductEdit(params) {
   return request({
-    url:'/product-compose/edit',
+    url: '/product-compose/edit',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
 //  /product-compose/export
 
-
 export function getProductList(params) {
   return request({
-    url:'/product-compose/list',
+    url: '/product-compose/list',
     method: 'get',
     params
   })
 }
 
-
 // 产品调价单管理
 
 export function getProductRriceAdd(params) {
   return request({
-    url:'/product-upd-price/add',
+    url: '/product-upd-price/add',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
 export function getDistList(params) {
   return request({
-    url:'/common/dict/list',
+    url: '/common/dict/list',
     method: 'get',
     params
   })
@@ -149,17 +143,15 @@ export function getDistList(params) {
 
 export function getProductRricedel(params) {
   return request({
-    url:'/product-upd-price/del',
+    url: '/product-upd-price/del',
     method: 'post',
-    params:{ids:params.join(',')}
+    params: { ids: params.join(',') }
   })
 }
 
-
-
 export function getProductRriceDetail(params) {
   return request({
-    url:'/product-upd-price/detail',
+    url: '/product-upd-price/detail',
     method: 'get',
     params
   })
@@ -167,15 +159,15 @@ export function getProductRriceDetail(params) {
 
 export function getProductRriceEdit(params) {
   return request({
-    url:'/product-upd-price/edit',
+    url: '/product-upd-price/edit',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
 export function getProductRriceList(params) {
   return request({
-    url:'/product-upd-price/list',
+    url: '/product-upd-price/list',
     method: 'get',
     params
   })
@@ -183,54 +175,48 @@ export function getProductRriceList(params) {
 
 export function getProductRriceRevoke(params) {
   return request({
-    url:'/product-upd-price/revoke',
+    url: '/product-upd-price/revoke',
     method: 'get',
     params
   })
 }
 
-
 export function getProductRriceSubmit(params) {
   return request({
-    url:'/product-upd-price/submit',
+    url: '/product-upd-price/submit',
     method: 'get',
     params
   })
 }
 
-
 // 产品价格列表
 export function getProductPriceList(params) {
   return request({
-    url:'/product-price/list',
+    url: '/product-price/list',
     method: 'get',
     params
   })
 }
 
-
 export function getTypeList(params) {
   return request({
-    url:'/sale/type/list',
+    url: '/sale/type/list',
     method: 'get',
     params
   })
 }
 
-
 export function getTree(params) {
   return request({
-    url:'/admin/websit/tree',
+    url: '/admin/websit/tree',
     method: 'get',
     params
   })
 }
 
-
-
 export function getRebate(params) {
   return request({
-    url:'/wallet/rebate/list',
+    url: '/wallet/rebate/list',
     method: 'get',
     params
   })
@@ -238,20 +224,18 @@ export function getRebate(params) {
 
 export function getWalletList(params) {
   return request({
-    url:'/wallet/list',
+    url: '/wallet/list',
     method: 'get',
     params
   })
 }
 
-
-
 //产品类别
 
 //产品类别列表
 export function getProductCategoryList(params) {
   return request({
-    url:'/product-category/list',
+    url: '/product-category/list',
     method: 'get',
     params
   })
@@ -259,7 +243,7 @@ export function getProductCategoryList(params) {
 //产品类别小类列表
 export function getProductCategorySubList(params) {
   return request({
-    url:'/product-category/sub-list',
+    url: '/product-category/sub-list',
     method: 'get',
     params
   })
@@ -267,7 +251,7 @@ export function getProductCategorySubList(params) {
 //新增产品类别
 export function getProductCategoryAdd(data) {
   return request({
-    url:'/product-category/add',
+    url: '/product-category/add',
     method: 'post',
     data
   })
@@ -275,7 +259,7 @@ export function getProductCategoryAdd(data) {
 //编辑产品类别
 export function getProductCategoryEdit(data) {
   return request({
-    url:'/product-category/edit',
+    url: '/product-category/edit',
     method: 'post',
     data
   })
@@ -283,15 +267,14 @@ export function getProductCategoryEdit(data) {
 //金蝶存货类别列表
 export function getProductCategoryKingDeeCategoryList() {
   return request({
-    url:'/product-category/king-dee-category-list',
-    method: 'get',
-
+    url: '/product-category/king-dee-category-list',
+    method: 'get'
   })
 }
 //新增产品类别小类
 export function getProductCategoryAddSub(data) {
   return request({
-    url:'/product-category/add-sub',
+    url: '/product-category/add-sub',
     method: 'post',
     data
   })
@@ -300,7 +283,7 @@ export function getProductCategoryAddSub(data) {
 //删除产品类别小类
 export function getProductCategoryDelSub(params) {
   return request({
-    url:'/product-category/del-sub',
+    url: '/product-category/del-sub',
     method: 'post',
     params
   })
@@ -308,58 +291,48 @@ export function getProductCategoryDelSub(params) {
 //删除产品类别
 export function getProductCategoryDel(params) {
   return request({
-    url:'/product-category/del',
+    url: '/product-category/del',
     method: 'post',
     params
   })
 }
 
-
 // 业务员
 export function getUserList(params) {
   return request({
-    url:'/admin/user/list',
+    url: '/admin/user/list',
     method: 'get',
     params
   })
 }
 
-
 export function getPriceSubmit(params) {
   return request({
-    url:'/product-upd-price/submit',
+    url: '/product-upd-price/submit',
     method: 'POST',
     params
   })
 }
 
-
-
-export function handlePriceRevoke(params){
+export function handlePriceRevoke(params) {
   return request({
-    url:'/product-price/revoke',
+    url: '/product-price/revoke',
     method: 'POST',
     params
   })
 }
 
-
-
-
-export function handleEdit(params){
+export function handleEdit(params) {
   return request({
-    url:'/product-upd-price/edit',
+    url: '/product-upd-price/edit',
     method: 'POST',
-    data:params
+    data: params
   })
 }
 
-
-
-
-export function examineData(params){
+export function examineData(params) {
   return request({
-    url:'/product-upd-price/confirm',
+    url: '/product-upd-price/confirm',
     method: 'POST',
     params
   })
@@ -367,7 +340,7 @@ export function examineData(params){
 
 export function getProductRriceConfirm(params) {
   return request({
-    url:'/product-upd-price/confirm',
+    url: '/product-upd-price/confirm',
     method: 'POST',
     params
   })

+ 0 - 1
src/api/basic_data/supplier.js

@@ -17,7 +17,6 @@ export function getInfoApi(params) {
   })
 }
 
-
 export function getSupplierList(params) {
   return request({
     url: '/supplier/list',

+ 1 - 1
src/api/basic_data/taker.js

@@ -87,4 +87,4 @@ export function exportCarList(params) {
     method: 'get',
     params
   })
-}
+}

+ 17 - 17
src/api/basic_data/wallet_list.js

@@ -1,34 +1,34 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 //钱包列表(非返利钱包)
 export function getWalletList(params) {
   return request({
-    url: "/wallet/list",
-    method: "get",
-    params,
-  });
+    url: '/wallet/list',
+    method: 'get',
+    params
+  })
 }
 //产品类别列表
 export function getProductCategory(params) {
   return request({
-    url: "/product-category/list",
-    method: "get",
-    params,
-  });
+    url: '/product-category/list',
+    method: 'get',
+    params
+  })
 }
 //绑定品类
 export function getWalletBiandMain(params) {
   return request({
-    url: "/wallet/bindMain",
-    method: "post",
-    params,
-  });
+    url: '/wallet/bindMain',
+    method: 'post',
+    params
+  })
 }
 //现金钱包详情
 export function getWalletDetail(params) {
   return request({
-    url: "/wallet/detail",
-    method: "get",
-    params,
-  });
+    url: '/wallet/detail',
+    method: 'get',
+    params
+  })
 }

+ 69 - 69
src/api/basic_data/warehouse.js

@@ -1,97 +1,97 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 export function getList(params) {
   return request({
-    url: "/stock/list",
-    method: "get",
-    params,
-  });
+    url: '/stock/list',
+    method: 'get',
+    params
+  })
 }
 
 export function getStockDetail(params) {
   return request({
-    url: "/stock/detail",
-    method: "get",
-    params,
-  });
+    url: '/stock/detail',
+    method: 'get',
+    params
+  })
 }
 
 export function getListReserve(params) {
   return request({
-    url: "/stock/listReserve",
-    method: "get",
-    params,
-  });
+    url: '/stock/listReserve',
+    method: 'get',
+    params
+  })
 }
 
 export function getListStock(params) {
   return request({
-    url: "/stock/listStock",
-    method: "get",
-    params,
-  });
+    url: '/stock/listStock',
+    method: 'get',
+    params
+  })
 }
 
 export function addStock(params) {
   return request({
-    url: "/stock/addStock",
-    method: "post",
-    data: params,
-  });
+    url: '/stock/addStock',
+    method: 'post',
+    data: params
+  })
 }
 export function updateStock(params) {
   return request({
-    url: "/stock/updateStock",
-    method: "post",
-    data: params,
-  });
+    url: '/stock/updateStock',
+    method: 'post',
+    data: params
+  })
 }
 export function deleteStock(params) {
   return request({
-    url: "/stock/deleteStock",
-    method: "get",
-    params,
-  });
+    url: '/stock/deleteStock',
+    method: 'get',
+    params
+  })
 }
 
 export function getListToll(params) {
   return request({
-    url: "/stock/listToll",
-    method: "get",
-    params,
-  });
+    url: '/stock/listToll',
+    method: 'get',
+    params
+  })
 }
 
 export function getDetail(params) {
   return request({
-    url: "/stock/detailToll",
-    method: "get",
-    params,
-  });
+    url: '/stock/detailToll',
+    method: 'get',
+    params
+  })
 }
 
 export function updateToll(params) {
   return request({
-    url: "/stock/updateToll",
-    method: "post",
-    data: params,
-  });
+    url: '/stock/updateToll',
+    method: 'post',
+    data: params
+  })
 }
 
 export function addToll(params) {
   return request({
-    url: "/stock/addToll",
-    method: "post",
-    data: params,
-  });
+    url: '/stock/addToll',
+    method: 'post',
+    data: params
+  })
 }
 
 export function deleteToll(params) {
   return request({
-    url: "/stock/deleteToll",
-    method: "get",
-    params,
-  });
+    url: '/stock/deleteToll',
+    method: 'get',
+    params
+  })
 }
 // 导入
 // /stock/importToll
@@ -103,40 +103,40 @@ export function deleteToll(params) {
 
 export function getCustomerList(params) {
   return request({
-    url: "/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/list',
+    method: 'get',
+    params
+  })
 }
 
 export function addReserve(params) {
   return request({
-    url: "/stock/addReserve",
-    method: "post",
-    data: params,
-  });
+    url: '/stock/addReserve',
+    method: 'post',
+    data: params
+  })
 }
 
 export function setStock(params) {
   return request({
-    url: "/stock/update",
-    method: "get",
-    params,
-  });
+    url: '/stock/update',
+    method: 'get',
+    params
+  })
 }
 
 export function updateReserve(params) {
   return request({
-    url: "/stock/updateReserve",
-    method: "post",
-    data: params,
-  });
+    url: '/stock/updateReserve',
+    method: 'post',
+    data: params
+  })
 }
 
 export function categoryList(params) {
   return request({
-    url: "/k3/category/list",
-    method: "get",
-    params,
-  });
+    url: '/k3/category/list',
+    method: 'get',
+    params
+  })
 }

+ 0 - 1
src/api/dashboard.js

@@ -79,4 +79,3 @@ export function setMenuList(params) {
     params
   })
 }
-

+ 3 - 11
src/api/engin_deposit.js

@@ -19,14 +19,12 @@ export function getList(params) {
   })
 }
 
-
-
 // 编辑详情
 export function editInfo(params) {
   return request({
     url: '/deposit-manage/edit',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
@@ -48,9 +46,6 @@ export function geDetail(params) {
   })
 }
 
-
-
-
 // 获取订单详情
 export function geOrderInfo(params) {
   return request({
@@ -60,14 +55,12 @@ export function geOrderInfo(params) {
   })
 }
 
-
-
 // 申请退押
 export function applyDeposit(params) {
   return request({
     url: '/deposit-manage/apply-refund-deposit',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
@@ -76,7 +69,6 @@ export function computeDiff(params) {
   return request({
     url: '/deposit-manage/online-compute-diff',
     method: 'post',
-    data:params
+    data: params
   })
 }
-

+ 36 - 38
src/api/engin_deposit/refund_list.js

@@ -1,76 +1,74 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 押金管理列表
 export function getDepositManageList(params) {
   return request({
-    url: "/deposit-manage/list",
-    method: "get",
-    params,
-  });
+    url: '/deposit-manage/list',
+    method: 'get',
+    params
+  })
 }
 // 同步工程机系统审核资料日期
 export function getDepositManageDate() {
   return request({
-    url: "/deposit-manage/sync-accept-date",
-    method: "get",
-  });
+    url: '/deposit-manage/sync-accept-date',
+    method: 'get'
+  })
 }
 // 押金管理详情
 export function getDepositManageDetail(params) {
   return request({
-    url: "/deposit-manage/detail",
-    method: "get",
-    params,
-  });
+    url: '/deposit-manage/detail',
+    method: 'get',
+    params
+  })
 }
 // 审批退押
 export function getDepositManageExamine(data) {
   return request({
-    url: "/deposit-manage/examine",
-    method: "post",
-    data,
-  });
+    url: '/deposit-manage/examine',
+    method: 'post',
+    data
+  })
 }
 // 编辑退押
 export function getDepositManageEdit(data) {
   return request({
-    url: "/deposit-manage/edit",
-    method: "post",
-    data,
-  });
+    url: '/deposit-manage/edit',
+    method: 'post',
+    data
+  })
 }
 // 押金管理导出
 export function getDepositManagExport(params) {
   return request({
-    url: "/deposit-manage/export",
-    method: "get",
-    params,
-  });
+    url: '/deposit-manage/export',
+    method: 'get',
+    params
+  })
 }
 // 下载押金管理附件
 export function getDepositManageDownZip(params) {
   return request({
-    url: "/deposit-manage/downZip",
-    method: "get",
-    params,
-  });
+    url: '/deposit-manage/downZip',
+    method: 'get',
+    params
+  })
 }
 // 直接下载文件
 export function getCommonFileGetStream(params) {
   return request({
-    url: "/common/file/getStream",
-    method: "get",
-    params,
-  });
+    url: '/common/file/getStream',
+    method: 'get',
+    params
+  })
 }
 
-
-
 // 批量审核家用
 export function examineData(params) {
   return request({
-    url: "/deposit-manage/bach-condition-examine-home",
-    method: "get",
-    params,
-  });
+    url: '/deposit-manage/bach-condition-examine-home',
+    method: 'get',
+    params
+  })
 }

+ 21 - 21
src/api/finance/account_list.js

@@ -1,44 +1,44 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 台账列表
 export function getFinanceStandingBookList(params) {
   return request({
-    url: "/finance/standing/book/list",
-    method: "get",
-    params,
-  });
+    url: '/finance/standing/book/list',
+    method: 'get',
+    params
+  })
 }
 // 一键对账
 export function getFinanceStandingBookCheck(params) {
   return request({
-    url: "/finance/standing/book/check",
-    method: "POST",
-    params,
-  });
+    url: '/finance/standing/book/check',
+    method: 'POST',
+    params
+  })
 }
 // 经销商列表
 export function getCustomerList(params) {
   return request({
-    url: "/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/list',
+    method: 'get',
+    params
+  })
 }
 // 经销商钱包列表
 export function getWalletCustomerList(params) {
   return request({
-    url: "/wallet/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/wallet/customer/list',
+    method: 'get',
+    params
+  })
 }
 
 // 贷款对账列表
 
 export function getFeconciliateList(params) {
   return request({
-    url: "/finance/reconciliate/list",
-    method: "get",
-    params,
-  });
+    url: '/finance/reconciliate/list',
+    method: 'get',
+    params
+  })
 }

+ 13 - 13
src/api/finance/blance_sum.js

@@ -1,26 +1,26 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 财务汇总-字段简单,直接看返回结果接
 export function getFinanceTotalCustomer(params) {
   return request({
-    url: "/finance/totalCustomer",
-    method: "get",
-    params,
-  });
+    url: '/finance/totalCustomer',
+    method: 'get',
+    params
+  })
 }
 // 根据父级查询部门
 export function getAdminWebsitByparent(params) {
   return request({
-    url: "/admin/websit/byparent",
-    method: "get",
-    params,
-  });
+    url: '/admin/websit/byparent',
+    method: 'get',
+    params
+  })
 }
 // 钱包列表(非返利钱包)
 export function getFinanceList(params) {
   return request({
-    url: "/finance/list",
-    method: "get",
-    params,
-  });
+    url: '/finance/list',
+    method: 'get',
+    params
+  })
 }

+ 23 - 24
src/api/finance/change_apply.js

@@ -1,34 +1,33 @@
 import request from '@/utils/request'
 //经销商钱包列表
 export function getWalletCustomerList(params) {
-    return request({
-      url: '/wallet/customer/list',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: '/wallet/customer/list',
+    method: 'get',
+    params
+  })
+}
 
 //用户详情
 export function getUserInfo(params) {
-    return request({
-      url: '/admin/user/detail',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: '/admin/user/detail',
+    method: 'get',
+    params
+  })
+}
 //返利互转-新增
 export function getTransferAdd(params) {
-    return request({
-      url: '/finance/transfer/add',
-      method: 'post',
-      params
-    })
-  }
+  return request({
+    url: '/finance/transfer/add',
+    method: 'post',
+    params
+  })
+}
 //查询同个集团的经销商
 export function getCustomerGroupList() {
-    return request({
-      url: '/customer/group/list',
-      method: 'get',
-      
-    })
-  }
+  return request({
+    url: '/customer/group/list',
+    method: 'get'
+  })
+}

+ 29 - 29
src/api/finance/change_list.js

@@ -1,58 +1,58 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 获取列表
 export function getChangeList(params) {
   return request({
-    url: "/finance/transfer/list",
-    method: "get",
-    params,
-  });
+    url: '/finance/transfer/list',
+    method: 'get',
+    params
+  })
 }
 //列表详情
 export function getChangeListDetail(params) {
   return request({
-    url: "/finance/transfer/detail",
-    method: "get",
-    params,
-  });
+    url: '/finance/transfer/detail',
+    method: 'get',
+    params
+  })
 }
 //返利互转-审核
 export function getChangeListExamine(params) {
   return request({
-    url: "/finance/transfer/examine",
-    method: "post",
-    params,
-  });
+    url: '/finance/transfer/examine',
+    method: 'post',
+    params
+  })
 }
 //返利互转-提审
 export function getTransferSubmit(params) {
   return request({
-    url: "/finance/transfer/apply",
-    method: "post",
-    params,
-  });
+    url: '/finance/transfer/apply',
+    method: 'post',
+    params
+  })
 }
 //返利互转-修改
 export function getTransferEdit(params) {
   return request({
-    url: "/finance/transfer/update",
-    method: "post",
-    params,
-  });
+    url: '/finance/transfer/update',
+    method: 'post',
+    params
+  })
 }
 //返利互转-取消
 export function getTransferCancel(params) {
   return request({
-    url: "/finance/transfer/cancel",
-    method: "post",
-    params,
-  });
+    url: '/finance/transfer/cancel',
+    method: 'post',
+    params
+  })
 }
 //取消审核
 export function getRebateOrderCancel(params) {
   return request({
-    url: "/rebate/order/cancel",
-    method: "post",
-    params,
-  });
+    url: '/rebate/order/cancel',
+    method: 'post',
+    params
+  })
 }

+ 48 - 49
src/api/finance/credit_list.js

@@ -2,67 +2,66 @@ import request from '@/utils/request'
 
 // 信用额度列表-新增
 export function getCreditListAdd(params) {
-    return request({
-      url: '/credit/add',
-      method: 'post',
-      params
-    })
-  }
+  return request({
+    url: '/credit/add',
+    method: 'post',
+    params
+  })
+}
 // 信用额度列表
 export function getCreditList(params) {
-    return request({
-      url: '/credit/list',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: '/credit/list',
+    method: 'get',
+    params
+  })
+}
 // 设置信用额度
 export function getCreditListEdit(params) {
-    return request({
-      url: '/credit/record/add',
-      method: 'post',
-      params
-    })
-  }
+  return request({
+    url: '/credit/record/add',
+    method: 'post',
+    params
+  })
+}
 // 信用额度列表-导出
 export function getCreditListExport(params) {
-    return request({
-      url: '/credit/exportData',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: '/credit/exportData',
+    method: 'get',
+    params
+  })
+}
 //信用额度记录-导出
 export function getCreditExport(params) {
-    return request({
-      url: '/credit/record/export',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: '/credit/record/export',
+    method: 'get',
+    params
+  })
+}
 // 信用额度记录
 export function getCreditRecordList(params) {
-    return request({
-      url: '/credit/record/list',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: '/credit/record/list',
+    method: 'get',
+    params
+  })
+}
 
 // 经销商钱包列表
 export function getWalletCustomerList(params) {
-    return request({
-      url: '/wallet/customer/list/page',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: '/wallet/customer/list/page',
+    method: 'get',
+    params
+  })
+}
 // 经销商列表
 export function getCustomerList(params) {
-    return request({
-      url: '/customer/list',
-      method: 'get',
-      params
-    })
-  }
-
+  return request({
+    url: '/customer/list',
+    method: 'get',
+    params
+  })
+}

+ 12 - 12
src/api/finance/finance_sum.js

@@ -2,17 +2,17 @@ import request from '@/utils/request'
 
 // 财务汇总
 export function getFinanceTotal(params) {
-    return request({
-      url: '/finance/total',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: '/finance/total',
+    method: 'get',
+    params
+  })
+}
 // 产品类别列表
 export function getProductCategoryList(params) {
-    return request({
-      url: '/product-category/list',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: '/product-category/list',
+    method: 'get',
+    params
+  })
+}

+ 27 - 27
src/api/finance/rebate_form.js

@@ -1,55 +1,55 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 // 经销商列表
 export function getCustomerList(params) {
   return request({
-    url: "/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/list',
+    method: 'get',
+    params
+  })
 }
 // 经销商钱包列表
 export function getWalletCustomerList(params) {
   return request({
-    url: "/wallet/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/wallet/customer/list',
+    method: 'get',
+    params
+  })
 }
 // 新增
 export function getRebateOrderAdd(data) {
   return request({
-    url: "/rebate/order/add",
-    method: "post",
-    data,
-  });
+    url: '/rebate/order/add',
+    method: 'post',
+    data
+  })
 }
 // 提审
 export function getRebateOrderApply(params) {
   return request({
-    url: "/rebate/order/apply",
-    method: "post",
-    params,
-  });
+    url: '/rebate/order/apply',
+    method: 'post',
+    params
+  })
 }
 // 列表
 export function getRebateOrderList(params) {
   return request({
-    url: "/rebate/order/list",
-    method: "get",
-    params,
-  });
+    url: '/rebate/order/list',
+    method: 'get',
+    params
+  })
 }
 // 下载销售返利单模板
 export function getRebateOrderDownLoad() {
   return request({
-    url: "/rebate/order/download",
-    method: "get",
-  });
+    url: '/rebate/order/download',
+    method: 'get'
+  })
 }
 // 导入销售返利单数据
 export function getRebateOrderImport() {
   return request({
-    url: "/rebate/order/import",
-    method: "post",
-  });
+    url: '/rebate/order/import',
+    method: 'post'
+  })
 }

+ 49 - 49
src/api/finance/rebate_list.js

@@ -1,97 +1,97 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 // 列表
 export function getRebateOrderList(params) {
   return request({
-    url: "/rebate/order/list",
-    method: "get",
-    params,
-  });
+    url: '/rebate/order/list',
+    method: 'get',
+    params
+  })
 }
 // 提审
 export function getRebateOrderApply(params) {
   return request({
-    url: "/rebate/order/apply",
-    method: "post",
-    params,
-  });
+    url: '/rebate/order/apply',
+    method: 'post',
+    params
+  })
 }
 // 审核
 export function getRebateOrderExamine(params) {
   return request({
-    url: "/rebate/order/examine",
-    method: "post",
-    params,
-  });
+    url: '/rebate/order/examine',
+    method: 'post',
+    params
+  })
 }
 // 复核
 export function getRebateOrderExamine2(data) {
   return request({
-    url: "/rebate/order/examine2",
-    method: "post",
-    data,
-  });
+    url: '/rebate/order/examine2',
+    method: 'post',
+    data
+  })
 }
 // 详情
 export function getRebateOrderDetail(params) {
   return request({
-    url: "/rebate/order/detail",
-    method: "get",
-    params,
-  });
+    url: '/rebate/order/detail',
+    method: 'get',
+    params
+  })
 }
 // 客户确认
 export function getRebateOrderAck(data) {
   return request({
-    url: "/rebate/order/ack",
-    method: "post",
-    data,
-  });
+    url: '/rebate/order/ack',
+    method: 'post',
+    data
+  })
 }
 // 编辑
 export function getRebateOrderUpdate(data) {
   return request({
-    url: "/rebate/order/update",
-    method: "post",
-    data,
-  });
+    url: '/rebate/order/update',
+    method: 'post',
+    data
+  })
 }
 // 批量删除
 export function getRebateOrderBatchDel(params) {
   return request({
-    url: "/rebate/order/batchDel",
-    method: "post",
-    params,
-  });
+    url: '/rebate/order/batchDel',
+    method: 'post',
+    params
+  })
 }
 // 批量申请
 export function getRebateOrderApplyBatch(params) {
   return request({
-    url: "/rebate/order/apply/batch",
-    method: "post",
-    params,
-  });
+    url: '/rebate/order/apply/batch',
+    method: 'post',
+    params
+  })
 }
 // 批量审核
 export function getRebateOrderExamineBatch(params) {
   return request({
-    url: "/rebate/order/examine/batch",
-    method: "post",
-    params,
-  });
+    url: '/rebate/order/examine/batch',
+    method: 'post',
+    params
+  })
 }
 // 批量复核
 export function getRebateOrderExamine2Batch(params) {
   return request({
-    url: "/rebate/order/examine2/batch",
-    method: "post",
-    params,
-  });
+    url: '/rebate/order/examine2/batch',
+    method: 'post',
+    params
+  })
 }
 // 复核前-编辑
 export function getRebateOrderAclUpdate(data) {
   return request({
-    url: "/rebate/order/ackUpdate",
-    method: "post",
-    data,
-  });
+    url: '/rebate/order/ackUpdate',
+    method: 'post',
+    data
+  })
 }

+ 17 - 17
src/api/finance/receipt_list.js

@@ -1,34 +1,34 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 收款单列表
 export function getK3ReceiptList(params) {
   return request({
-    url: "/k3/receipt/list",
-    method: "get",
-    params,
-  });
+    url: '/k3/receipt/list',
+    method: 'get',
+    params
+  })
 }
 // 收款单详情
 export function getK3ReceiptDetail(params) {
   return request({
-    url: "/k3/receipt/detail",
-    method: "get",
-    params,
-  });
+    url: '/k3/receipt/detail',
+    method: 'get',
+    params
+  })
 }
 // 弃审
 export function getK3ReceiptAbandon(params) {
   return request({
-    url: "/k3/receipt/abandon",
-    method: "post",
-    params,
-  });
+    url: '/k3/receipt/abandon',
+    method: 'post',
+    params
+  })
 }
 // 导出收款单列表
 export function getK3ReceiptExport(params) {
   return request({
-    url: "/k3/receipt/export",
-    method: "get",
-    params,
-  });
+    url: '/k3/receipt/export',
+    method: 'get',
+    params
+  })
 }

+ 41 - 41
src/api/finance/receivable_list.js

@@ -1,83 +1,83 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 其他应收单-新增
 export function getFinanceOtherReceAdd(data) {
   return request({
-    url: "/finance/other/rece/add",
-    method: "post",
-    data,
-  });
+    url: '/finance/other/rece/add',
+    method: 'post',
+    data
+  })
 }
 // 经销商列表
 export function getCustomerList(params) {
   return request({
-    url: "/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/list',
+    method: 'get',
+    params
+  })
 }
 // 经销商钱包列表
 export function getFinanceCustomerList(params) {
   return request({
-    url: "/finance/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/finance/customer/list',
+    method: 'get',
+    params
+  })
 }
 // 其他应收单-列表
 export function getFinanceOtherReceList(params) {
   return request({
-    url: "/finance/other/rece/list",
-    method: "get",
-    params,
-  });
+    url: '/finance/other/rece/list',
+    method: 'get',
+    params
+  })
 }
 
 // 其他应收单-提审
 export function getFinanceOtherReceApply(params) {
   return request({
-    url: "/finance/other/rece/apply",
-    method: "post",
-    params,
-  });
+    url: '/finance/other/rece/apply',
+    method: 'post',
+    params
+  })
 }
 // 其他应收单-详情
 export function getFinanceOtherReceDetail(params) {
   return request({
-    url: "/finance/other/rece/detail",
-    method: "get",
-    params,
-  });
+    url: '/finance/other/rece/detail',
+    method: 'get',
+    params
+  })
 }
 // 其他应收单-审核
 export function getFinanceOtherReceExamine(params) {
   return request({
-    url: "/finance/other/rece/examine",
-    method: "post",
-    params,
-  });
+    url: '/finance/other/rece/examine',
+    method: 'post',
+    params
+  })
 }
 // 其他应收单-删除
 export function getFinanceOtherReceDelete(params) {
   return request({
-    url: "/finance/other/rece/delete",
-    method: "post",
-    params,
-  });
+    url: '/finance/other/rece/delete',
+    method: 'post',
+    params
+  })
 }
 // 其他应收单-弃审
 export function getFinanceOtherReceAbandon(params) {
   return request({
-    url: "/finance/other/rece/abandon",
-    method: "post",
-    params,
-  });
+    url: '/finance/other/rece/abandon',
+    method: 'post',
+    params
+  })
 }
 // 其他应收单-修改
 export function getFinanceOtherReceUpdate(data) {
   return request({
-    url: "/finance/other/rece/update",
-    method: "post",
-    data,
-  });
+    url: '/finance/other/rece/update',
+    method: 'post',
+    data
+  })
 }

+ 17 - 17
src/api/finance/standbook_list.js

@@ -1,34 +1,34 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 台账列表
 export function getStandbookList(params) {
   return request({
-    url: "/finance/standing/book/list",
-    method: "get",
-    params,
-  });
+    url: '/finance/standing/book/list',
+    method: 'get',
+    params
+  })
 }
 // 字典
 export function getDictList(params) {
   return request({
-    url: "/common/dict/list",
-    method: "get",
-    params,
-  });
+    url: '/common/dict/list',
+    method: 'get',
+    params
+  })
 }
 // 经销商列表
 export function getCustomerList(params) {
   return request({
-    url: "/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/list',
+    method: 'get',
+    params
+  })
 }
 // 台账列表统计
 export function getAmountCount(params) {
   return request({
-    url: "/finance/standing/book/amountCount",
-    method: "get",
-    params,
-  });
+    url: '/finance/standing/book/amountCount',
+    method: 'get',
+    params
+  })
 }

+ 11 - 12
src/api/finance/tax_rate.js

@@ -1,17 +1,16 @@
 import request from '@/utils/request'
 // 获取税率配置
 export function getCommonTaxGet() {
-    return request({
-      url: '/common/tax/get',
-      method: 'post',
-      
-    })
-  }
+  return request({
+    url: '/common/tax/get',
+    method: 'post'
+  })
+}
 // 税率配置
 export function getCommonTaxConfig(data) {
-    return request({
-      url: '/common/tax/config',
-      method: 'post',
-      data
-    })
-  }
+  return request({
+    url: '/common/tax/config',
+    method: 'post',
+    data
+  })
+}

+ 21 - 21
src/api/finance/wallet.js

@@ -1,42 +1,42 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 返利钱包列表
 export function getRebateList(params) {
   return request({
-    url: "/wallet/rebate/list",
-    method: "get",
-    params,
-  });
+    url: '/wallet/rebate/list',
+    method: 'get',
+    params
+  })
 }
 // 钱包列表(非返利钱包)
 export function getWalletList(params) {
   return request({
-    url: "/wallet/list",
-    method: "get",
-    params,
-  });
+    url: '/wallet/list',
+    method: 'get',
+    params
+  })
 }
 // 经销商一键生成钱包
 export function getfinanceInit(params) {
   return request({
-    url: "/finance/init",
-    method: "post",
-    params,
-  });
+    url: '/finance/init',
+    method: 'post',
+    params
+  })
 }
 // 设置特定的经销商返利钱包的返利额度
 export function getWalletRebateRateUpdate(params) {
   return request({
-    url: "/wallet/rebate_rate/update",
-    method: "post",
-    params,
-  });
+    url: '/wallet/rebate_rate/update',
+    method: 'post',
+    params
+  })
 }
 // 经销商列表
 export function getCustomerList(params) {
   return request({
-    url: "/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/list',
+    method: 'get',
+    params
+  })
 }

+ 1 - 1
src/api/issue.js

@@ -43,4 +43,4 @@ export function handleImport(params) {
     method: 'post',
     params
   })
-}
+}

+ 1 - 2
src/api/merchant.js

@@ -1,5 +1,4 @@
-
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 export function getList(params) {
   return request({

+ 1 - 1
src/api/notice.js

@@ -61,4 +61,4 @@ export function confirmCheck(params) {
     method: 'post',
     params
   })
-}
+}

+ 0 - 1
src/api/policy_list.js

@@ -456,4 +456,3 @@ export function setStauts(params) {
     params
   })
 }
-

+ 1 - 1
src/api/sales_region.js

@@ -7,4 +7,4 @@ export function getRelationList(params) {
     method: 'get',
     params
   })
-}
+}

+ 220 - 220
src/api/setting.js

@@ -1,494 +1,494 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 获取个人信息
 export function getUserInfo(params) {
   return request({
-    url: "/admin/user/detail",
-    method: "get",
-    params,
-  });
+    url: '/admin/user/detail',
+    method: 'get',
+    params
+  })
 }
 
 // 修改密码
 export function changePassword(params) {
   return request({
-    url: "/admin/user/password/update",
-    method: "post",
-    params,
-  });
+    url: '/admin/user/password/update',
+    method: 'post',
+    params
+  })
 }
 
 // 获取账户列表
 export function getAccountList(params) {
   return request({
-    url: "/admin/user/list",
-    method: "get",
-    params,
-  });
+    url: '/admin/user/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取角色列表
 export function getRoleList(params) {
   return request({
-    url: "/admin/role/list",
-    method: "get",
-    params,
-  });
+    url: '/admin/role/list',
+    method: 'get',
+    params
+  })
 }
 
 // 重置密码
 export function resetPassword(params) {
   return request({
-    url: "/admin/user/password/reset",
-    method: "post",
-    params,
-  });
+    url: '/admin/user/password/reset',
+    method: 'post',
+    params
+  })
 }
 
 // 更改账户状态
 export function changeAccountStatus(params) {
   return request({
-    url: "/admin/user/status/update",
-    method: "post",
-    params,
-  });
+    url: '/admin/user/status/update',
+    method: 'post',
+    params
+  })
 }
 
 // 新增账户
 export function addAccount(params) {
   return request({
-    url: "/admin/user/add",
-    method: "post",
-    data: params,
-  });
+    url: '/admin/user/add',
+    method: 'post',
+    data: params
+  })
 }
 
 // 编辑账户
 export function editAccount(params) {
   return request({
-    url: "/admin/user/user/update",
-    method: "post",
-    data: params,
-  });
+    url: '/admin/user/user/update',
+    method: 'post',
+    data: params
+  })
 }
 
 // 获取账户详情
 export function getAccountDetail(params) {
   return request({
-    url: "/admin/user/detail",
-    method: "get",
-    params,
-  });
+    url: '/admin/user/detail',
+    method: 'get',
+    params
+  })
 }
 
 // 获取字段列表
 export function getFieldList(params) {
   return request({
-    url: "/sys/dict/list/page",
-    method: "get",
-    params,
-  });
+    url: '/sys/dict/list/page',
+    method: 'get',
+    params
+  })
 }
 
 // 更改字段状态
 export function changeFieldStatus(params) {
   return request({
-    url: "/sys/dict/status/update",
-    method: "post",
-    params,
-  });
+    url: '/sys/dict/status/update',
+    method: 'post',
+    params
+  })
 }
 
 // 删除字段
 export function deleteField(params) {
   return request({
-    url: "/sys/dict/delete",
-    method: "post",
-    params,
-  });
+    url: '/sys/dict/delete',
+    method: 'post',
+    params
+  })
 }
 
 // 新增字段
 export function addField(params) {
   return request({
-    url: "/sys/dict/add",
-    method: "post",
-    params,
-  });
+    url: '/sys/dict/add',
+    method: 'post',
+    params
+  })
 }
 
 // 编辑字段
 export function editField(params) {
   return request({
-    url: "/sys/dict/update",
-    method: "post",
-    params,
-  });
+    url: '/sys/dict/update',
+    method: 'post',
+    params
+  })
 }
 
 // 获取字段详情
 export function getFieldDetail(params) {
   return request({
-    url: "/sys/dict/detail",
-    method: "get",
-    params,
-  });
+    url: '/sys/dict/detail',
+    method: 'get',
+    params
+  })
 }
 
 // 获取操作日志列表
 export function getOplogList(params) {
   return request({
-    url: "/admin/operation/log/list",
-    method: "get",
-    params,
-  });
+    url: '/admin/operation/log/list',
+    method: 'get',
+    params
+  })
 }
 
 // 检查工程机帐号是否有效
 export function checkEngineAccount() {
   return request({
-    url: "/admin/user/engin/checkuser",
-    method: "post",
-  });
+    url: '/admin/user/engin/checkuser',
+    method: 'post'
+  })
 }
 
 // 绑定工程机帐号
 export function bindEngineAccount(params) {
   return request({
-    url: "/admin/user/engin/bind",
-    method: "post",
-    params,
-  });
+    url: '/admin/user/engin/bind',
+    method: 'post',
+    params
+  })
 }
 
 // 删除工程机帐号
 export function delEngineAccount(params) {
   return request({
-    url: "/admin/user/engin/account/del",
-    method: "post",
-    params,
-  });
+    url: '/admin/user/engin/account/del',
+    method: 'post',
+    params
+  })
 }
 
 // 更改轮播图状态
 export function changeBannerStatus(params) {
   return request({
-    url: "/carouselMap/state/update",
-    method: "post",
-    params,
-  });
+    url: '/carouselMap/state/update',
+    method: 'post',
+    params
+  })
 }
 
 // 删除轮播图
 export function deleteBanner(params) {
   return request({
-    url: "/carouselMap/delete",
-    method: "post",
-    params,
-  });
+    url: '/carouselMap/delete',
+    method: 'post',
+    params
+  })
 }
 
 // 新增轮播图
 export function addBanner(params) {
   return request({
-    url: "/carouselMap/add",
-    method: "post",
-    data: params,
-  });
+    url: '/carouselMap/add',
+    method: 'post',
+    data: params
+  })
 }
 
 // 编辑轮播图
 export function editBanner(params) {
   return request({
-    url: "/carouselMap/update",
-    method: "post",
-    data: params,
-  });
+    url: '/carouselMap/update',
+    method: 'post',
+    data: params
+  })
 }
 
 // 获取轮播图详情
 export function getBannerDetail(params) {
   return request({
-    url: "/carouselMap/detail",
-    method: "get",
-    params,
-  });
+    url: '/carouselMap/detail',
+    method: 'get',
+    params
+  })
 }
 
 // 新增角色
 export function addRole(params) {
   return request({
-    url: "/admin/role/add",
-    method: "post",
-    data: params,
-  });
+    url: '/admin/role/add',
+    method: 'post',
+    data: params
+  })
 }
 
 // 编辑角色
 export function editRole(params) {
   return request({
-    url: "/admin/role/update",
-    method: "post",
-    data: params,
-  });
+    url: '/admin/role/update',
+    method: 'post',
+    data: params
+  })
 }
 
 // 删除角色
 export function deleteRole(params) {
   return request({
-    url: "/admin/role/delete",
-    method: "post",
-    params,
-  });
+    url: '/admin/role/delete',
+    method: 'post',
+    params
+  })
 }
 
 // 获取角色详情
 export function getRoleDetail(params) {
   return request({
-    url: "/admin/role/detail",
-    method: "get",
-    params,
-  });
+    url: '/admin/role/detail',
+    method: 'get',
+    params
+  })
 }
 
 // 获取权限列表
 export function getMenuRoleList(params) {
   return request({
-    url: "/admin/user/module/all",
-    method: "get",
-    params,
-  });
+    url: '/admin/user/module/all',
+    method: 'get',
+    params
+  })
 }
 
 // 获取已选权限数组
 export function getMenuRoleIds(params) {
   return request({
-    url: "/admin/user/module/id/checked",
-    method: "get",
-    params,
-  });
+    url: '/admin/user/module/id/checked',
+    method: 'get',
+    params
+  })
 }
 
 // 提交设置权限
 export function setMenuRole(params) {
   return request({
-    url: "/admin/user/module/grant",
-    method: "post",
-    params,
-  });
+    url: '/admin/user/module/grant',
+    method: 'post',
+    params
+  })
 }
 
 // 获取商品列表
 export function getGoodsList(params) {
   return request({
-    url: "/carouselMap/list/goods",
-    method: "get",
-    params,
-  });
+    url: '/carouselMap/list/goods',
+    method: 'get',
+    params
+  })
 }
 
 // 批量删除轮播图
 export function batchDeleteBanner(params) {
   return request({
-    url: "/carouselMap/batch/delete",
-    method: "post",
-    data: params,
-  });
+    url: '/carouselMap/batch/delete',
+    method: 'post',
+    data: params
+  })
 }
 
 // 获取通告
 export function getNotice(params) {
   return request({
-    url: "/notice/mini/select",
-    method: "get",
-    params,
-  });
+    url: '/notice/mini/select',
+    method: 'get',
+    params
+  })
 }
 
 // 新增通告
 export function addNotice(params) {
   return request({
-    url: "/notice/mini/add",
-    method: "post",
-    data: params,
-  });
+    url: '/notice/mini/add',
+    method: 'post',
+    data: params
+  })
 }
 
 // 编辑通告
 export function editNotice(params) {
   return request({
-    url: "/notice/mini/update",
-    method: "post",
-    data: params,
-  });
+    url: '/notice/mini/update',
+    method: 'post',
+    data: params
+  })
 }
 
 // 获取菜单列表
 export function getMenuList(params) {
   return request({
-    url: "/admin/user/module/list",
-    method: "get",
-    params,
-  });
+    url: '/admin/user/module/list',
+    method: 'get',
+    params
+  })
 }
 
 // 添加菜单
 export function addMenu(params) {
   return request({
-    url: "/admin/module/add",
-    method: "post",
-    data: params,
-  });
+    url: '/admin/module/add',
+    method: 'post',
+    data: params
+  })
 }
 
 // 编辑菜单
 export function editMenu(params) {
   return request({
-    url: "/admin/module/update",
-    method: "post",
-    data: params,
-  });
+    url: '/admin/module/update',
+    method: 'post',
+    data: params
+  })
 }
 
 // 删除菜单
 export function deleteMenu(params) {
   return request({
-    url: "/admin/module/delete",
-    method: "post",
-    params,
-  });
+    url: '/admin/module/delete',
+    method: 'post',
+    params
+  })
 }
 
 // 获取菜单详情
 export function getMenuDetail(params) {
   return request({
-    url: "/admin/module/detail",
-    method: "get",
-    params,
-  });
+    url: '/admin/module/detail',
+    method: 'get',
+    params
+  })
 }
 
 // 获取商户列表
 export function getMerchantList(params) {
   return request({
-    url: "/admin/user/mch/list",
-    method: "get",
-    params,
-  });
+    url: '/admin/user/mch/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取经销商列表
 export function getDealerList(params) {
   return request({
-    url: "/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/customer/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取用户协议
 export function getAgreement(params) {
   return request({
-    url: "/admin/company/other/getOne",
-    method: "get",
-    params,
-  });
+    url: '/admin/company/other/getOne',
+    method: 'get',
+    params
+  })
 }
 
 // 更新用户协议
 export function editAgreement(params) {
   return request({
-    url: "/admin/company/other/update",
-    method: "post",
-    params,
-  });
+    url: '/admin/company/other/update',
+    method: 'post',
+    params
+  })
 }
 
 // 获取部门列表
 export function getDepartmentList(params) {
   return request({
-    url: "/admin/websit/tree",
-    method: "get",
-    params,
-  });
+    url: '/admin/websit/tree',
+    method: 'get',
+    params
+  })
 }
 
 // 添加部门
 export function addDepartment(params) {
   return request({
-    url: "/admin/websit/add",
-    method: "post",
-    data: params,
-  });
+    url: '/admin/websit/add',
+    method: 'post',
+    data: params
+  })
 }
 
 // 修改部门
 export function editDepartment(params) {
   return request({
-    url: "/admin/websit/update",
-    method: "post",
-    data: params,
-  });
+    url: '/admin/websit/update',
+    method: 'post',
+    data: params
+  })
 }
 
 // 删除部门
 export function deleteDepartment(params) {
   return request({
-    url: "/admin/websit/delete",
-    method: "post",
-    params,
-  });
+    url: '/admin/websit/delete',
+    method: 'post',
+    params
+  })
 }
 
 // 获取部门详情
 export function getDepartmentDetail(params) {
   return request({
-    url: "/admin/websit/detail",
-    method: "get",
-    params,
-  });
+    url: '/admin/websit/detail',
+    method: 'get',
+    params
+  })
 }
 
 // 获取接口状态列表
 export function getApiList(params) {
   return request({
-    url: "/common/interface/list",
-    method: "get",
-    params,
-  });
+    url: '/common/interface/list',
+    method: 'get',
+    params
+  })
 }
 
 // 仓库仓位对应关系列表
 export function getStockListStock(params) {
   return request({
-    url: "/stock/listStock",
-    method: "get",
-    params,
-  });
+    url: '/stock/listStock',
+    method: 'get',
+    params
+  })
 }
 
 // 新建经销商子账号
 export function addSubAccount(params) {
   return request({
-    url: "/admin/user/user/child/add",
-    method: "post",
-    params,
-  });
+    url: '/admin/user/user/child/add',
+    method: 'post',
+    params
+  })
 }
 // 新建经销商子账号
 export function editSubAccount(params) {
   return request({
-    url: "/admin/user/user/child/update",
-    method: "post",
-    params,
-  });
+    url: '/admin/user/user/child/update',
+    method: 'post',
+    params
+  })
 }
 
 // 新建经销商子账号
 export function getRoleChecked(params) {
   return request({
-    url: "/admin/user/user/child/module/checked",
-    method: "get",
-    params,
-  });
+    url: '/admin/user/user/child/module/checked',
+    method: 'get',
+    params
+  })
 }

+ 0 - 4
src/api/stock.js

@@ -53,8 +53,6 @@ export function getReservedList(params) {
   })
 }
 
-
-
 // 获取仓库现存列表
 export function getListStockToDay(params) {
   return request({
@@ -73,8 +71,6 @@ export function getNoticeList(params) {
   })
 }
 
-
-
 //库存到货访问通知-数量
 export function getNoticeNum(params) {
   return request({

+ 1 - 1
src/api/supply/adjust.js

@@ -16,4 +16,4 @@ export function getDetail(params) {
     method: 'get',
     params
   })
-}
+}

+ 1 - 1
src/api/supply/allot.js

@@ -16,4 +16,4 @@ export function getDetail(params) {
     method: 'get',
     params
   })
-}
+}

+ 1 - 4
src/api/supply/apply.js

@@ -126,8 +126,6 @@ export function getDealerList(params) {
   })
 }
 
-
-
 // 工程发货申请单 - 获取列表
 export function getEnginList(params) {
   return request({
@@ -227,7 +225,6 @@ export function examineBatchEngin(params) {
   })
 }
 
-
 // 零售退货申请单 - 新增
 export function addApplyReturn(params) {
   return request({
@@ -244,4 +241,4 @@ export function getSalesGoodsList(params) {
     method: 'get',
     params
   })
-}
+}

+ 24 - 24
src/api/supply/commercial_list.js

@@ -1,49 +1,49 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 删除
 export function getBusPriceDelete(params) {
   return request({
-    url: "/bus/price/delete",
-    method: "post",
-    params,
-  });
+    url: '/bus/price/delete',
+    method: 'post',
+    params
+  })
 }
 // 详情
 export function getBusPriceDetail(params) {
   return request({
-    url: "/bus/price/detail",
-    method: "get",
-    params,
-  });
+    url: '/bus/price/detail',
+    method: 'get',
+    params
+  })
 }
 // 下载商用工程产品价格模板
 export function getBusPriceDownload() {
   return request({
-    url: "/bus/price/download",
-    method: "get",
-  });
+    url: '/bus/price/download',
+    method: 'get'
+  })
 }
 // 商用工程产品价格-导出
 export function getBusPriceExport(params) {
   return request({
-    url: "/bus/price/export",
-    method: "get",
-    params,
-  });
+    url: '/bus/price/export',
+    method: 'get',
+    params
+  })
 }
 // 商用工程产品价格列表
 export function getBusPriceList(params) {
   return request({
-    url: "/bus/price/list",
-    method: "get",
-    params,
-  });
+    url: '/bus/price/list',
+    method: 'get',
+    params
+  })
 }
 // 修改
 export function getBusPriceUpdate(data) {
   return request({
-    url: "/bus/price/update",
-    method: "post",
-    data,
-  });
+    url: '/bus/price/update',
+    method: 'post',
+    data
+  })
 }

+ 1 - 1
src/api/supply/deliver.js

@@ -61,4 +61,4 @@ export function getSumList(params) {
     method: 'get',
     params
   })
-}
+}

+ 1 - 4
src/api/supply/displace.js

@@ -90,9 +90,6 @@ export function returnOrder(params) {
   })
 }
 
-
-
-
 // 获取物料列表
 export function getGoodsList(params) {
   return request({
@@ -127,4 +124,4 @@ export function getDisplaceDetail(params) {
     method: 'get',
     params
   })
-}
+}

+ 1 - 14
src/api/supply/engin.js

@@ -198,11 +198,6 @@ export function directOrder(params) {
   })
 }
 
-
-
-
-
-
 // 家用工程订单 - 获取工程登录列表
 export function getHomeLoginList(params) {
   return request({
@@ -329,10 +324,6 @@ export function returnHome(params) {
   })
 }
 
-
-
-
-
 // 商用工程订单 - 获取工程登录列表
 export function getComLoginList(params) {
   return request({
@@ -459,10 +450,6 @@ export function returnCom(params) {
   })
 }
 
-
-
-
-
 // 获取仓库列表
 export function getWarehouseList(params) {
   return request({
@@ -488,4 +475,4 @@ export function getWalletList(params) {
     method: 'get',
     params
   })
-}
+}

+ 2 - 2
src/api/supply/pickup.js

@@ -23,7 +23,7 @@ export function getDetailPrintDisString(params) {
   return request({
     url: '/pick/detailPrintDisString',
     method: 'post',
-    data:params
+    data: params
   })
 }
 // 获取详情
@@ -48,7 +48,7 @@ export function getDtailPrintDis(params) {
   return request({
     url: '/pick/detailPrintDis',
     method: 'post',
-    data:params
+    data: params
   })
 }
 

+ 101 - 101
src/api/supply/policy.js

@@ -1,221 +1,221 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 获取列表
 export function getList(params) {
   return request({
-    url: "/retail/list",
-    method: "get",
-    params,
-  });
+    url: '/retail/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取详情
 export function getDetail(params) {
   return request({
-    url: "/retail/detail",
-    method: "get",
-    params,
-  });
+    url: '/retail/detail',
+    method: 'get',
+    params
+  })
 }
 
 // 关闭
 export function closeData(params) {
   return request({
-    url: "/retail/close",
-    method: "post",
-    params,
-  });
+    url: '/retail/close',
+    method: 'post',
+    params
+  })
 }
 
 // 审批
 export function examineData(params) {
   return request({
-    url: "/retail/examine",
-    method: "post",
-    params,
-  });
+    url: '/retail/examine',
+    method: 'post',
+    params
+  })
 }
 
 // 退订
 export function returnData(params) {
   return request({
-    url: "/retail/return",
-    method: "post",
-    params,
-  });
+    url: '/retail/return',
+    method: 'post',
+    params
+  })
 }
 
 // 提交审核
 export function submitData(params) {
   return request({
-    url: "/retail/submit",
-    method: "post",
-    params,
-  });
+    url: '/retail/submit',
+    method: 'post',
+    params
+  })
 }
 
 // 新增
 export function addData(params) {
   return request({
-    url: "/retail/add",
-    method: "post",
-    data: params,
-  });
+    url: '/retail/add',
+    method: 'post',
+    data: params
+  })
 }
 
 // 编辑
 export function editData(params) {
   return request({
-    url: "/retail/update",
-    method: "post",
-    data: params,
-  });
+    url: '/retail/update',
+    method: 'post',
+    data: params
+  })
 }
 
 // 获取销售类型列表
 export function getSalesTypeList(params) {
   return request({
-    url: "/sale/type/list",
-    method: "get",
-    params,
-  });
+    url: '/sale/type/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取产品列表
 export function getGoodsList(params) {
   return request({
-    url: "/retail/product/list",
-    method: "get",
-    params,
-  });
+    url: '/retail/product/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取钱包列表
 export function getWalletList(params) {
   return request({
-    url: "/wallet/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/wallet/customer/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取仓库列表
 export function getWarehouseList(params) {
   return request({
-    url: "/stock/manager/listStock",
-    method: "get",
-    params,
-  });
+    url: '/stock/manager/listStock',
+    method: 'get',
+    params
+  })
 }
 
 // 检查库存
 export function checkStock(params) {
   return request({
-    url: "/stock/manager/stockStatus",
-    method: "get",
-    params,
-  });
+    url: '/stock/manager/stockStatus',
+    method: 'get',
+    params
+  })
 }
 
 export function submitCancel(params) {
   return request({
-    url: "/retail/submit/cancel",
-    method: "post",
-    params,
-  });
+    url: '/retail/submit/cancel',
+    method: 'post',
+    params
+  })
 }
 // 销售类型
 export function typeList(params) {
   return request({
-    url: "/sale/type/list",
-    method: "get",
-    params,
-  });
+    url: '/sale/type/list',
+    method: 'get',
+    params
+  })
 }
 
 // 销售政策
 export function policyList(params) {
   return request({
-    url: "/policy/list",
-    method: "get",
-    params,
-  });
+    url: '/policy/list',
+    method: 'get',
+    params
+  })
 }
 
 // 根据政策id和物料id反查政策条件
 export function getpolicyList(params) {
   return request({
-    url: "/policy/condition/get",
-    method: "get",
-    params,
-  });
+    url: '/policy/condition/get',
+    method: 'get',
+    params
+  })
 }
 
 // 政策条件的机型列表
 export function getConditionList(params) {
   return request({
-    url: "/policy/condition/material/list",
-    method: "get",
-    params,
-  });
+    url: '/policy/condition/material/list',
+    method: 'get',
+    params
+  })
 }
 
 export function getpolicyTypeList(params) {
   return request({
-    url: "/policy/type1/material/list",
-    method: "get",
-    params,
-  });
+    url: '/policy/type1/material/list',
+    method: 'get',
+    params
+  })
 }
 
 export function getMaterialTypeList(params) {
   return request({
-    url: "/policy/material/list",
-    method: "get",
-    params,
-  });
+    url: '/policy/material/list',
+    method: 'get',
+    params
+  })
 }
 
 // 弃审
 export function abandonData(params) {
   return request({
-    url: "/retail/abandon",
-    method: "post",
-    params,
-  });
+    url: '/retail/abandon',
+    method: 'post',
+    params
+  })
 }
 
 export function getConditionDetail(params) {
   return request({
-    url: "/policy/condition/detail",
-    method: "get",
-    params,
-  });
+    url: '/policy/condition/detail',
+    method: 'get',
+    params
+  })
 }
 
 // 政策条件
 
 export function getPolicyConditionList(params) {
   return request({
-    url: "/policy/condition/list",
-    method: "get",
-    params,
-  });
+    url: '/policy/condition/list',
+    method: 'get',
+    params
+  })
 }
 
 // 业务员
 export function getUserList(params) {
   return request({
-    url: "/admin/user/list",
-    method: "get",
-    params,
-  });
+    url: '/admin/user/list',
+    method: 'get',
+    params
+  })
 }
 
 export function deleteList(params) {
   return request({
-    url: "/retail/delete",
-    method: "post",
-    params,
-  });
+    url: '/retail/delete',
+    method: 'post',
+    params
+  })
 }

+ 1 - 1
src/api/supply/purchase.js

@@ -61,4 +61,4 @@ export function submitPlan(params) {
     method: 'post',
     data: params
   })
-}
+}

+ 0 - 2
src/api/supply/reserve.js

@@ -81,7 +81,6 @@ export function getWarehouseList(params) {
   })
 }
 
-
 // 获取仓库列表
 export function getListStock(params) {
   return request({
@@ -90,4 +89,3 @@ export function getListStock(params) {
     params
   })
 }
-

+ 81 - 81
src/api/supply/retail.js

@@ -1,180 +1,180 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 获取列表
 export function getList(params) {
   return request({
-    url: "/retail/list",
-    method: "get",
-    params,
-  });
+    url: '/retail/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取详情
 export function getDetail(params) {
   return request({
-    url: "/retail/detail",
-    method: "get",
-    params,
-  });
+    url: '/retail/detail',
+    method: 'get',
+    params
+  })
 }
 // 获取仓位列表
 export function getPositionList(params) {
   return request({
-    url: "/stock/manager/listStock",
-    method: "get",
-    params,
-  });
+    url: '/stock/manager/listStock',
+    method: 'get',
+    params
+  })
 }
 
 // 关闭
 export function closeData(params) {
   return request({
-    url: "/retail/close",
-    method: "post",
-    params,
-  });
+    url: '/retail/close',
+    method: 'post',
+    params
+  })
 }
 
 // 删除
 export function deleteData(params) {
   return request({
-    url: "/retail/delete",
-    method: "post",
-    params,
-  });
+    url: '/retail/delete',
+    method: 'post',
+    params
+  })
 }
 
 // 弃审
 export function abandonData(params) {
   return request({
-    url: "/retail/abandon",
-    method: "post",
-    params,
-  });
+    url: '/retail/abandon',
+    method: 'post',
+    params
+  })
 }
 
 // 审批
 export function examineData(params) {
   return request({
-    url: "/retail/examine",
-    method: "post",
-    params,
-  });
+    url: '/retail/examine',
+    method: 'post',
+    params
+  })
 }
 
 // 提交审核
 export function submitData(params) {
   return request({
-    url: "/retail/submit",
-    method: "post",
-    params,
-  });
+    url: '/retail/submit',
+    method: 'post',
+    params
+  })
 }
 
 // 撤回
 export function withdrawData(params) {
   return request({
-    url: "/retail/submit/cancel",
-    method: "post",
-    params,
-  });
+    url: '/retail/submit/cancel',
+    method: 'post',
+    params
+  })
 }
 
 // 新增
 export function addData(params) {
   return request({
-    url: "/retail/add",
-    method: "post",
-    data: params,
-  });
+    url: '/retail/add',
+    method: 'post',
+    data: params
+  })
 }
 
 // 编辑
 export function editData(params) {
   return request({
-    url: "/retail/update",
-    method: "post",
-    data: params,
-  });
+    url: '/retail/update',
+    method: 'post',
+    data: params
+  })
 }
 
 // 退订
 export function returnData(params) {
   return request({
-    url: "/retail/tuiding",
-    method: "post",
-    data: params,
-  });
+    url: '/retail/tuiding',
+    method: 'post',
+    data: params
+  })
 }
 
 // 获取销售类型列表
 export function getSalesTypeList(params) {
   return request({
-    url: "/sale/type/list",
-    method: "get",
-    params,
-  });
+    url: '/sale/type/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取产品列表
 export function getGoodsList(params) {
   return request({
-    url: "/retail/product/list",
-    method: "get",
-    params,
-  });
+    url: '/retail/product/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取钱包列表
 export function getWalletList(params) {
   return request({
-    url: "/wallet/customer/list",
-    method: "get",
-    params,
-  });
+    url: '/wallet/customer/list',
+    method: 'get',
+    params
+  })
 }
 
 // 获取仓库列表
 export function getWarehouseList(params) {
   return request({
-    url: "/stock/manager/listStock",
-    method: "get",
-    params,
-  });
+    url: '/stock/manager/listStock',
+    method: 'get',
+    params
+  })
 }
 
 // 检查库存
 export function checkStock(params) {
   return request({
-    url: "/stock/manager/stockStatus",
-    method: "get",
-    params,
-  });
+    url: '/stock/manager/stockStatus',
+    method: 'get',
+    params
+  })
 }
 
 // 直调发货
 export function adjustDeliver(params) {
   return request({
-    url: "/invoice/rak/addRak",
-    method: "post",
-    data: params,
-  });
+    url: '/invoice/rak/addRak',
+    method: 'post',
+    data: params
+  })
 }
 
 // 直调完成
 export function finishData(params) {
   return request({
-    url: "/retail/transfer/over",
-    method: "post",
-    params,
-  });
+    url: '/retail/transfer/over',
+    method: 'post',
+    params
+  })
 }
 
 // 提前开票
 export function directOrder(params) {
   return request({
-    url: "/requisition/add",
-    method: "post",
-    data: params,
-  });
+    url: '/requisition/add',
+    method: 'post',
+    data: params
+  })
 }

+ 1 - 1
src/api/supply/return.js

@@ -34,4 +34,4 @@ export function addData(params) {
     method: 'post',
     data: params
   })
-}
+}

+ 1 - 8
src/api/supply/sales.js

@@ -18,7 +18,6 @@ export function getDetail(params) {
   })
 }
 
-
 // 获取发货单列表
 export function getListOrderNo(params) {
   return request({
@@ -100,16 +99,10 @@ export function addReturn(params) {
   })
 }
 
-
-
-
-
-
 export function updateNum(params) {
   return request({
     url: '/saleRetreat/order/update',
     method: 'post',
-    data :params
+    data: params
   })
 }
-

+ 28 - 28
src/api/user.js

@@ -1,70 +1,70 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 登录
 export function login(params) {
   return request({
-    url: "/admin/user/login",
-    method: "post",
-    params,
-  });
+    url: '/admin/user/login',
+    method: 'post',
+    params
+  })
 }
 
 // 获取用户信息
 export function getInfo(userid) {
   return request({
-    url: "/admin/user/detail",
-    method: "get",
-    params: { adminUserId: userid },
-  });
+    url: '/admin/user/detail',
+    method: 'get',
+    params: { adminUserId: userid }
+  })
 }
 
 // 动态路由
 export function getRouter(params) {
   return request({
     url: `/admin/user/module/list`,
-    method: "get",
-    params,
-  });
+    method: 'get',
+    params
+  })
 }
 
 // 退出登录
 export function logout() {
   return request({
-    url: "/admin/user/logout",
-    method: "post",
-  });
+    url: '/admin/user/logout',
+    method: 'post'
+  })
 }
 
 // 动态路由
 export function getCode() {
   return request({
-    url: "/admin/user/imageVerification",
-    method: "get",
-  });
+    url: '/admin/user/imageVerification',
+    method: 'get'
+  })
 }
 
 // 获取轮播图
 
 export function getList() {
   return request({
-    url: "/record/list",
-    method: "get",
-  });
+    url: '/record/list',
+    method: 'get'
+  })
 }
 
 // 公司列表
 
 export function getCompanyList() {
   return request({
-    url: "/record/company/list",
-    method: "get",
-  });
+    url: '/record/company/list',
+    method: 'get'
+  })
 }
 // 登录时发送验证码
 export function getAdminUserSmsCode(params) {
   return request({
-    url: "/admin/user/smsCode",
-    method: "post",
-    params,
-  });
+    url: '/admin/user/smsCode',
+    method: 'post',
+    params
+  })
 }

+ 5 - 3
src/components/Breadcrumb/index.vue

@@ -1,8 +1,10 @@
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
+      <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
+        <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{
+          item.meta.title
+        }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
@@ -33,7 +35,7 @@ export default {
       const first = matched[0]
 
       if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: '首页' }}].concat(matched)
+        matched = [{ path: '/dashboard', meta: { title: '首页' } }].concat(matched)
       }
       if (matched.length > 1) {
         const insertPosition = matched.length - 1

+ 80 - 28
src/components/Common/check-order.vue

@@ -11,8 +11,15 @@
         highlight-current-row
         stripe
         show-summary
-        :summary-method="$getSummaries">
-        <el-table-column align="center" label="发货单" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
+        :summary-method="$getSummaries"
+      >
+        <el-table-column
+          align="center"
+          label="发货单"
+          prop="id"
+          min-width="180"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column align="center" label="订单类别" prop="inOrderType" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.inOrderType | orderTypeFilter }}
@@ -28,13 +35,55 @@
             {{ scope.row.payAmount | numToFixed }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="客户名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          align="center"
+          label="发货日期"
+          prop="orderTime"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="仓库"
+          prop="correspondName"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="客户名称"
+          prop="customerName"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="物料编码"
+          prop="materialCode"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="产品编码"
+          prop="materialOldNumber"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="产品名称"
+          prop="materialName"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="规格型号"
+          prop="specification"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column align="right" label="无税金额" prop="noTotalAmount" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.noTotalAmount | numToFixed }}
@@ -45,8 +94,13 @@
             {{ scope.row.afterTaxPrice | numToFixed }}
           </template>
         </el-table-column>
-        <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-
+        <el-table-column
+          align="right"
+          label="数量"
+          prop="refundableQty"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
       </el-table>
     </div>
 
@@ -55,12 +109,11 @@
         <el-button @click="goBack">关 闭</el-button>
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
-import { checkOrder } from "@/api/common";
+import { checkOrder } from '@/api/common'
 
 export default {
   name: 'RetailReturn',
@@ -72,45 +125,44 @@ export default {
         1: '发货单',
         2: '退货单'
       }
-      return MAP[val];
+      return MAP[val]
     }
   },
   data() {
     return {
-      dataList: [],
+      dataList: []
     }
   },
 
   created() {
-    this.getDetail();
+    this.getDetail()
   },
 
   methods: {
     // 返回详情
     goBack() {
-      this.$emit('backDetail');
+      this.$emit('backDetail')
     },
 
     // 获取详情
     getDetail() {
-      checkOrder({mainOrderId: this.checkOrderId }).then(res => {
-        if(res.data) {
+      checkOrder({ mainOrderId: this.checkOrderId }).then(res => {
+        if (res.data) {
           res.data.forEach(item => {
-            item.sums1 = ['refundableQty'];
-            item.sums2 = ['payAmount', 'afterTaxPrice', 'noTotalAmount'];
+            item.sums1 = ['refundableQty']
+            item.sums2 = ['payAmount', 'afterTaxPrice', 'noTotalAmount']
           })
         }
-        this.dataList = res.data;
+        this.dataList = res.data
       })
-    },
-
+    }
   }
 }
 </script>
 
 <style scoped lang="scss">
-  .detail-container {
-    width: 100%;
-    height: 100%;
-  }
+.detail-container {
+  width: 100%;
+  height: 100%;
+}
 </style>

+ 16 - 21
src/components/Common/copy-button.vue

@@ -1,9 +1,5 @@
 <template>
-  <i 
-    class="el-icon-copy-document tag-read"
-    v-if="copyText" 
-    @click="copy(copyText)" 
-    :data-clipboard-text="copyText">
+  <i class="el-icon-copy-document tag-read" v-if="copyText" @click="copy(copyText)" :data-clipboard-text="copyText">
   </i>
 </template>
 
@@ -13,36 +9,35 @@ import Clipboard from 'clipboard'
 export default {
   name: 'CopyButton',
   props: {
-    copyText: { // 复制文本
+    copyText: {
+      // 复制文本
       type: String,
       default: ''
     }
   },
   data() {
-    return {
-      
-    }
+    return {}
   },
   methods: {
     copy() {
-      const clipboard = new Clipboard('.tag-read');
+      const clipboard = new Clipboard('.tag-read')
       // clipboard.on('success', e => {
       //   this.$successMsg('复制成功');
       // })
-      clipboard.on('error', e =>{
-        console.log('该浏览器不支持复制');
-        return false;
+      clipboard.on('error', e => {
+        console.log('该浏览器不支持复制')
+        return false
       })
-      this.$successMsg('复制成功');
-    },
+      this.$successMsg('复制成功')
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  .tag-read {
-    color: #409EFF;
-    cursor: pointer;
-    margin-right: 4px;
-  }
-</style>
+.tag-read {
+  color: #409eff;
+  cursor: pointer;
+  margin-right: 4px;
+}
+</style>

+ 17 - 15
src/components/Common/edit-date-dialog.vue

@@ -1,14 +1,21 @@
 <template>
   <div>
-    <el-dialog title="修改订单日期" :visible.sync="isShow" :show-close="false" width="400px" :close-on-click-modal="false">
+    <el-dialog
+      title="修改订单日期"
+      :visible.sync="isShow"
+      :show-close="false"
+      width="400px"
+      :close-on-click-modal="false"
+    >
       <el-form ref="dateForm" :model="dateForm" :rules="dateFormRules" label-position="left" label-width="80px">
         <el-form-item label="选择日期" prop="date">
           <el-date-picker
             v-model="dateForm.date"
             type="date"
             value-format="yyyy-MM-dd"
-            style="width: 100%;"
-            placeholder="选择日期">
+            style="width: 100%"
+            placeholder="选择日期"
+          >
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -21,7 +28,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'EditDateDialog',
   props: {
@@ -32,28 +38,26 @@ export default {
     dateForm: {
       type: Object,
       default: {
-        date: '',
+        date: ''
       }
     }
   },
   data() {
     return {
       dateFormRules: {
-        date: [
-          { required: true, message: '请选择订单日期', trigger: 'change' }
-        ],
-      },
+        date: [{ required: true, message: '请选择订单日期', trigger: 'change' }]
+      }
     }
   },
   methods: {
     cancelDateForm() {
-      this.$emit('update:isShow', false);
+      this.$emit('update:isShow', false)
     },
 
     submitDateForm() {
-      this.$refs.dateForm.validate((valid) => {
+      this.$refs.dateForm.validate(valid => {
         if (valid) {
-          this.$parent.submitDateForm();
+          this.$parent.submitDateForm()
         }
       })
     }
@@ -61,6 +65,4 @@ export default {
 }
 </script>
 
-<style>
-
-</style>
+<style></style>

+ 16 - 24
src/components/Common/edit-date-time-dialog.vue

@@ -7,13 +7,7 @@
       width="400px"
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="dateForm"
-        :model="dateForm"
-        :rules="dateFormRules"
-        label-position="left"
-        label-width="80px"
-      >
+      <el-form ref="dateForm" :model="dateForm" :rules="dateFormRules" label-position="left" label-width="80px">
         <el-form-item label="选择日期" prop="date">
           <el-date-picker
             v-model="dateForm.date"
@@ -36,42 +30,40 @@
 
 <script>
 export default {
-  name: "EditDateTimeDialog",
+  name: 'EditDateTimeDialog',
   props: {
     isShow: {
       type: Boolean,
-      default: false,
+      default: false
     },
     dateForm: {
       type: Object,
       default: {
-        date: "",
-      },
-    },
+        date: ''
+      }
+    }
   },
   data() {
     return {
       dateFormRules: {
-        date: [
-          { required: true, message: "请选择订单日期", trigger: "change" },
-        ],
-      },
-    };
+        date: [{ required: true, message: '请选择订单日期', trigger: 'change' }]
+      }
+    }
   },
   methods: {
     cancelDateForm() {
-      this.$emit("update:isShow", false);
+      this.$emit('update:isShow', false)
     },
 
     submitDateForm() {
-      this.$refs.dateForm.validate((valid) => {
+      this.$refs.dateForm.validate(valid => {
         if (valid) {
-          this.$parent.submitDateForm();
+          this.$parent.submitDateForm()
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style></style>

+ 17 - 15
src/components/Common/examine-dialog.vue

@@ -1,7 +1,13 @@
 <template>
   <div>
     <el-dialog title="批量审批" :visible.sync="isShow" :show-close="false" width="400px" :close-on-click-modal="false">
-      <el-form ref="examineForm" :model="examineForm" :rules="examineFormRules" label-position="left" label-width="80px">
+      <el-form
+        ref="examineForm"
+        :model="examineForm"
+        :rules="examineFormRules"
+        label-position="left"
+        label-width="80px"
+      >
         <el-form-item label="审批状态" prop="status">
           <el-radio-group v-model="examineForm.status">
             <el-radio :label="'OK'">通过</el-radio>
@@ -11,9 +17,10 @@
         <el-form-item label="审批备注" prop="remark">
           <el-input
             type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
             placeholder="请输入审批备注"
-            v-model="examineForm.remark">
+            v-model="examineForm.remark"
+          >
           </el-input>
         </el-form-item>
       </el-form>
@@ -26,7 +33,6 @@
 </template>
 
 <script>
-
 export default {
   name: 'EditDateDialog',
   props: {
@@ -37,29 +43,27 @@ export default {
     examineForm: {
       type: Object,
       default: {
-        date: '',
+        date: ''
       }
     }
   },
   data() {
     return {
       examineFormRules: {
-        status: [
-          { required: true, message: '请选择审批状态', trigger: 'change' }
-        ],
-      },
+        status: [{ required: true, message: '请选择审批状态', trigger: 'change' }]
+      }
     }
   },
   methods: {
     cancelForm() {
-      this.$emit('update:isShow', false);
+      this.$emit('update:isShow', false)
       this.$refs.examineForm.resetFields()
     },
 
     submitForm() {
-      this.$refs.examineForm.validate((valid) => {
+      this.$refs.examineForm.validate(valid => {
         if (valid) {
-          this.$parent.submitExamineForm();
+          this.$parent.submitExamineForm()
           this.$refs.examineForm.resetFields()
         }
       })
@@ -68,6 +72,4 @@ export default {
 }
 </script>
 
-<style>
-
-</style>
+<style></style>

+ 6 - 6
src/components/Common/export-button.vue

@@ -1,6 +1,8 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" :icon="isIcon ? 'el-icon-download':''" @click="handleExport">{{exText}}</el-button>
+    <el-button size="mini" type="primary" :icon="isIcon ? 'el-icon-download' : ''" @click="handleExport">{{
+      exText
+    }}</el-button>
   </div>
 </template>
 
@@ -20,7 +22,7 @@ export default {
     },
     exUrl: {
       type: String,
-      default: '',
+      default: ''
     },
     exParams: {
       type: Object,
@@ -29,12 +31,10 @@ export default {
   },
   methods: {
     handleExport() {
-      downloadFiles(this.exUrl, this.exParams);
+      downloadFiles(this.exUrl, this.exParams)
     }
   }
 }
 </script>
 
-<style>
-
-</style>
+<style></style>

+ 98 - 98
src/components/Common/file-upload.vue

@@ -1,129 +1,129 @@
 <template>
-	<div>
-		<el-upload
-			:action="oss_url"
-			:data="dataObj"
-			:multiple="false"
-			:show-file-list="isShowFileList"
-			:file-list="fileList"
-			:before-upload="beforeUpload"
-			:on-remove="handleRemove"
-			:on-success="handleUploadSuccess"
-		>
-			<el-button size="small" type="primary">{{fileList.length == 0 ? '点击上传':'重新上传'}}</el-button>
-		</el-upload>
-	</div>
+  <div>
+    <el-upload
+      :action="oss_url"
+      :data="dataObj"
+      :multiple="false"
+      :show-file-list="isShowFileList"
+      :file-list="fileList"
+      :before-upload="beforeUpload"
+      :on-remove="handleRemove"
+      :on-success="handleUploadSuccess"
+    >
+      <el-button size="small" type="primary">{{ fileList.length == 0 ? '点击上传' : '重新上传' }}</el-button>
+    </el-upload>
+  </div>
 </template>
 <script>
-import { getOssConfig } from '@/api/common';
+import { getOssConfig } from '@/api/common'
 
 export default {
-	name: 'fileUpload',
-	props: {
-		fileList: Array,
+  name: 'fileUpload',
+  props: {
+    fileList: Array,
     fileType: {
       type: Array,
       default: () => ['image', 'video', 'word', 'excel', 'ppt', 'pdf']
     }
-	},
-	data() {
-		return {
-			oss_url: '',
-			dataObj: {},
-			aliosstoken: '',
-		};
-	},
-	created() {
+  },
+  data() {
+    return {
+      oss_url: '',
+      dataObj: {},
+      aliosstoken: ''
+    }
+  },
+  created() {
     getOssConfig().then(res => {
-      this.oss_url = res.data.host;
-      this.dataObj = res.data;
+      this.oss_url = res.data.host
+      this.dataObj = res.data
     })
-	},
-	computed: {
-		isShowFileList: {
-			get: function() {
-				if (this.fileList.length > 0 && this.fileList[0].url) {
-					return true;
-				} else {
-					return false;
-				}
-			},
-			set: function(newValue) {}
-		}
-	},
-	methods: {
-		getUUID() {
-			return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-				return (c === 'x' ? (Math.random() * 16) | 0 : 'r&0x3' | '0x8').toString(16);
-			});
-		},
-		createName(name) {
-			const date = Date.now();
-			const uuid = this.getUUID();
-			const fileSuffix = name.substring(name.lastIndexOf(".") + 1);
-			return `${date}${uuid}.${fileSuffix}`;
-		},
-		handleRemove(file, fileList) {
-			// this.fileList = [{ name: '', url: '' }];
-      this.fileList.pop();
-		},
-		beforeUpload(file) {
-			const fileSuffix = file.name.substring(file.name.lastIndexOf(".") + 1);
-      const imgList = ['jpg', 'jpeg', 'png'];
-      const videoList = ['mp4'];
-      const wordList = ['doc', 'docx', 'dot', 'wps', 'wpt'];
-			const excelList = ['xls', 'xlsx', 'xlt', 'et', 'ett'];
-			const pptList = ['ppt', 'pptx', 'dps', 'dpt', 'pot', 'pps'];
-			const pdfList = ['pdf'];
+  },
+  computed: {
+    isShowFileList: {
+      get: function () {
+        if (this.fileList.length > 0 && this.fileList[0].url) {
+          return true
+        } else {
+          return false
+        }
+      },
+      set: function (newValue) {}
+    }
+  },
+  methods: {
+    getUUID() {
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+        return (c === 'x' ? (Math.random() * 16) | 0 : 'r&0x3' | '0x8').toString(16)
+      })
+    },
+    createName(name) {
+      const date = Date.now()
+      const uuid = this.getUUID()
+      const fileSuffix = name.substring(name.lastIndexOf('.') + 1)
+      return `${date}${uuid}.${fileSuffix}`
+    },
+    handleRemove(file, fileList) {
+      // this.fileList = [{ name: '', url: '' }];
+      this.fileList.pop()
+    },
+    beforeUpload(file) {
+      const fileSuffix = file.name.substring(file.name.lastIndexOf('.') + 1)
+      const imgList = ['jpg', 'jpeg', 'png']
+      const videoList = ['mp4']
+      const wordList = ['doc', 'docx', 'dot', 'wps', 'wpt']
+      const excelList = ['xls', 'xlsx', 'xlt', 'et', 'ett']
+      const pptList = ['ppt', 'pptx', 'dps', 'dpt', 'pot', 'pps']
+      const pdfList = ['pdf']
 
-      let whiteList = [];
-      if(this.fileType.includes('image')) {
-        whiteList = whiteList.concat(imgList);
+      let whiteList = []
+      if (this.fileType.includes('image')) {
+        whiteList = whiteList.concat(imgList)
       }
-      if(this.fileType.includes('video')) {
-        whiteList = whiteList.concat(videoList);
+      if (this.fileType.includes('video')) {
+        whiteList = whiteList.concat(videoList)
       }
-      if(this.fileType.includes('word')) {
-        whiteList = whiteList.concat(wordList);
+      if (this.fileType.includes('word')) {
+        whiteList = whiteList.concat(wordList)
       }
-      if(this.fileType.includes('excel')) {
-        whiteList = whiteList.concat(excelList);
+      if (this.fileType.includes('excel')) {
+        whiteList = whiteList.concat(excelList)
       }
-      if(this.fileType.includes('ppt')) {
-        whiteList = whiteList.concat(pptList);
+      if (this.fileType.includes('ppt')) {
+        whiteList = whiteList.concat(pptList)
       }
-      if(this.fileType.includes('pdf')) {
-        whiteList = whiteList.concat(pdfList);
+      if (this.fileType.includes('pdf')) {
+        whiteList = whiteList.concat(pdfList)
       }
 
       if (whiteList.indexOf(fileSuffix) === -1) {
-        return this.$errorMsg('只支持上传' + this.fileType.join(',') + '文件!');
+        return this.$errorMsg('只支持上传' + this.fileType.join(',') + '文件!')
       }
-			const fileName = this.createName(file.name);
-			const loading = this.$loading({
+      const fileName = this.createName(file.name)
+      const loading = this.$loading({
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
-      });
+      })
 
-      this.dataObj.key = this.dataObj.dir + fileName;
-		},
-		handleUploadSuccess(res, file, fileList) {
-			const loading = this.$loading({
+      this.dataObj.key = this.dataObj.dir + fileName
+    },
+    handleUploadSuccess(res, file, fileList) {
+      const loading = this.$loading({
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
-      });
-			this.fileList.pop();
-			this.fileList.push({
-				name: file.name,
-				url: this.dataObj.key
-			});
-			this.showFileList = true;
-			loading.close();
-		}
-	}
-};
+      })
+      this.fileList.pop()
+      this.fileList.push({
+        name: file.name,
+        url: this.dataObj.key
+      })
+      this.showFileList = true
+      loading.close()
+    }
+  }
+}
 </script>

+ 125 - 178
src/components/Common/image-upload.vue

@@ -13,12 +13,7 @@
     />
     <div class="images">
       <div v-for="(item, index) in fileList" :key="index" class="item">
-        <div
-          v-if="item.url"
-          class="img"
-          @mouseover="item.hover = true"
-          @mouseout="item.hover = false"
-        >
+        <div v-if="item.url" class="img" @mouseover="item.hover = true" @mouseout="item.hover = false">
           <el-image
             v-if="checkFileType(item.url) == 'image'"
             ref="img"
@@ -27,68 +22,34 @@
             style="width: 120px; height: 120px"
             fit="cover"
           />
-          <el-image
-            v-else
-            ref="img"
-            :src="imageURL + item.url"
-            style="width: 120px; height: 120px"
-            fit="cover"
-          >
+          <el-image v-else ref="img" :src="imageURL + item.url" style="width: 120px; height: 120px" fit="cover">
             <div slot="error" class="image-slot">
-              <img
-                v-if="checkFileType(item.url) == 'word'"
-                class="file"
-                src="@/assets/common/word.png"
-              />
-              <img
-                v-if="checkFileType(item.url) == 'excel'"
-                class="file"
-                src="@/assets/common/excel.png"
-              />
-              <img
-                v-if="checkFileType(item.url) == 'ppt'"
-                class="file"
-                src="@/assets/common/ppt.png"
-              />
-              <img
-                v-if="checkFileType(item.url) == 'pdf'"
-                class="file"
-                src="@/assets/common/pdf.png"
-              />
-              <img
-                v-if="checkFileType(item.url) == 'file'"
-                class="file"
-                src="@/assets/common/zip.jpeg"
-              />
+              <img v-if="checkFileType(item.url) == 'word'" class="file" src="@/assets/common/word.png" />
+              <img v-if="checkFileType(item.url) == 'excel'" class="file" src="@/assets/common/excel.png" />
+              <img v-if="checkFileType(item.url) == 'ppt'" class="file" src="@/assets/common/ppt.png" />
+              <img v-if="checkFileType(item.url) == 'pdf'" class="file" src="@/assets/common/pdf.png" />
+              <img v-if="checkFileType(item.url) == 'file'" class="file" src="@/assets/common/zip.jpeg" />
             </div>
           </el-image>
           <div v-show="item.hover" class="mask">
-            <i
-              v-if="checkFileType(item.url) == 'image'"
-              class="el-icon-zoom-in"
-              @click="previewImage(item.url)"
-            />
+            <i v-if="checkFileType(item.url) == 'image'" class="el-icon-zoom-in" @click="previewImage(item.url)" />
             <i class="el-icon-upload2" @click="uploadImage(item.url)" />
             <i class="el-icon-delete" @click="deleteImage(item.url)" />
           </div>
         </div>
       </div>
-      <div
-        v-if="multiple || (!multiple && fileList.length < 1)"
-        class="add"
-        @click="uploadImage()"
-      >
+      <div v-if="multiple || (!multiple && fileList.length < 1)" class="add" @click="uploadImage()">
         <i class="el-icon-plus" />
       </div>
     </div>
   </div>
 </template>
 <script>
-import { getOssConfig } from "@/api/common";
-import { findElem } from "@/utils/util";
+import { getOssConfig } from '@/api/common'
+import { findElem } from '@/utils/util'
 
 export default {
-  name: "FileUpload",
+  name: 'FileUpload',
   props: {
     // 接受上传的文件列表
     fileList: Array,
@@ -96,123 +57,114 @@ export default {
     // 接受上传的文件类型
     fileType: {
       type: Array,
-      default: () => ["image", "word", "excel", "ppt", "pdf", "file"],
+      default: () => ['image', 'word', 'excel', 'ppt', 'pdf', 'file']
     },
 
     // 是否支持多选文件
     multiple: {
       type: Boolean,
-      default: false,
+      default: false
     },
     startRestricting: {
       type: Boolean,
-      default: false,
+      default: false
     },
     restrictFilename: {
       type: Array,
       default: () => {
-        return [];
-      },
-    },
+        return []
+      }
+    }
   },
   data() {
     return {
       imageURL: this.$imageUrl,
-      oss_url: "",
+      oss_url: '',
       dataObj: {},
-      uploadImageUrl: "",
+      uploadImageUrl: '',
       waitUploadList: [],
-      fileName: "",
-    };
+      fileName: ''
+    }
   },
   computed: {
     isShowFileList: {
       get: function () {
         if (this.fileList.length > 0 && this.fileList[0].url) {
-          return true;
+          return true
         } else {
-          return false;
+          return false
         }
       },
-      set: function (newValue) {},
+      set: function (newValue) {}
     },
     accept() {
-      const imageList = [".jpg", ".jpeg", ".png"];
-      const videoList = [".mp4"];
-      const wordList = [".doc", ".docx", ".dot", ".wps", ".wpt"];
-      const excelList = [".xls", ".xlsx", ".xlt", ".et", ".ett"];
-      const pptList = [".ppt", ".pptx", ".dps", ".dpt", ".pot", ".pps"];
-      const pdfList = [".pdf"];
-      const fileList = [".zip", ".rar", ".gz", ".apk"];
-      let whiteList = [];
-      this.fileType.includes("image") &&
-        (whiteList = whiteList.concat(imageList));
-      this.fileType.includes("video") &&
-        (whiteList = whiteList.concat(videoList));
-      this.fileType.includes("word") &&
-        (whiteList = whiteList.concat(wordList));
-      this.fileType.includes("excel") &&
-        (whiteList = whiteList.concat(excelList));
-      this.fileType.includes("ppt") && (whiteList = whiteList.concat(pptList));
-      this.fileType.includes("pdf") && (whiteList = whiteList.concat(pdfList));
-      this.fileType.includes("file") &&
-        (whiteList = whiteList.concat(fileList));
-      return whiteList.join(",");
+      const imageList = ['.jpg', '.jpeg', '.png']
+      const videoList = ['.mp4']
+      const wordList = ['.doc', '.docx', '.dot', '.wps', '.wpt']
+      const excelList = ['.xls', '.xlsx', '.xlt', '.et', '.ett']
+      const pptList = ['.ppt', '.pptx', '.dps', '.dpt', '.pot', '.pps']
+      const pdfList = ['.pdf']
+      const fileList = ['.zip', '.rar', '.gz', '.apk']
+      let whiteList = []
+      this.fileType.includes('image') && (whiteList = whiteList.concat(imageList))
+      this.fileType.includes('video') && (whiteList = whiteList.concat(videoList))
+      this.fileType.includes('word') && (whiteList = whiteList.concat(wordList))
+      this.fileType.includes('excel') && (whiteList = whiteList.concat(excelList))
+      this.fileType.includes('ppt') && (whiteList = whiteList.concat(pptList))
+      this.fileType.includes('pdf') && (whiteList = whiteList.concat(pdfList))
+      this.fileType.includes('file') && (whiteList = whiteList.concat(fileList))
+      return whiteList.join(',')
     },
     previewImages() {
-      const fileList = [];
+      const fileList = []
       if (this.fileList && this.fileList.length > 0) {
-        this.fileList.forEach((item) => {
-          if (this.checkFileType(item.url) == "image") {
-            fileList.push(this.imageURL + item.url);
+        this.fileList.forEach(item => {
+          if (this.checkFileType(item.url) == 'image') {
+            fileList.push(this.imageURL + item.url)
           }
-        });
+        })
       }
-      return fileList;
-    },
+      return fileList
+    }
   },
   created() {
-    getOssConfig().then((res) => {
-      this.oss_url = res.data.host;
-    });
+    getOssConfig().then(res => {
+      this.oss_url = res.data.host
+    })
   },
   methods: {
     getUUID() {
-      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-        return (
-          c === "x" ? (Math.random() * 16) | 0 : "r&0x3" | "0x8"
-        ).toString(16);
-      });
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+        return (c === 'x' ? (Math.random() * 16) | 0 : 'r&0x3' | '0x8').toString(16)
+      })
     },
     createName(name) {
-      const date = Date.now();
-      const uuid = this.getUUID();
-      const fileSuffix = name.substring(name.lastIndexOf(".") + 1);
-      return `${date}${uuid}.${fileSuffix}`;
+      const date = Date.now()
+      const uuid = this.getUUID()
+      const fileSuffix = name.substring(name.lastIndexOf('.') + 1)
+      return `${date}${uuid}.${fileSuffix}`
     },
 
     // 检查文件类型
     checkFileType(url) {
-      if (!url) return "";
-      const fileSuffix = url.substring(url.lastIndexOf(".") + 1);
+      if (!url) return ''
+      const fileSuffix = url.substring(url.lastIndexOf('.') + 1)
 
-      if (["jpg", "jpeg", "png"].includes(fileSuffix)) {
-        return "image";
-      } else if (["doc", "docx", "dot", "wps", "wpt"].includes(fileSuffix)) {
-        return "word";
-      } else if (["xls", "xlsx", "xlt", "et", "ett"].includes(fileSuffix)) {
-        return "excel";
-      } else if (
-        ["ppt", "pptx", "dps", "dpt", "pot", "pps"].includes(fileSuffix)
-      ) {
-        return "ppt";
-      } else if (["pdf"].includes(fileSuffix)) {
-        return "pdf";
-      } else if (["zip", "rar", "gz", "apk"].includes(fileSuffix)) {
-        return "file";
+      if (['jpg', 'jpeg', 'png'].includes(fileSuffix)) {
+        return 'image'
+      } else if (['doc', 'docx', 'dot', 'wps', 'wpt'].includes(fileSuffix)) {
+        return 'word'
+      } else if (['xls', 'xlsx', 'xlt', 'et', 'ett'].includes(fileSuffix)) {
+        return 'excel'
+      } else if (['ppt', 'pptx', 'dps', 'dpt', 'pot', 'pps'].includes(fileSuffix)) {
+        return 'ppt'
+      } else if (['pdf'].includes(fileSuffix)) {
+        return 'pdf'
+      } else if (['zip', 'rar', 'gz', 'apk'].includes(fileSuffix)) {
+        return 'file'
       }
       {
-        return "pdf";
+        return 'pdf'
       }
     },
 
@@ -220,114 +172,109 @@ export default {
     async getOssConfig(fileName) {
       const result = await new Promise((resolve, reject) => {
         getOssConfig()
-          .then((res) => {
-            const fileKey = this.createName(fileName);
+          .then(res => {
+            const fileKey = this.createName(fileName)
 
-            res.data.name = fileName;
-            res.data.key = res.data.dir + fileKey;
+            res.data.name = fileName
+            res.data.key = res.data.dir + fileKey
 
-            resolve(res.data);
+            resolve(res.data)
           })
-          .catch((res) => {
-            resolve({});
-          });
-      });
-      return result;
+          .catch(res => {
+            resolve({})
+          })
+      })
+      return result
     },
 
     // 预览图片
     previewImage(url) {
-      const index = findElem(this.fileList, "url", url);
-      this.$refs.img[index].showViewer = true;
+      const index = findElem(this.fileList, 'url', url)
+      this.$refs.img[index].showViewer = true
     },
 
     // 删除图片
     deleteImage(url) {
-      const index = findElem(this.fileList, "url", url);
-      this.fileList.splice(index, 1);
+      const index = findElem(this.fileList, 'url', url)
+      this.fileList.splice(index, 1)
     },
 
     // 点击上传
     uploadImage(url) {
-      this.uploadImageUrl = url;
-      document.querySelector(".uploader input").click();
+      this.uploadImageUrl = url
+      document.querySelector('.uploader input').click()
     },
 
     // 上传文件之前
     async beforeUpload(file) {
       const loading = this.$loading({
         lock: true,
-        text: "Loading",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
 
-      this.getFileName(file.name);
-      this.$emit("handleIsFileName", this.fileName);
-      this.dataObj = await this.getOssConfig(this.fileName);
-      console.log(this.dataObj, "ppp");
-      this.waitUploadList.push(this.dataObj);
+      this.getFileName(file.name)
+      this.$emit('handleIsFileName', this.fileName)
+      this.dataObj = await this.getOssConfig(this.fileName)
+      console.log(this.dataObj, 'ppp')
+      this.waitUploadList.push(this.dataObj)
     },
 
     // 文件上传成功
     uploadSuccess(res, file) {
       const loading = this.$loading({
         lock: true,
-        text: "Loading",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
 
       if (this.uploadImageUrl) {
-        const index = findElem(this.fileList, "url", this.uploadImageUrl);
+        const index = findElem(this.fileList, 'url', this.uploadImageUrl)
         this.$set(this.fileList, index, {
           name: this.dataObj.name,
           url: this.dataObj.key,
-          hover: false,
-        });
-        this.waitUploadList = [];
+          hover: false
+        })
+        this.waitUploadList = []
       } else {
-        this.getFileName(file.name);
-        const index = findElem(this.waitUploadList, "name", this.fileName);
+        this.getFileName(file.name)
+        const index = findElem(this.waitUploadList, 'name', this.fileName)
 
         this.fileList.push({
           name: this.waitUploadList[index].name,
           url: this.waitUploadList[index].key,
-          hover: false,
-        });
+          hover: false
+        })
 
-        this.waitUploadList.splice(index, 1);
+        this.waitUploadList.splice(index, 1)
       }
-      this.showFileList = true;
-      loading.close();
+      this.showFileList = true
+      loading.close()
     },
 
     getFileName(name) {
-      const fileName = name.substring(0, name.lastIndexOf("."));
-      let suffix = name.match(/.[^.]+$/)[0];
-      console.log(suffix, fileName);
+      const fileName = name.substring(0, name.lastIndexOf('.'))
+      let suffix = name.match(/.[^.]+$/)[0]
+      console.log(suffix, fileName)
       // 押金申请上传限制
-      this.fileName = name;
+      this.fileName = name
       if (this.startRestricting) {
         // 检查是否存在相应文字,否filterKeywords.length = 0
-        const filterKeywords = this.restrictFilename.filter((k) =>
-          fileName.includes(k)
-        );
+        const filterKeywords = this.restrictFilename.filter(k => fileName.includes(k))
         // filterKeywords = 0 || 'zip', 'rar', 'gz', 'apk' 归为 其他文件
-        if (
-          !filterKeywords.length ||
-          suffix.includes("zip", "rar", "gz", "apk")
-        ) {
-          this.fileName = `其他文件${suffix}`;
+        if (!filterKeywords.length || suffix.includes('zip', 'rar', 'gz', 'apk')) {
+          this.fileName = `其他文件${suffix}`
         }
         // 限制照片/相片名称统一为照片 , restrictFilename[restrictFilename.length-1|restrictFilename.length-1]为照片、相片
-        if (fileName.includes("相片") || fileName.includes("照片")) {
-          this.fileName = `照片${suffix}`;
+        if (fileName.includes('相片') || fileName.includes('照片')) {
+          this.fileName = `照片${suffix}`
         }
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style scoped lang="scss">

+ 30 - 26
src/components/Common/import-button.vue

@@ -1,12 +1,14 @@
 <template>
   <div>
     <el-upload
-      style="display: inline-block; margin: 0 10px;"
+      style="display: inline-block; margin: 0 10px"
       action="import"
       :http-request="handleImport"
       :file-list="importFileList"
     >
-      <el-button size="mini" type="primary" :icon="isIcon ? 'el-icon-download':''" :loading="importLoading">{{ importLoading ? '导入中...' : imText }}</el-button>
+      <el-button size="mini" type="primary" :icon="isIcon ? 'el-icon-download' : ''" :loading="importLoading">{{
+        importLoading ? '导入中...' : imText
+      }}</el-button>
     </el-upload>
   </div>
 </template>
@@ -17,19 +19,23 @@ import { handleImport } from '@/utils/util'
 export default {
   name: 'ImportButton',
   props: {
-    imText: { // 按钮文字
+    imText: {
+      // 按钮文字
       type: String,
       default: '导入数据'
     },
-    isIcon: { // 是否显示icon图标
+    isIcon: {
+      // 是否显示icon图标
       type: Boolean,
       default: true
     },
-    imUrl: { // 导入地址
+    imUrl: {
+      // 导入地址
       type: String,
-      default: '',
+      default: ''
     },
-    imParams: { // 导入参数
+    imParams: {
+      // 导入参数
       type: Object,
       default: null
     }
@@ -37,42 +43,40 @@ export default {
   data() {
     return {
       importLoading: false,
-      importFileList: [],
+      importFileList: []
     }
   },
   methods: {
     async handleImport(param) {
-      this.importLoading = true;
-      const file = param.file;
-      const formData = new FormData();
-      formData.append("file", file);
+      this.importLoading = true
+      const file = param.file
+      const formData = new FormData()
+      formData.append('file', file)
 
-      if(this.imParams) {
+      if (this.imParams) {
         for (let key in this.imParams) {
           if (this.imParams.hasOwnProperty(key)) {
-            formData.append(key, this.imParams[key]);
+            formData.append(key, this.imParams[key])
           }
         }
       }
 
-      let result = await handleImport(this.imUrl, formData);
-      this.importLoading = false;
-      this.importFileList = [];
-      if(result.code == 200) {
+      let result = await handleImport(this.imUrl, formData)
+      this.importLoading = false
+      this.importFileList = []
+      if (result.code == 200) {
         this.$alert(result.message, '导入成功', {
           confirmButtonText: '确定'
-        });
-        this.$emit('importSuccess', result.data);
-      }else {
+        })
+        this.$emit('importSuccess', result.data)
+      } else {
         this.$alert(result.message, '导入失败', {
           confirmButtonText: '确定'
-        });
+        })
       }
-    },
+    }
   }
 }
 </script>
 
-<style>
-
-</style>
+<style></style>

+ 150 - 153
src/components/Common/print-common.vue

@@ -2,7 +2,7 @@
   <div class="detail-container">
     <div class="print-page" v-for="(item, index) in showData" :key="index">
       <div class="print-title">
-        <div class="title1">{{company}}{{ item.type === 2 ? '销售退货单':'销售发货单' }}</div>
+        <div class="title1">{{ company }}{{ item.type === 2 ? '销售退货单' : '销售发货单' }}</div>
       </div>
       <div class="print-form-1">
         <el-row :gutter="0">
@@ -12,7 +12,7 @@
           </el-col>
           <el-col :span="12" class="item">
             <div class="label">打印日期:</div>
-            <div class="value">{{nowDate}}</div>
+            <div class="value">{{ nowDate }}</div>
           </el-col>
           <el-col :span="12" class="item">
             <div class="label">经销商:</div>
@@ -22,7 +22,6 @@
             <div class="label">仓库:</div>
             <div class="value">{{ item.correspondName }}</div>
           </el-col>
-
         </el-row>
       </div>
 
@@ -47,13 +46,15 @@
               <el-col :span="2">{{ it.salesId }}</el-col>
               <el-col :span="2">{{ it.invoiceId }}</el-col>
               <el-col :span="2">{{ it.id ? dateToDayFilter(item.createTime) : '' }}</el-col>
-              <el-col :span="3">{{ it.enginOrderType =='HOME' || it.enginOrderType =='TRADE'? it.enginOrderNo :it.mainOrderId }}</el-col>
+              <el-col :span="3">{{
+                it.enginOrderType == 'HOME' || it.enginOrderType == 'TRADE' ? it.enginOrderNo : it.mainOrderId
+              }}</el-col>
               <!-- <el-col :span="2">{{ it.refEnginRecordNo }}</el-col> -->
               <el-col :span="3">{{ it.materialName }}</el-col>
               <el-col :span="6">{{ it.specification }}</el-col>
               <el-col :span="2">{{ it.refundableQty }}</el-col>
               <el-col :span="2">{{ it.headerRemark }}</el-col>
-               <el-col :span="2">{{ it.pjxh1Text }}</el-col>
+              <el-col :span="2">{{ it.pjxh1Text }}</el-col>
             </el-row>
           </div>
         </div>
@@ -68,7 +69,7 @@
       <div class="print-form-2">
         <el-row :gutter="30">
           <el-col :span="8" class="item">
-            <div class="label">{{ item.type === 2 ? '退货人':'提货人' }}</div>
+            <div class="label">{{ item.type === 2 ? '退货人' : '提货人' }}</div>
             <div class="value">
               <el-input value=""></el-input>
             </div>
@@ -105,14 +106,11 @@
           </el-col>
         </el-row>
       </div>
-
     </div>
-
   </div>
 </template>
 
 <script>
-
 export default {
   name: 'PrintFoshan',
   props: {
@@ -128,51 +126,53 @@ export default {
 
   computed: {
     showData() {
-      var showData = [];
-      if(this.detailData && this.detailData.invoicePickBeans) {
-        for(var i=0; i<this.detailData.invoicePickBeans.length; i+=5){
-          let obj = JSON.parse(JSON.stringify(this.detailData));
-          obj.userName = JSON.parse(localStorage.getItem("supply_user")).nickName;
-          obj.invoicePickBeans = this.detailData.invoicePickBeans.slice(i, i+5);
-          obj.total_num = 0;
-          obj.total_price = 0;
-          obj.total_amount = 0;
-          obj.total_discount = 0;
+      var showData = []
+      if (this.detailData && this.detailData.invoicePickBeans) {
+        for (var i = 0; i < this.detailData.invoicePickBeans.length; i += 5) {
+          let obj = JSON.parse(JSON.stringify(this.detailData))
+          obj.userName = JSON.parse(localStorage.getItem('supply_user')).nickName
+          obj.invoicePickBeans = this.detailData.invoicePickBeans.slice(i, i + 5)
+          obj.total_num = 0
+          obj.total_price = 0
+          obj.total_amount = 0
+          obj.total_discount = 0
           obj.invoicePickBeans.forEach(item => {
-            obj.total_num = obj.total_num + item.refundableQty;
-          });
-          for(var j=0; j<5; j++){
-            if(!obj.invoicePickBeans[j]) {
-              obj.invoicePickBeans[j] = {};
+            obj.total_num = obj.total_num + item.refundableQty
+          })
+          for (var j = 0; j < 5; j++) {
+            if (!obj.invoicePickBeans[j]) {
+              obj.invoicePickBeans[j] = {}
             }
           }
-          showData.push(obj);
+          showData.push(obj)
         }
       }
-      console.log(showData);
-      return showData;
+      console.log(showData)
+      return showData
     },
 
     nowDate() {
-      var date = new Date();
-      var seperator1 = "-";
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      var strDate = date.getDate();
+      var date = new Date()
+      var seperator1 = '-'
+      var year = date.getFullYear()
+      var month = date.getMonth() + 1
+      var strDate = date.getDate()
       if (month >= 1 && month <= 9) {
-          month = "0" + month;
+        month = '0' + month
       }
       if (strDate >= 0 && strDate <= 9) {
-          strDate = "0" + strDate;
+        strDate = '0' + strDate
       }
-      var currentdate = year + seperator1 + month + seperator1 + strDate;
-      return currentdate;
-    },
+      var currentdate = year + seperator1 + month + seperator1 + strDate
+      return currentdate
+    }
   },
 
   methods: {
     dateToDayFilter(date) {
-      if(!date) {return ''}
+      if (!date) {
+        return ''
+      }
       return date.slice(0, 10)
     }
   }
@@ -180,138 +180,135 @@ export default {
 </script>
 
 <style scoped lang="scss">
-
-  .detail-container {
-    width: 100%;
-    height: 100%;
-
-  }
-  .print-page {
-    margin: 20px 0;
-    // min-height: 1020px;
-    page-break-after: always;
+.detail-container {
+  width: 100%;
+  height: 100%;
+}
+.print-page {
+  margin: 20px 0;
+  // min-height: 1020px;
+  page-break-after: always;
+}
+.print-title {
+  text-align: center;
+  .title1 {
+    font-size: 22px;
+    margin-bottom: 15px;
   }
-  .print-title {
-    text-align: center;
-    .title1 {
-      font-size: 22px;
-      margin-bottom: 15px;
+}
+.print-form-1 {
+  padding-left: 10px;
+  .item {
+    display: flex;
+    padding-right: 10px;
+    .label {
+      height: 32px;
+      display: flex;
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 13px;
+      color: #333333;
+      flex-shrink: 0;
     }
-  }
-  .print-form-1 {
-    padding-left: 10px;
-    .item {
+    .value {
+      flex: 1;
+      height: 32px;
       display: flex;
-      padding-right: 10px;
-      .label {
-        height: 32px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 13px;
-        color: #333333;
-        flex-shrink: 0;
-      }
-      .value {
-        flex: 1;
-        height: 32px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 13px;
-        color: #333333;
-        input {
-          border: none;
-          padding: 0;
-        }
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 13px;
+      color: #333333;
+      input {
+        border: none;
+        padding: 0;
       }
     }
   }
-  .print-table-1 {
-    font-size: 12px;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    border-right: 1px solid #EBEEF5;
+}
+.print-table-1 {
+  font-size: 12px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  border-right: 1px solid #ebeef5;
+  .el-row {
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+    border: 1px solid #ebeef5;
+    border-right: none;
+  }
+  .el-col {
+    padding-top: 14px;
+    padding-bottom: 14px;
+    // border-right: 1px solid #EBEEF5;
+  }
+  .head {
+    color: #909399;
+    // font-weight: bold;
+    .el-col {
+      padding-right: 0 !important;
+      display: flex;
+      height: 32px;
+      align-items: center;
+    }
+  }
+  .body {
+    color: #333333;
     .el-row {
-      margin-left: 0 !important;
-      margin-right: 0 !important;
-      border: 1px solid #EBEEF5;
-      border-right: none;
+      border-top: none;
     }
     .el-col {
-      padding-top: 14px;
-      padding-bottom: 14px;
-      // border-right: 1px solid #EBEEF5;
-    }
-    .head {
-      color: #909399;
-      // font-weight: bold;
-      .el-col {
-        padding-right: 0 !important;
-        display: flex;
-        height: 32px;
-        align-items: center;
-      }
+      padding-right: 0 !important;
+      display: flex;
+      height: 32px;
+      align-items: center;
+      word-break: break-all;
     }
-    .body {
-      color: #333333;
-      .el-row {
-        border-top: none;
-      }
-      .el-col {
-        padding-right: 0 !important;
-        display: flex;
-        height: 32px;
-        align-items: center;
-        word-break: break-all;
-      }
+  }
+  .foot {
+    color: #333333;
+    .el-row {
+      border-top: none;
     }
-    .foot {
-      color: #333333;
-      .el-row {
-        border-top: none;
-      }
-      .el-col {
-        padding: 0;
-        display: flex;
-        height: 32px;
-        align-items: center;
-        word-break: break-all;
-      }
+    .el-col {
+      padding: 0;
+      display: flex;
+      height: 32px;
+      align-items: center;
+      word-break: break-all;
     }
   }
+}
 
-  .print-form-2 {
-    padding-left: 10px;
-    .item {
+.print-form-2 {
+  padding-left: 10px;
+  .item {
+    display: flex;
+    padding-right: 10px;
+    .label {
+      height: 32px;
       display: flex;
-      padding-right: 10px;
-      .label {
-        height: 32px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 13px;
-        color: #333333;
-        flex-shrink: 0;
-      }
-      .value {
-        flex: 1;
-        height: 32px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 13px;
+      color: #333333;
+      flex-shrink: 0;
+    }
+    .value {
+      flex: 1;
+      height: 32px;
+      display: flex;
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 13px;
+      color: #333333;
+      ::v-deep .el-input input {
+        height: 30px;
+        border: none;
+        border-bottom: 1px solid #ebeef5;
+        padding: 0 10px;
         font-size: 13px;
-        color: #333333;
-        ::v-deep .el-input input {
-          height: 30px;
-          border: none;
-          border-bottom: 1px solid #EBEEF5;
-          padding: 0 10px;
-          font-size: 13px;
-        }
       }
     }
   }
-
+}
 </style>

+ 141 - 146
src/components/Common/print-foshan.vue

@@ -2,10 +2,10 @@
   <div class="detail-container">
     <div class="print-page" v-for="(item, index) in showData" :key="index">
       <div class="print-title">
-        <div class="title1">{{company}}</div>
+        <div class="title1">{{ company }}</div>
         <div class="title2">
           <div></div>
-          <div>{{ item.type === 2 ? '销售退货单':'销售发货单' }}</div>
+          <div>{{ item.type === 2 ? '销售退货单' : '销售发货单' }}</div>
           <div>{{ item.pickOrderWater }}</div>
         </div>
       </div>
@@ -17,7 +17,7 @@
           </el-col>
           <el-col :span="6" class="item">
             <div class="label">出库日期:</div>
-            <div class="value">{{nowDate}}</div>
+            <div class="value">{{ nowDate }}</div>
           </el-col>
           <el-col :span="6" class="item">
             <div class="label">仓库:</div>
@@ -97,12 +97,10 @@
         </el-row>
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
-
 export default {
   name: 'PrintFoshan',
   props: {
@@ -118,183 +116,180 @@ export default {
 
   computed: {
     showData() {
-      var showData = [];
-      if(this.detailData && this.detailData.invoicePickBeans) {
-        for(var i=0; i<this.detailData.invoicePickBeans.length; i+=2){
-          let obj = JSON.parse(JSON.stringify(this.detailData));
-          obj.invoicePickBeans = this.detailData.invoicePickBeans.slice(i, i+2);
-          let num = 0;
+      var showData = []
+      if (this.detailData && this.detailData.invoicePickBeans) {
+        for (var i = 0; i < this.detailData.invoicePickBeans.length; i += 2) {
+          let obj = JSON.parse(JSON.stringify(this.detailData))
+          obj.invoicePickBeans = this.detailData.invoicePickBeans.slice(i, i + 2)
+          let num = 0
           obj.invoicePickBeans.forEach(item => {
-            num = num + item.refundableQty;
-          });
-          obj.total = num;
-          showData.push(obj);
+            num = num + item.refundableQty
+          })
+          obj.total = num
+          showData.push(obj)
         }
       }
-      console.log(showData);
-      return showData;
+      console.log(showData)
+      return showData
     },
 
     nowDate() {
-      var date = new Date();
-      var seperator1 = "-";
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      var strDate = date.getDate();
+      var date = new Date()
+      var seperator1 = '-'
+      var year = date.getFullYear()
+      var month = date.getMonth() + 1
+      var strDate = date.getDate()
       if (month >= 1 && month <= 9) {
-          month = "0" + month;
+        month = '0' + month
       }
       if (strDate >= 0 && strDate <= 9) {
-          strDate = "0" + strDate;
+        strDate = '0' + strDate
       }
-      var currentdate = year + seperator1 + month + seperator1 + strDate;
-      return currentdate;
-    },
+      var currentdate = year + seperator1 + month + seperator1 + strDate
+      return currentdate
+    }
   },
 
-  methods: {
-
-  }
+  methods: {}
 }
 </script>
 
 <style scoped lang="scss">
-  .detail-container {
-    width: 100%;
-    height: 100%;
+.detail-container {
+  width: 100%;
+  height: 100%;
+}
+.print-page {
+  margin-bottom: 50px;
+  // min-height: 1020px;
+  page-break-after: always;
+}
+.print-title {
+  text-align: center;
+  .title1 {
+    font-size: 24px;
+    margin-bottom: 18px;
   }
-  .print-page {
-    margin-bottom: 50px;
-    // min-height: 1020px;
-    page-break-after: always;
+  .title2 {
+    font-size: 18px;
+    margin-bottom: 24px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    div {
+      width: 33.333%;
+    }
   }
-  .print-title {
-    text-align: center;
-    .title1 {
-      font-size: 24px;
-      margin-bottom: 18px;
+}
+.print-form-1 {
+  .item {
+    display: flex;
+    padding-right: 10px;
+    .label {
+      height: 40px;
+      display: flex;
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 14px;
+      color: #333333;
+      flex-shrink: 0;
     }
-    .title2 {
-      font-size: 18px;
-      margin-bottom: 24px;
+    .value {
+      flex: 1;
+      height: 40px;
       display: flex;
-      justify-content: space-between;
       align-items: center;
-      div {
-        width: 33.333%;
+      box-sizing: border-box;
+      font-size: 14px;
+      color: #333333;
+      input {
+        border: none;
+        padding: 0;
       }
     }
   }
-  .print-form-1 {
-    .item {
+}
+
+.print-table-1 {
+  font-size: 14px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  .el-row {
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+    border: 1px solid #ebeef5;
+    border-right: none;
+  }
+  .el-col {
+    padding-top: 14px;
+    padding-bottom: 14px;
+    border-right: 1px solid #ebeef5;
+  }
+  .head {
+    color: #909399;
+    font-weight: bold;
+    .el-col {
+      padding: 0;
       display: flex;
-      padding-right: 10px;
-      .label {
-        height: 40px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 14px;
-        color: #333333;
-        flex-shrink: 0;
-      }
-      .value {
-        flex: 1;
-        height: 40px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 14px;
-        color: #333333;
-        input {
-          border: none;
-          padding: 0;
-        }
-      }
+      height: 40px;
+      align-items: center;
     }
   }
-
-  .print-table-1 {
-    font-size: 14px;
-    margin-top: 10px;
-    margin-bottom: 10px;
+  .body {
+    color: #333333;
     .el-row {
-      margin-left: 0 !important;
-      margin-right: 0 !important;
-      border: 1px solid #EBEEF5;
-      border-right: none;
+      border-top: none;
     }
     .el-col {
-      padding-top: 14px;
-      padding-bottom: 14px;
-      border-right: 1px solid #EBEEF5;
-    }
-    .head {
-      color: #909399;
-      font-weight: bold;
-      .el-col {
-        padding: 0;
-        display: flex;
-        height: 40px;
-        align-items: center;
-      }
-    }
-    .body {
-      color: #333333;
-      .el-row {
-        border-top: none;
-      }
-      .el-col {
-        padding: 0;
-        display: flex;
-        height: 40px;
-        align-items: center;
-        word-break: break-all;
-      }
+      padding: 0;
+      display: flex;
+      height: 40px;
+      align-items: center;
+      word-break: break-all;
     }
-    .foot {
-      color: #333333;
-      margin-top: 10px;
-      // border-right: 1px solid #EBEEF5;
-      .el-col {
-        padding: 0;
-        display: flex;
-        height: 40px;
-        align-items: center;
-        word-break: break-all;
-      }
+  }
+  .foot {
+    color: #333333;
+    margin-top: 10px;
+    // border-right: 1px solid #EBEEF5;
+    .el-col {
+      padding: 0;
+      display: flex;
+      height: 40px;
+      align-items: center;
+      word-break: break-all;
     }
   }
+}
 
-  .print-form-2 {
-    .item {
+.print-form-2 {
+  .item {
+    display: flex;
+    padding-right: 10px;
+    .label {
+      height: 40px;
       display: flex;
-      padding-right: 10px;
-      .label {
-        height: 40px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 14px;
-        color: #333333;
-        flex-shrink: 0;
-      }
-      .value {
-        flex: 1;
-        height: 40px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 14px;
-        color: #333333;
-        ::v-deep .el-input input {
-          height: 30px;
-          border: none;
-          border-bottom: 1px solid #EBEEF5;
-          padding: 0 10px;
-        }
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 14px;
+      color: #333333;
+      flex-shrink: 0;
+    }
+    .value {
+      flex: 1;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 14px;
+      color: #333333;
+      ::v-deep .el-input input {
+        height: 30px;
+        border: none;
+        border-bottom: 1px solid #ebeef5;
+        padding: 0 10px;
       }
     }
   }
-
+}
 </style>

+ 138 - 144
src/components/Common/print-guangzhou.vue

@@ -2,10 +2,10 @@
   <div class="detail-container">
     <div class="print-page" v-for="(item, index) in showData" :key="index">
       <div class="print-title">
-        <div class="title1">{{company}}</div>
+        <div class="title1">{{ company }}</div>
         <div class="title2">
           <div></div>
-          <div>{{ item.type === 2 ? '销售退货单':'销售发货单' }}</div>
+          <div>{{ item.type === 2 ? '销售退货单' : '销售发货单' }}</div>
           <div>{{ item.pickOrderWater }}</div>
         </div>
       </div>
@@ -146,14 +146,11 @@
           <span>元。</span>
         </div>
       </div>
-
     </div>
-
   </div>
 </template>
 
 <script>
-
 export default {
   name: 'PrintFoshan',
   props: {
@@ -169,182 +166,179 @@ export default {
 
   computed: {
     showData() {
-      var showData = [];
-      if(this.detailData && this.detailData.invoicePickBeans) {
-        for(var i=0; i<this.detailData.invoicePickBeans.length; i+=5){
-          let obj = JSON.parse(JSON.stringify(this.detailData));
-          obj.userName = JSON.parse(localStorage.getItem("supply_user")).nickName;
-          obj.invoicePickBeans = this.detailData.invoicePickBeans.slice(i, i+5);
-          obj.total_num = 0;
-          obj.total_price = 0;
-          obj.total_amount = 0;
-          obj.total_discount = 0;
+      var showData = []
+      if (this.detailData && this.detailData.invoicePickBeans) {
+        for (var i = 0; i < this.detailData.invoicePickBeans.length; i += 5) {
+          let obj = JSON.parse(JSON.stringify(this.detailData))
+          obj.userName = JSON.parse(localStorage.getItem('supply_user')).nickName
+          obj.invoicePickBeans = this.detailData.invoicePickBeans.slice(i, i + 5)
+          obj.total_num = 0
+          obj.total_price = 0
+          obj.total_amount = 0
+          obj.total_discount = 0
           obj.invoicePickBeans.forEach(item => {
-            obj.total_num = obj.total_num + item.refundableQty;
-            obj.total_price = obj.total_price + item.price;
-            obj.total_amount = obj.total_amount + item.payAmount;
-            obj.total_discount = obj.total_discount + item.totalDiscAmount;
-          });
-          for(var j=0; j<5; j++){
-            if(!obj.invoicePickBeans[j]) {
-              obj.invoicePickBeans[j] = {};
+            obj.total_num = obj.total_num + item.refundableQty
+            obj.total_price = obj.total_price + item.price
+            obj.total_amount = obj.total_amount + item.payAmount
+            obj.total_discount = obj.total_discount + item.totalDiscAmount
+          })
+          for (var j = 0; j < 5; j++) {
+            if (!obj.invoicePickBeans[j]) {
+              obj.invoicePickBeans[j] = {}
             }
           }
-          showData.push(obj);
+          showData.push(obj)
         }
       }
-      console.log(showData);
-      return showData;
+      console.log(showData)
+      return showData
     },
-    
+
     nowDate() {
-      var date = new Date();
-      var seperator1 = "-";
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      var strDate = date.getDate();
+      var date = new Date()
+      var seperator1 = '-'
+      var year = date.getFullYear()
+      var month = date.getMonth() + 1
+      var strDate = date.getDate()
       if (month >= 1 && month <= 9) {
-          month = "0" + month;
+        month = '0' + month
       }
       if (strDate >= 0 && strDate <= 9) {
-          strDate = "0" + strDate;
+        strDate = '0' + strDate
       }
-      var currentdate = year + seperator1 + month + seperator1 + strDate;
-      return currentdate;
-    },
+      var currentdate = year + seperator1 + month + seperator1 + strDate
+      return currentdate
+    }
   },
 
-  methods: {
-
-  }
+  methods: {}
 }
 </script>
 
 <style scoped lang="scss">
-  .detail-container {
-    width: 100%;
-    height: 100%;
-  }
-  .print-page {
-    margin-bottom: 50px;
-    // min-height: 1020px;
-    page-break-after: always;
+.detail-container {
+  width: 100%;
+  height: 100%;
+}
+.print-page {
+  margin-bottom: 50px;
+  // min-height: 1020px;
+  page-break-after: always;
+}
+.print-title {
+  text-align: center;
+  .title1 {
+    font-size: 24px;
+    margin-bottom: 18px;
   }
-  .print-title {
-    text-align: center;
-    .title1 {
-      font-size: 24px;
-      margin-bottom: 18px;
+  .title2 {
+    font-size: 18px;
+    margin-bottom: 24px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    div {
+      width: 33.333%;
     }
-    .title2 {
-      font-size: 18px;
-      margin-bottom: 24px;
+  }
+}
+.print-table-1 {
+  font-size: 14px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  .el-row {
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+    border: 1px solid #ebeef5;
+    border-right: none;
+  }
+  .el-col {
+    padding-top: 14px;
+    padding-bottom: 14px;
+    border-right: 1px solid #ebeef5;
+  }
+  .head {
+    color: #909399;
+    font-weight: bold;
+    .el-col {
+      padding: 0;
       display: flex;
-      justify-content: space-between;
+      height: 40px;
       align-items: center;
-      div {
-        width: 33.333%;
-      }
     }
   }
-  .print-table-1 {
-    font-size: 14px;
-    margin-top: 10px;
-    margin-bottom: 10px;
+  .body {
+    color: #333333;
     .el-row {
-      margin-left: 0 !important;
-      margin-right: 0 !important;
-      border: 1px solid #EBEEF5;
-      border-right: none;
+      border-top: none;
     }
     .el-col {
-      padding-top: 14px;
-      padding-bottom: 14px;
-      border-right: 1px solid #EBEEF5;
-    }
-    .head {
-      color: #909399;
-      font-weight: bold;
-      .el-col {
-        padding: 0;
-        display: flex;
-        height: 40px;
-        align-items: center;
-      }
-    }
-    .body {
-      color: #333333;
-      .el-row {
-        border-top: none;
-      }
-      .el-col {
-        padding: 0;
-        display: flex;
-        height: 40px;
-        align-items: center;
-        word-break: break-all;
-      }
-    }
-    .foot {
-      color: #333333;
-      .el-row {
-        border-top: none;
-      }
-      .el-col {
-        padding: 0;
-        display: flex;
-        height: 40px;
-        align-items: center;
-        word-break: break-all;
-      }
+      padding: 0;
+      display: flex;
+      height: 40px;
+      align-items: center;
+      word-break: break-all;
     }
   }
-
-  .print-form-2 {
-    .item {
+  .foot {
+    color: #333333;
+    .el-row {
+      border-top: none;
+    }
+    .el-col {
+      padding: 0;
       display: flex;
-      padding-right: 10px;
-      .label {
-        height: 32px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 14px;
-        color: #333333;
-        flex-shrink: 0;
-      }
-      .value {
-        flex: 1;
-        height: 32px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 14px;
-        color: #333333;
-        ::v-deep .el-input input {
-          height: 30px;
-          border: none;
-          border-bottom: 1px solid #EBEEF5;
-          padding: 0 10px;
-        }
-      }
+      height: 40px;
+      align-items: center;
+      word-break: break-all;
     }
   }
+}
 
-  .print-text {
-    font-size: 14px;
-    &>div {
+.print-form-2 {
+  .item {
+    display: flex;
+    padding-right: 10px;
+    .label {
+      height: 32px;
       display: flex;
-      margin-top: 10px;
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 14px;
+      color: #333333;
+      flex-shrink: 0;
     }
-    ::v-deep .el-input {
-      width: 50px;
-      input {
+    .value {
+      flex: 1;
+      height: 32px;
+      display: flex;
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 14px;
+      color: #333333;
+      ::v-deep .el-input input {
         height: 30px;
         border: none;
+        border-bottom: 1px solid #ebeef5;
         padding: 0 10px;
       }
-    } 
+    }
   }
+}
 
-</style>
+.print-text {
+  font-size: 14px;
+  & > div {
+    display: flex;
+    margin-top: 10px;
+  }
+  ::v-deep .el-input {
+    width: 50px;
+    input {
+      height: 30px;
+      border: none;
+      padding: 0 10px;
+    }
+  }
+}
+</style>

+ 135 - 141
src/components/Common/print-shaoguan.vue

@@ -2,10 +2,10 @@
   <div class="detail-container">
     <div class="print-page" v-for="(item, index) in showData" :key="index">
       <div class="print-title">
-        <div class="title1">{{company}}</div>
+        <div class="title1">{{ company }}</div>
         <div class="title2">
           <div></div>
-          <div>{{ item.type === 2 ? '销售退货单':'销售发货单' }}</div>
+          <div>{{ item.type === 2 ? '销售退货单' : '销售发货单' }}</div>
           <div>{{ item.pickOrderWater }}</div>
         </div>
       </div>
@@ -137,14 +137,11 @@
           <span>元。</span>
         </div>
       </div>
-
     </div>
-
   </div>
 </template>
 
 <script>
-
 export default {
   name: 'PrintFoshan',
   props: {
@@ -160,179 +157,176 @@ export default {
 
   computed: {
     showData() {
-      var showData = [];
-      if(this.detailData && this.detailData.invoicePickBeans) {
-        for(var i=0; i<this.detailData.invoicePickBeans.length; i+=5){
-          let obj = JSON.parse(JSON.stringify(this.detailData));
-          obj.userName = JSON.parse(localStorage.getItem("supply_user")).nickName;
-          obj.invoicePickBeans = this.detailData.invoicePickBeans.slice(i, i+5);
-          obj.total_num = 0;
-          obj.total_price = 0;
-          obj.total_amount = 0;
-          obj.total_discount = 0;
+      var showData = []
+      if (this.detailData && this.detailData.invoicePickBeans) {
+        for (var i = 0; i < this.detailData.invoicePickBeans.length; i += 5) {
+          let obj = JSON.parse(JSON.stringify(this.detailData))
+          obj.userName = JSON.parse(localStorage.getItem('supply_user')).nickName
+          obj.invoicePickBeans = this.detailData.invoicePickBeans.slice(i, i + 5)
+          obj.total_num = 0
+          obj.total_price = 0
+          obj.total_amount = 0
+          obj.total_discount = 0
           obj.invoicePickBeans.forEach(item => {
-            obj.total_num = obj.total_num + item.refundableQty;
-          });
-          for(var j=0; j<5; j++){
-            if(!obj.invoicePickBeans[j]) {
-              obj.invoicePickBeans[j] = {};
+            obj.total_num = obj.total_num + item.refundableQty
+          })
+          for (var j = 0; j < 5; j++) {
+            if (!obj.invoicePickBeans[j]) {
+              obj.invoicePickBeans[j] = {}
             }
           }
-          showData.push(obj);
+          showData.push(obj)
         }
       }
-      console.log(showData);
-      return showData;
+      console.log(showData)
+      return showData
     },
-    
+
     nowDate() {
-      var date = new Date();
-      var seperator1 = "-";
-      var year = date.getFullYear();
-      var month = date.getMonth() + 1;
-      var strDate = date.getDate();
+      var date = new Date()
+      var seperator1 = '-'
+      var year = date.getFullYear()
+      var month = date.getMonth() + 1
+      var strDate = date.getDate()
       if (month >= 1 && month <= 9) {
-          month = "0" + month;
+        month = '0' + month
       }
       if (strDate >= 0 && strDate <= 9) {
-          strDate = "0" + strDate;
+        strDate = '0' + strDate
       }
-      var currentdate = year + seperator1 + month + seperator1 + strDate;
-      return currentdate;
-    },
+      var currentdate = year + seperator1 + month + seperator1 + strDate
+      return currentdate
+    }
   },
 
-  methods: {
-
-  }
+  methods: {}
 }
 </script>
 
 <style scoped lang="scss">
-  .detail-container {
-    width: 100%;
-    height: 100%;
-  }
-  .print-page {
-    margin-bottom: 50px;
-    // min-height: 1020px;
-    page-break-after: always;
+.detail-container {
+  width: 100%;
+  height: 100%;
+}
+.print-page {
+  margin-bottom: 50px;
+  // min-height: 1020px;
+  page-break-after: always;
+}
+.print-title {
+  text-align: center;
+  .title1 {
+    font-size: 24px;
+    margin-bottom: 18px;
   }
-  .print-title {
-    text-align: center;
-    .title1 {
-      font-size: 24px;
-      margin-bottom: 18px;
+  .title2 {
+    font-size: 18px;
+    margin-bottom: 24px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    div {
+      width: 33.333%;
     }
-    .title2 {
-      font-size: 18px;
-      margin-bottom: 24px;
+  }
+}
+.print-table-1 {
+  font-size: 14px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  .el-row {
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+    border: 1px solid #ebeef5;
+    border-right: none;
+  }
+  .el-col {
+    padding-top: 14px;
+    padding-bottom: 14px;
+    border-right: 1px solid #ebeef5;
+  }
+  .head {
+    color: #909399;
+    font-weight: bold;
+    .el-col {
+      padding: 0;
       display: flex;
-      justify-content: space-between;
+      height: 40px;
       align-items: center;
-      div {
-        width: 33.333%;
-      }
     }
   }
-  .print-table-1 {
-    font-size: 14px;
-    margin-top: 10px;
-    margin-bottom: 10px;
+  .body {
+    color: #333333;
     .el-row {
-      margin-left: 0 !important;
-      margin-right: 0 !important;
-      border: 1px solid #EBEEF5;
-      border-right: none;
+      border-top: none;
     }
     .el-col {
-      padding-top: 14px;
-      padding-bottom: 14px;
-      border-right: 1px solid #EBEEF5;
-    }
-    .head {
-      color: #909399;
-      font-weight: bold;
-      .el-col {
-        padding: 0;
-        display: flex;
-        height: 40px;
-        align-items: center;
-      }
-    }
-    .body {
-      color: #333333;
-      .el-row {
-        border-top: none;
-      }
-      .el-col {
-        padding: 0;
-        display: flex;
-        height: 40px;
-        align-items: center;
-        word-break: break-all;
-      }
-    }
-    .foot {
-      color: #333333;
-      .el-row {
-        border-top: none;
-      }
-      .el-col {
-        padding: 0;
-        display: flex;
-        height: 40px;
-        align-items: center;
-        word-break: break-all;
-      }
+      padding: 0;
+      display: flex;
+      height: 40px;
+      align-items: center;
+      word-break: break-all;
     }
   }
-
-  .print-form-2 {
-    .item {
+  .foot {
+    color: #333333;
+    .el-row {
+      border-top: none;
+    }
+    .el-col {
+      padding: 0;
       display: flex;
-      padding-right: 10px;
-      .label {
-        height: 32px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 14px;
-        color: #333333;
-        flex-shrink: 0;
-      }
-      .value {
-        flex: 1;
-        height: 32px;
-        display: flex;
-        align-items: center;
-        box-sizing: border-box;
-        font-size: 14px;
-        color: #333333;
-        ::v-deep .el-input input {
-          height: 30px;
-          border: none;
-          border-bottom: 1px solid #EBEEF5;
-          padding: 0 10px;
-        }
-      }
+      height: 40px;
+      align-items: center;
+      word-break: break-all;
     }
   }
+}
 
-  .print-text {
-    font-size: 14px;
-    &>div {
+.print-form-2 {
+  .item {
+    display: flex;
+    padding-right: 10px;
+    .label {
+      height: 32px;
       display: flex;
-      margin-top: 10px;
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 14px;
+      color: #333333;
+      flex-shrink: 0;
     }
-    ::v-deep .el-input {
-      width: 50px;
-      input {
+    .value {
+      flex: 1;
+      height: 32px;
+      display: flex;
+      align-items: center;
+      box-sizing: border-box;
+      font-size: 14px;
+      color: #333333;
+      ::v-deep .el-input input {
         height: 30px;
         border: none;
+        border-bottom: 1px solid #ebeef5;
         padding: 0 10px;
       }
-    } 
+    }
   }
+}
 
-</style>
+.print-text {
+  font-size: 14px;
+  & > div {
+    display: flex;
+    margin-top: 10px;
+  }
+  ::v-deep .el-input {
+    width: 50px;
+    input {
+      height: 30px;
+      border: none;
+      padding: 0 10px;
+    }
+  }
+}
+</style>

+ 113 - 37
src/components/Common/print-test.vue

@@ -1,64 +1,132 @@
 <template>
   <div id>
     <remote-css cdn="https://cdn.staticfile.org/twitter-bootstrap/4.3.1/css/bootstrap.min.css"></remote-css>
-<!--    <button type="button" @click="doPrint()">打印</button>-->
+    <!--    <button type="button" @click="doPrint()">打印</button>-->
     <!--startprint-->
-    <div class="page" id="printMe" style="margin-left: 20mm;">
+    <div class="page" id="printMe" style="margin-left: 20mm">
       <div class="top-title">
         <p class="ref-title">重庆壳牌能源有限公司中央仓收货单</p>
       </div>
       <div class="order-info px-4 mb-2">
         <div>
-          <span>收货日期:</span><span>${_receiptModel.workDate}</span>
-          <span>订单编号:</span><span>${_receiptModel.sheetId}</span>
-          <span>相关单号:</span><span>${_receiptModel.refSheetId}</span>
-        </div>
-        <div>
-          <span>供应商:</span><span>${_receiptModel.vender}</span>
+          <span>收货日期:</span><span>${_receiptModel.workDate}</span> <span>订单编号:</span
+          ><span>${_receiptModel.sheetId}</span> <span>相关单号:</span><span>${_receiptModel.refSheetId}</span>
         </div>
+        <div><span>供应商:</span><span>${_receiptModel.vender}</span></div>
       </div>
       <div>
         <table class="table">
           <thead>
-          <tr>
-            <th nowrap class="font-weight-normal">商品条码</th>
-            <th nowrap class="font-weight-normal px-0">商品名称</th>
-            <th nowrap class="text-center font-weight-normal">箱装数</th>
-            <th nowrap class="text-center font-weight-normal">预定箱数</th>
-            <th nowrap class="text-center font-weight-normal">预定总数</th>
-            <th nowrap class="text-center font-weight-normal">保质期</th>
-            <th nowrap class="text-center font-weight-normal">推荐库位</th>
-            <th nowrap class="text-center font-weight-normal">生产日期</th>
-          </tr>
+            <tr>
+              <th nowrap class="font-weight-normal">商品条码</th>
+              <th nowrap class="font-weight-normal px-0">商品名称</th>
+              <th nowrap class="text-center font-weight-normal">箱装数</th>
+              <th nowrap class="text-center font-weight-normal">预定箱数</th>
+              <th nowrap class="text-center font-weight-normal">预定总数</th>
+              <th nowrap class="text-center font-weight-normal">保质期</th>
+              <th nowrap class="text-center font-weight-normal">推荐库位</th>
+              <th nowrap class="text-center font-weight-normal">生产日期</th>
+            </tr>
           </thead>
           <tbody>
-            <tr><td>商品条码1</td><td>商品名称</td><td>箱装数</td><td>预定箱数</td><td>预定总数</td><td>保质期</td><td>推荐库位</td><td>生产日期</td></tr><tr><td>商品条码2</td><td>商品名称</td><td>箱装数</td><td>预定箱数</td><td>预定总数</td><td>保质期</td><td>推荐库位</td><td>生产日期</td></tr>
-            <tr><td>商品条码3</td><td>商品名称</td><td>箱装数</td><td>预定箱数</td><td>预定总数</td><td>保质期</td><td>推荐库位</td><td>生产日期</td></tr>
-            <tr><td>商品条码4</td><td>商品名称</td><td>箱装数</td><td>预定箱数</td><td>预定总数</td><td>保质期</td><td>推荐库位</td><td>生产日期</td></tr>
-            <tr><td>商品条码5</td><td>商品名称</td><td>箱装数</td><td>预定箱数</td><td>预定总数</td><td>保质期</td><td>推荐库位</td><td>生产日期</td></tr>
-            <tr><td>商品条码6</td><td>商品名称</td><td>箱装数</td><td>预定箱数</td><td>预定总数</td><td>保质期</td><td>推荐库位</td><td>生产日期</td></tr>
-            <tr><td>商品条码7</td><td>商品名称</td><td>箱装数</td><td>预定箱数</td><td>预定总数</td><td>保质期</td><td>推荐库位</td><td>生产日期</td></tr>
-            <tr><td>商品条码8</td><td>商品名称</td><td>箱装数</td><td>预定箱数</td><td>预定总数</td><td>保质期</td><td>推荐库位</td><td>生产日期</td></tr>
+            <tr>
+              <td>商品条码1</td>
+              <td>商品名称</td>
+              <td>箱装数</td>
+              <td>预定箱数</td>
+              <td>预定总数</td>
+              <td>保质期</td>
+              <td>推荐库位</td>
+              <td>生产日期</td>
+            </tr>
+            <tr>
+              <td>商品条码2</td>
+              <td>商品名称</td>
+              <td>箱装数</td>
+              <td>预定箱数</td>
+              <td>预定总数</td>
+              <td>保质期</td>
+              <td>推荐库位</td>
+              <td>生产日期</td>
+            </tr>
+            <tr>
+              <td>商品条码3</td>
+              <td>商品名称</td>
+              <td>箱装数</td>
+              <td>预定箱数</td>
+              <td>预定总数</td>
+              <td>保质期</td>
+              <td>推荐库位</td>
+              <td>生产日期</td>
+            </tr>
+            <tr>
+              <td>商品条码4</td>
+              <td>商品名称</td>
+              <td>箱装数</td>
+              <td>预定箱数</td>
+              <td>预定总数</td>
+              <td>保质期</td>
+              <td>推荐库位</td>
+              <td>生产日期</td>
+            </tr>
+            <tr>
+              <td>商品条码5</td>
+              <td>商品名称</td>
+              <td>箱装数</td>
+              <td>预定箱数</td>
+              <td>预定总数</td>
+              <td>保质期</td>
+              <td>推荐库位</td>
+              <td>生产日期</td>
+            </tr>
+            <tr>
+              <td>商品条码6</td>
+              <td>商品名称</td>
+              <td>箱装数</td>
+              <td>预定箱数</td>
+              <td>预定总数</td>
+              <td>保质期</td>
+              <td>推荐库位</td>
+              <td>生产日期</td>
+            </tr>
+            <tr>
+              <td>商品条码7</td>
+              <td>商品名称</td>
+              <td>箱装数</td>
+              <td>预定箱数</td>
+              <td>预定总数</td>
+              <td>保质期</td>
+              <td>推荐库位</td>
+              <td>生产日期</td>
+            </tr>
+            <tr>
+              <td>商品条码8</td>
+              <td>商品名称</td>
+              <td>箱装数</td>
+              <td>预定箱数</td>
+              <td>预定总数</td>
+              <td>保质期</td>
+              <td>推荐库位</td>
+              <td>生产日期</td>
+            </tr>
           </tbody>
         </table>
       </div>
     </div>
     <el-button v-print="printObj" type="primary" icon="el-icon-printer">打 印</el-button>
-  <!--endprint-->
+    <!--endprint-->
   </div>
 </template>
 
 <script>
-import print from 'vue-print-nb';
+import print from 'vue-print-nb'
 
 export default {
   name: 'PrintTest',
   components: {
     'remote-css': {
       render(h) {
-        return (
-          <link rel='stylesheet' type='text/css' href={this.cdn} />
-        )
+        return <link rel="stylesheet" type="text/css" href={this.cdn} />
       },
       props: {
         cdn: {
@@ -75,11 +143,10 @@ export default {
     return {
       printObj: {
         id: 'printMe'
-      },
+      }
     }
   },
   methods: {
-
     doPrint() {
       // let bdhtml=window.document.body.innerHTML;
       // let sprnstr="<!--startprint-->"; //开始打印标识字符串有17个字符
@@ -87,7 +154,7 @@ export default {
       // let prnhtml=bdhtml.substr(bdhtml.indexOf(sprnstr)+17); //从开始打印标识之后的内容
       // prnhtml=prnhtml.substring(0,prnhtml.indexOf(eprnstr)); //截取开始标识和结束标识之间的内容
       // window.document.body.innerHTML=prnhtml; //把需要打印的指定内容赋给body.innerHTML
-      window.print();
+      window.print()
       // window.document.body.innerHTML=bdhtml;
     }
   }
@@ -97,11 +164,20 @@ export default {
 <style scoped>
 /*.page {width: 220mm; height: 140mm; position: relative; margin: 0 auto; overflow: hidden;}*/
 /*.top-title {position: relative;}*/
-.ref-title {font-size: 36px; text-align: center; font-weight: 600;}
-.order-info {font-size: 18px;}
-th,td {font-size: 18px;}
+.ref-title {
+  font-size: 36px;
+  text-align: center;
+  font-weight: 600;
+}
+.order-info {
+  font-size: 18px;
+}
+th,
+td {
+  font-size: 18px;
+}
 #printMe {
-  font-family: "Microsoft YaHei","Arial","黑体",sans-serif;
+  font-family: 'Microsoft YaHei', 'Arial', '黑体', sans-serif;
 }
 
 /*.table tbody tr td{overflow: hidden;font-size:5mm; padding-bottom: 5mm;}*/

部分文件因为文件数量过多而无法显示