政策类型

package-lock.json

@@ -3983,11 +3983,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -4190,11 +4186,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmmirror.com/async-each/-/async-each-1.0.3.tgz",
       "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-<<<<<<< HEAD
-      "dev": true
-=======
       "devOptional": true
->>>>>>> feature/Feature-sales
     },
     "node_modules/async-limiter": {
       "version": "1.0.1",
@@ -5334,11 +5326,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "engines": {
         "node": ">=8"
       }
@@ -5347,11 +5335,7 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-<<<<<<< HEAD
       "dev": true,
-=======
-      "devOptional": true,
->>>>>>> feature/Feature-sales
       "dependencies": {
         "file-uri-to-path": "1.0.0"
       }
@@ -5459,11 +5443,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -5924,11 +5904,7 @@
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "funding": [
         {
           "type": "individual",
@@ -9252,11 +9228,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-<<<<<<< HEAD
       "dev": true
-=======
-      "devOptional": true
->>>>>>> feature/Feature-sales
     },
     "node_modules/filename-regex": {
       "version": "2.0.1",
@@ -9280,11 +9252,7 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -9640,23 +9608,6 @@
       "resolved": "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -9818,11 +9769,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -11032,11 +10979,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -11218,11 +11161,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11261,11 +11200,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -11289,11 +11224,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "engines": {
         "node": ">=0.12.0"
       }
@@ -12025,25 +11956,6 @@
         "normalize-path": "^2.1.1"
       }
     },
-    "node_modules/jest-haste-map/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
     "node_modules/jest-haste-map/node_modules/normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -13764,16 +13676,6 @@
         "thenify-all": "^1.0.0"
       }
     },
-    "node_modules/nan": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmmirror.com/nan/-/nan-2.16.0.tgz",
-      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
-      "optional": true
-    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -14058,11 +13960,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14776,11 +14674,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/path-dirname/-/path-dirname-1.0.2.tgz",
       "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
-<<<<<<< HEAD
-      "dev": true
-=======
       "devOptional": true
->>>>>>> feature/Feature-sales
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
@@ -14882,11 +14776,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "engines": {
         "node": ">=8.6"
       },
@@ -16317,11 +16207,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -16502,11 +16388,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
-<<<<<<< HEAD
-      "dev": true
-=======
       "devOptional": true
->>>>>>> feature/Feature-sales
     },
     "node_modules/repeat-element": {
       "version": "1.1.4",
@@ -18986,11 +18868,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -19511,11 +19389,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmmirror.com/upath/-/upath-1.2.0.tgz",
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-<<<<<<< HEAD
-      "dev": true,
-=======
       "devOptional": true,
->>>>>>> feature/Feature-sales
       "engines": {
         "node": ">=4",
         "yarn": "*"
@@ -19833,10 +19707,9 @@
         "worker-loader": "^2.0.0"
       }
     },
-<<<<<<< HEAD
     "node_modules/vue-print-nb": {
       "version": "1.7.5",
-      "resolved": "https://registry.npmmirror.com/vue-print-nb/-/vue-print-nb-1.7.5.tgz",
+      "resolved": "https://registry.npmjs.org/vue-print-nb/-/vue-print-nb-1.7.5.tgz",
       "integrity": "sha512-iNbNyUVRWz0Ha1UTiCKxMPtHLUDGgNI8e8xmD3xqm9RlXIUeX9bT7DgNAfY8vPzqyFRHqGjxLI1rycKH366ziQ==",
       "dependencies": {
         "vue": "^2.6.11"
@@ -19844,11 +19717,9 @@
     },
     "node_modules/vue-print-nb/node_modules/vue": {
       "version": "2.6.14",
-      "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.14.tgz",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
       "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
     },
-=======
->>>>>>> feature/Feature-sales
     "node_modules/vue-quill-editor": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz",
@@ -19955,10 +19826,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
       "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "chokidar": "^2.1.8"
@@ -19968,10 +19835,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "micromatch": "^3.1.4",
@@ -19982,10 +19845,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "remove-trailing-separator": "^1.0.1"
@@ -19998,10 +19857,6 @@
       "version": "1.13.1",
       "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-1.13.1.tgz",
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -20011,10 +19866,6 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmmirror.com/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "arr-flatten": "^1.1.0",
@@ -20037,10 +19888,6 @@
       "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-2.1.8.tgz",
       "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "anymatch": "^2.0.0",
@@ -20063,10 +19910,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "extend-shallow": "^2.0.1",
@@ -20078,36 +19921,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
     "node_modules/watchpack-chokidar2/node_modules/glob-parent": {
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-3.1.0.tgz",
       "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "is-glob": "^3.1.0",
@@ -20118,10 +19935,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-3.1.0.tgz",
       "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "is-extglob": "^2.1.0"
@@ -20134,10 +19947,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "binary-extensions": "^1.0.0"
@@ -20150,10 +19959,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -20166,10 +19971,6 @@
       "version": "2.3.7",
       "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.7.tgz",
       "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -20185,10 +19986,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "graceful-fs": "^4.1.11",
@@ -20203,10 +20000,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
@@ -20216,10 +20009,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> feature/Feature-sales
       "optional": true,
       "dependencies": {
         "is-number": "^3.0.0",
@@ -20544,25 +20333,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/webpack-dev-server/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
     "node_modules/webpack-dev-server/node_modules/glob-parent": {
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -21171,8 +20941,6 @@
         "node": ">=6"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/yarn": {
       "version": "1.22.18",
       "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.18.tgz",
@@ -21186,7 +20954,6 @@
         "node": ">=4.0.0"
       }
     },
->>>>>>> feature/Feature-sales
     "node_modules/yorkie": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/yorkie/-/yorkie-2.0.0.tgz",
@@ -25374,7 +25141,7 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
       "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "file-uri-to-path": "1.0.0"
       }
@@ -28516,7 +28283,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "devOptional": true
+      "dev": true
     },
     "filename-regex": {
       "version": "2.0.1",
@@ -28844,12 +28611,6 @@
       "resolved": "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "optional": true
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -30684,17 +30445,6 @@
             "normalize-path": "^2.1.1"
           }
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
         "normalize-path": {
           "version": "2.1.1",
           "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -32091,12 +31841,6 @@
         "thenify-all": "^1.0.0"
       }
     },
-    "nan": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmmirror.com/nan/-/nan-2.16.0.tgz",
-      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
-      "optional": true
-    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -37017,7 +36761,7 @@
     },
     "vue-print-nb": {
       "version": "1.7.5",
-      "resolved": "https://registry.npmmirror.com/vue-print-nb/-/vue-print-nb-1.7.5.tgz",
+      "resolved": "https://registry.npmjs.org/vue-print-nb/-/vue-print-nb-1.7.5.tgz",
       "integrity": "sha512-iNbNyUVRWz0Ha1UTiCKxMPtHLUDGgNI8e8xmD3xqm9RlXIUeX9bT7DgNAfY8vPzqyFRHqGjxLI1rycKH366ziQ==",
       "requires": {
         "vue": "^2.6.11"
@@ -37025,7 +36769,7 @@
       "dependencies": {
         "vue": {
           "version": "2.6.14",
-          "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.14.tgz",
+          "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
           "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
         }
       }
@@ -37214,16 +36958,6 @@
             "to-regex-range": "^2.1.0"
           }
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -37576,17 +37310,6 @@
             "to-regex-range": "^2.1.0"
           }
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-3.1.0.tgz",

src/components/Pagination/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="{'hidden':hidden}" class="pagination-container">
+  <div :class="{ hidden: hidden }" class="pagination-container">
     <el-pagination
       :background="background"
       :current-page.sync="currentPage"
@@ -15,79 +15,80 @@
 </template>
 
 <script>
-import { scrollTo } from '@/utils/scroll-to'
+import { scrollTo } from "@/utils/scroll-to";
 
 export default {
-  name: 'Pagination',
+  name: "Pagination",
   props: {
     total: {
-      required: true,
-      type: Number
+      // required: true,
+      type: Number,
+      default: 10,
     },
     page: {
       type: Number,
-      default: 1
+      default: 1,
     },
     limit: {
       type: Number,
-      default: 20
+      default: 10,
     },
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
-      }
+        return [10, 20, 30, 50];
+      },
     },
     layout: {
       type: String,
-      default: 'total, sizes, prev, pager, next, jumper'
+      default: "total, sizes, prev, pager, next, jumper",
     },
     background: {
       type: Boolean,
-      default: true
+      default: false,
     },
     autoScroll: {
       type: Boolean,
-      default: true
+      default: true,
     },
     hidden: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   computed: {
     currentPage: {
       get() {
-        return this.page
+        return this.page;
       },
       set(val) {
-        this.$emit('update:page', val)
-      }
+        this.$emit("update:page", val);
+      },
     },
     pageSize: {
       get() {
-        return this.limit
+        return this.limit;
       },
       set(val) {
-        this.$emit('update:limit', val)
-      }
-    }
+        this.$emit("update:limit", val);
+      },
+    },
   },
   methods: {
     handleSizeChange(val) {
-      this.$emit('pagination', { page: this.currentPage, limit: val })
+      this.$emit("pagination", { page: this.currentPage, limit: val });
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        scrollTo(0, 800);
       }
     },
     handleCurrentChange(val) {
-      this.$emit('pagination', { page: val, limit: this.pageSize })
+      this.$emit("pagination", { page: val, limit: this.pageSize });
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        scrollTo(0, 800);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style scoped>

src/mixin/index.js

@@ -8,6 +8,7 @@ export default {
       screenForm: {}, // 筛选表单数据
       dataList: [], // 表格数据
       ids: [], // 多选数据id
+      dialogVisible: false, // 弹框
     }
   },
   created() {

src/views/sales_policy/components/AddCondition.vue

@@ -13,12 +13,12 @@
               <el-row class="pdt">
                 <el-button
                   type="primary"
-                  size="default"
+                  size="small"
                   @click="centerDialogVisible = true"
                   >添加机型</el-button
                 >
 
-                <el-button type="primary" size="default" @click=""
+                <el-button type="primary" size="small" @click=""
                   >删除机型</el-button
                 >
               </el-row>
@@ -38,10 +38,10 @@
           <el-col :xs="24" :sm="12" :lg="12" class="mgb">
             <el-row>
               <el-row class="pdt">
-                <el-button type="primary" size="default" @click=""
+                <el-button type="primary" size="small" @click=""
                   >添加机型</el-button
                 >
-                <el-button type="primary" size="default" @click=""
+                <el-button type="primary" size="small" @click=""
                   >删除机型</el-button
                 >
               </el-row>
@@ -60,17 +60,24 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :xs="24" :sm="4" :lg="4" class="mgb">配置比例设置</el-col>
-          <el-col :xs="24" :sm="4" :lg="4" class="mgb">限定机型</el-col>
-          <el-col :xs="24" :sm="6" :lg="4" class="mgb">
-            <input type="text" :value="1"
-          /></el-col>
-          <el-col :xs="24" :sm="4" :lg="4" class="mgb">配提比例</el-col>
-          <el-col :xs="24" :sm="4" :lg="4" class="mgb">
-            <input type="text" :value="1"
-          /></el-col>
+          <el-form label-width="120px" :inline="false" size="small">
+            <el-col :xs="24" :sm="2" :lg="2">
+              <el-form-item label="配置比例设置"> </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="9" :lg="9">
+              <el-form-item label="限定机型">
+                <el-input size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="9" :lg="9">
+              <el-form-item label="配提比例">
+                <el-input size="small"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+
           <el-col class="text_rihgt" v-if="false">
-            <el-button type="primary" size="default" @click=""
+            <el-button type="primary" size="small" @click=""
               >添加限定条件</el-button
             ></el-col
           >
@@ -79,8 +86,8 @@
       </el-row>
     </el-main>
     <el-footer height="100px">
-      <el-button type="primary" size="default" @click="">保存</el-button>
-      <el-button type="primary" size="default" @click="">重置</el-button>
+      <el-button type="primary" size="small" @click="">保存</el-button>
+      <el-button type="primary" size="small" @click="">重置</el-button>
     </el-footer>
     <AddModel :centerDialogVisible="centerDialogVisible" />
   </el-container>

src/views/sales_policy/components/AddPolicy.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-container :direction="vertical">
-    <el-header height="" class="pdt">
+  <div class="app-container">
+    <div class="screen-container">
       <h4>销售政策信息</h4>
       <el-divider></el-divider>
       <el-form
@@ -8,11 +8,11 @@
         :rules="rules"
         ref="ruleForm"
         label-width="120px"
-         size="small" label-position="left"
+        size="small"
         class="demo-ruleForm"
       >
-        <el-row type="flex">
-          <el-col :span="9">
+        <el-row>
+          <el-col :xs="24" :ms="12" :lg="12">
             <el-form-item label="销售政策编号" prop="name">
               <el-input
                 v-model="ruleForm.name"
@@ -20,7 +20,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="15">
+          <el-col :xs="24" :ms="12" :lg="12">
             <el-form-item label="销售政策说明" prop="name">
               <el-input
                 v-model="ruleForm.name"
@@ -28,9 +28,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex">
-          <el-col :span="9">
+          <el-col :xs="24" :ms="12" :lg="12">
             <el-form-item label="销售政策类型" prop="name">
               <el-select v-model="value" placeholder="请选择">
                 <el-option
@@ -43,7 +41,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="9">
+          <el-col :xs="24" :ms="12" :lg="12">
             <el-form-item label="支付钱包类型" prop="name">
               <el-select v-model="value" placeholder="请选择">
                 <el-option
@@ -56,69 +54,71 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-form-item label="表头备注" prop="name">
-            <el-input
-              v-model="ruleForm.name"
-              placeholder="新风机变频挂机。按提货数量1:3开单"
-            ></el-input>
-          </el-form-item>
-        </el-row>
-        <el-row type="flex">
-          <el-col :span="9">
+          <el-col :xs="24" :ms="12" :lg="12">
             <el-form-item label="制单人" prop="name">
               <el-input
                 v-model="ruleForm.name"
                 placeholder=""
               ></el-input> </el-form-item
           ></el-col>
-          <el-col :span="9">
+          <el-col :xs="24" :ms="12" :lg="12">
             <el-form-item label="制单日期" prop="name">
               <el-input
                 v-model="ruleForm.name"
                 placeholder="如未填写，则系统自动生成"
               ></el-input> </el-form-item
           ></el-col>
-        </el-row>
-        <el-row type="flex">
-          <el-col :span="9">
+
+          <el-col :xs="24" :ms="12" :lg="12">
             <el-form-item label="生效日期" prop="name">
               <el-input
                 v-model="ruleForm.name"
                 placeholder=""
               ></el-input> </el-form-item
           ></el-col>
-          <el-col :span="9">
+          <el-col :xs="24" :ms="12" :lg="12">
             <el-form-item label="失效日期" prop="name">
               <el-input
                 v-model="ruleForm.name"
                 placeholder=""
               ></el-input> </el-form-item
           ></el-col>
-        </el-row>
-        <el-row>
-          <el-form-item label="政策封面图">
-            <el-upload
-              class="avatar-uploader"
-              action="https://jsonplaceholder.typicode.com/posts/"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :before-upload="beforeAvatarUpload"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar" />
-              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </el-form-item>
+          <el-col :xs="24" :ms="24" :lg="24">
+            <el-form-item label="表头备注" prop="name">
+              <el-input
+                v-model="ruleForm.name"
+                placeholder="新风机变频挂机。按提货数量1:3开单"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :ms="24" :lg="24">
+            <el-form-item label="政策封面图">
+              <el-upload
+                class="avatar-uploader"
+                action="https://jsonplaceholder.typicode.com/posts/"
+                :show-file-list="false"
+                :on-success="handleAvatarSuccess"
+                :before-upload="beforeAvatarUpload"
+              >
+                <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
-    </el-header>
-    <el-main>
+    </div>
+    <div class="mymian-container">
       <el-row>
         <el-divider></el-divider>
-        <el-row type="flex" align="middle">
-          <el-col :span="2"> <h4>货品信息</h4> </el-col
-          ><el-button> 导入货品价格表</el-button>
+        <el-row type="flex">
+          <el-col :span="12">
+            <h4 style="display: inline-block; margin-right: 20px">货品信息</h4>
+            <el-button size="small"> 导入货品价格表</el-button></el-col
+          >
+          <el-col :span="12" class="tr">
+            <el-button size="small">管理条件</el-button>
+          </el-col>
         </el-row>
         <el-divider></el-divider>
       </el-row>
@@ -139,26 +139,11 @@
           align="center"
         >
         </el-table-column>
-        <el-table-column
-          prop="name"
-          label="货品编码"
-          width="120"
-          align="center"
-        >
+        <el-table-column prop="name" label="货品编码" align="center">
         </el-table-column>
-        <el-table-column
-          prop="province"
-          label="货品名称"
-          width="120"
-          align="center"
-        >
+        <el-table-column prop="province" label="货品名称" align="center">
         </el-table-column>
-        <el-table-column
-          prop="city"
-          label="规格型号"
-          width="120"
-          align="center"
-        >
+        <el-table-column prop="city" label="规格型号" align="center">
         </el-table-column>
         <el-table-column
           prop="address"
@@ -167,23 +152,62 @@
           align="center"
         >
         </el-table-column>
-        <el-table-column prop="zip" label="销售类型" width="120" align="center">
+        <el-table-column prop="zip" label="销售类型" align="center">
         </el-table-column>
-        <el-table-column prop="zip" label="单价" width="120" align="center">
+        <el-table-column prop="zip" label="单价" align="center">
         </el-table-column>
-        <el-table-column prop="zip" label="返利比例" width="120" align="center">
+        <el-table-column prop="zip" label="支付钱包" align="center">
         </el-table-column>
-        <el-table-column prop="zip" label="表体备注" width="120" align="center">
+        <el-table-column fixed="right" label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <Pagination />
+      <el-row>
+        <el-divider></el-divider>
+        <el-row type="flex">
+          <el-col :span="12">
+            <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
+            <el-button size="small">添加</el-button></el-col
+          >
+        </el-row>
+        <el-divider></el-divider>
+      </el-row>
+      <el-table
+        v-loading="listLoading"
+        :data="dataList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+      >
+        <el-table-column
+          fixed
+          prop="num"
+          label="序号"
+          width="50"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="name" label="限定条件" align="center">
+        </el-table-column>
+        <el-table-column prop="province" label="限定机型" align="center">
+        </el-table-column>
+        <el-table-column prop="city" label="配体机型" align="center">
         </el-table-column>
         <el-table-column fixed="right" label="操作" align="center">
           <template slot-scope="scope">
+            <el-button type="text" size="small">编辑</el-button>
             <el-button type="text" size="small">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-    </el-main>
-    <Pagination />
-    <el-footer height="" class="footer">
+    </div>
+
+    <div>
       <el-row>
         <el-divider></el-divider>
         <el-row type="flex" align="middle">
@@ -199,13 +223,13 @@
         <el-radio v-model="radio" label="1">地区</el-radio>
         <el-radio v-model="radio" label="2">指定</el-radio>
       </el-row>
-      <Transfer/>
-    </el-footer>
-  </el-container>
+      <Transfer />
+    </div>
+  </div>
 </template>
 
 <script>
-import Pagination from "./Pagination";
+import Pagination from "@/components/Pagination";
 import Transfer from "./Transfer";
 export default {
   data() {
@@ -222,7 +246,7 @@ export default {
           { min: 3, max: 5, message: "", trigger: "click" },
         ],
       },
-
+      imageUrl: "",
       dataList: [
         {
           num: "2",
@@ -282,6 +306,8 @@ export default {
         },
       ],
       radio: "",
+      options: {},
+      value: "",
     };
   },
 
@@ -289,6 +315,8 @@ export default {
     handelLeftCheck(e) {
       console.log(e);
     },
+    beforeAvatarUpload() {},
+    handleAvatarSuccess() {},
   },
   components: {
     Transfer,

src/views/sales_policy/components/Distributor.vue

@@ -6,7 +6,8 @@
         :rules="rules"
         ref="ruleForm"
         label-width="120px"
-         size="small" label-position="left"
+        size="small"
+        label-position="left"
         class="demo-ruleForm"
       >
         <el-row type="flex">

src/views/sales_policy/components/Examine.vue

@@ -0,0 +1,277 @@
+<template>
+  <div class="app-container">
+    <div class="descriptions">
+      <el-row>
+        <el-col :span="4">销售政策编号</el-col>
+        <el-col :span="4">1</el-col>
+        <el-col :span="4">销售政策说明</el-col>
+        <el-col :span="4">1</el-col>
+        <el-col :span="4">状态</el-col>
+        <el-col :span="4">1</el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">销售政策类型</el-col>
+        <el-col :span="4">1</el-col>
+        <el-col :span="4">支付钱包</el-col>
+        <el-col :span="4">1</el-col>
+        <el-col :span="4">家用空调</el-col>
+        <el-col :span="4">1</el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">备注</el-col>
+        <el-col :span="20">1</el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="3">制单人</el-col>
+        <el-col :span="3">1</el-col>
+        <el-col :span="3">制单日期</el-col>
+        <el-col :span="3">1</el-col>
+        <el-col :span="3">生效日期</el-col>
+        <el-col :span="3">1</el-col>
+        <el-col :span="3">失败日期</el-col>
+        <el-col :span="3">1</el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="3">审核人</el-col>
+        <el-col :span="3">1</el-col>
+        <el-col :span="3">审核日期</el-col>
+        <el-col :span="3">1</el-col>
+        <el-col :span="3">关闭人</el-col>
+        <el-col :span="3">1</el-col>
+        <el-col :span="3">关闭日期</el-col>
+        <el-col :span="3">1</el-col>
+      </el-row>
+    </div>
+    <div class="mymain-container">
+      <el-row>
+        <el-divider></el-divider>
+        <el-row type="flex">
+          <el-col :span="12">
+            <h4 style="display: inline-block; margin-right: 20px">货品信息</h4>
+            <el-button size="small">查看</el-button></el-col
+          >
+        </el-row>
+        <el-divider></el-divider>
+      </el-row>
+      <el-table
+        v-loading="listLoading"
+        :data="dataList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+      >
+        <el-table-column
+          fixed
+          prop="num"
+          label="序号"
+          width="50"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="name" label="货品编码" align="center">
+        </el-table-column>
+        <el-table-column prop="province" label="货品名称" align="center">
+        </el-table-column>
+        <el-table-column prop="city" label="规格型号" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="销售类型编码"
+          width="500"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="zip" label="销售类型" align="center">
+        </el-table-column>
+        <el-table-column prop="zip" label="单价" align="center">
+        </el-table-column>
+        <el-table-column prop="zip" label="支付钱包" align="center">
+        </el-table-column>
+        <el-table-column prop="zip" label="备注" align="center">
+        </el-table-column>
+      </el-table>
+      <el-row>
+        <el-divider></el-divider>
+        <el-row type="flex">
+          <el-col :span="12">
+            <h4 style="display: inline-block; margin-right: 20px">条件信息</h4>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+      </el-row>
+      <el-table
+        v-loading="listLoading"
+        :data="dataList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+      >
+        <el-table-column
+          fixed
+          prop="num"
+          label="序号"
+          width="50"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="name" label="限定条件" align="center">
+        </el-table-column>
+        <el-table-column prop="province" label="限定机型" align="center">
+        </el-table-column>
+        <el-table-column prop="city" label="配体机型" align="center">
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-row>
+        <el-divider></el-divider>
+        <el-row type="flex">
+          <el-col :span="12">
+            <h4 style="display: inline-block; margin-right: 20px">
+              经销商使用范围
+            </h4>
+            <el-button size="small">添加</el-button></el-col
+          >
+        </el-row>
+        <el-divider></el-divider>
+      </el-row>
+      <el-table
+        v-loading="listLoading"
+        :data="dataList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+      >
+        <el-table-column
+          fixed
+          prop="num"
+          label="序号"
+          width="50"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="name" label="经销商编码" align="center">
+        </el-table-column>
+        <el-table-column prop="province" label="经销商名称" align="center">
+        </el-table-column>
+
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "examine",
+  data() {
+    return {
+      input: "",
+
+      ruleForm: {
+        name: "",
+      },
+      listLoading: false,
+      rules: {
+        name: [
+          { required: true, message: "", trigger: "click" },
+          { min: 3, max: 5, message: "", trigger: "click" },
+        ],
+      },
+      imageUrl: "",
+      dataList: [
+        {
+          num: "2",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333,
+        },
+        {
+          num: "2",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333,
+        },
+        {
+          num: "2",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333,
+        },
+        {
+          num: "2",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333,
+        },
+        {
+          num: "2",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333,
+        },
+        {
+          num: "2",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333,
+        },
+        {
+          num: "2",
+          name: "王小虎",
+          province: "上海",
+          city: "普陀区",
+          address: "上海市普陀区金沙江路 1518 弄",
+          zip: 200333,
+        },
+      ],
+      radio: "",
+      options: {},
+      value: "",
+    };
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.descriptions {
+  // border: #EBEEF5;
+  border: 1px solid #ebeef5;
+  border-bottom: none;
+  .el-row {
+    height: 40px;
+    line-height: 40px;
+  }
+  .el-col:nth-child(odd) {
+    background-color: #ebeef5;
+  }
+  .el-col {
+    padding: 0 15px;
+    height: 100%;
+    border-bottom: 1px solid #ebeef5;
+  }
+}
+.el-divider--horizontal {
+  margin: 20px 0;
+}
+</style>

src/views/sales_policy/components/TabelTransfer.vue

@@ -1,57 +1,59 @@
 <template>
-  <el-container :direction="vertical">
+  <el-container>
     <el-header height="">
-      <el-row :gutter="20">
-        <el-col :span="8" :offset="0">
-          <el-input
-            v-model="input"
-            placeholder="产品编码"
-            size="normal"
-            clearable
-            @change=""
-          ></el-input>
-        </el-col>
-        <el-col :span="8" :offset="0">
-          <el-input
-            v-model="input"
-            placeholder="产品名称"
-            size="normal"
-            clearable
-            @change=""
-          ></el-input>
-        </el-col>
-        <el-col :span="8" :offset="0">
-          <el-input
-            v-model="input"
-            placeholder="产品型号"
-            size="normal"
-            clearable
-            @change=""
-          ></el-input>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" class="pdt">
-        <el-col :span="8" :offset="0">
-          <el-date-picker
-            v-model="value1"
-            type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          >
-          </el-date-picker
-        ></el-col>
-      </el-row>
-      <el-row :gutter="20" class="query">
-        <el-button type="primary" class="query_btn" size="default" @click=""
-          >查询</el-button
-        >
-      </el-row>
+      <el-form label-width="0" :inline="false" size="small">
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="8" :lg="8" :offset="0">
+            <el-form-item label="" >
+              <el-input
+                v-model="input"
+                placeholder="产品编码"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="8" :lg="8" :offset="0">
+            <el-form-item label="" >
+              <el-input
+                v-model="input"
+                placeholder="产品名称"
+
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="8" :lg="8" :offset="0">
+            <el-form-item label="" >
+              <el-input
+                v-model="input"
+                placeholder="产品型号"
+
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :sm="8" :lg="8" :offset="0">
+            <el-form-item label="" >
+              <el-date-picker
+                v-model="value1"
+                type="datetimerange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-form-item label="" >
+            <el-button type="primary"  size="small " @click=""
+              >查询</el-button
+            >
+          </el-form-item>
+        </el-row>
+      </el-form>
     </el-header>
     <el-main height="">
       <el-row>
         <el-row :gutter="50">
-          <el-col :span="10">
+          <el-col :xs="10" :ms="10" :lg="10">
             <el-row>
               <el-row> </el-row>
               <el-row>
@@ -67,36 +69,36 @@
                   </el-table-column>
                 </el-table>
                 <el-row class="mg">
-                     <Pagination/>
+                  <Pagination />
                 </el-row>
               </el-row>
             </el-row>
           </el-col>
-          <el-col :span="4" class="middle">
+          <el-col :xs="4" :ms="4" :lg="4" class="middle">
             <el-row :gutter="20" justify="center" align="middle">
               <el-row class="btn">
-                <el-button type="primary" size="default" @click=""
+                <el-button type="primary" size="small " @click=""
                   >全部添加</el-button
                 >
               </el-row>
               <el-row class="btn">
-                <el-button type="primary" size="default" @click=""
+                <el-button type="primary" size="small " @click=""
                   >增加</el-button
                 >
               </el-row>
               <el-row class="btn">
-                <el-button type="primary" size="default" @click=""
+                <el-button type="primary" size="small " @click=""
                   >删除</el-button
                 ></el-row
               >
               <el-row class="btn"
-                ><el-button type="primary" size="default" @click=""
+                ><el-button type="primary" size="small  " @click=""
                   >全部删除</el-button
                 ></el-row
               >
             </el-row>
           </el-col>
-          <el-col :span="10">
+          <el-col :xs="10" :ms="10" :lg="10">
             <el-row>
               <el-row> </el-row>
               <el-row>
@@ -110,8 +112,8 @@
                   <el-table-column prop="name" label="姓名" align="center">
                   </el-table-column>
                 </el-table>
-                   <el-row class="mg">
-                     <Pagination/>
+                <el-row class="mg">
+                  <Pagination />
                 </el-row>
               </el-row>
             </el-row>
@@ -287,9 +289,9 @@ export default {
       }
     },
   },
-  components:{
-    Pagination
-  }
+  components: {
+    Pagination,
+  },
 };
 </script>
 
@@ -301,7 +303,7 @@ export default {
 .query_btn {
   margin-left: 0;
 }
-.mg{
+.mg {
   margin: 20px;
 }
 .pdt {

src/views/sales_policy/components/Transfer.vue

@@ -3,7 +3,7 @@
     <slot name="header">
       <el-row type="flex">
         <el-col>
-          <el-select v-model="value" class="select_height" placeholder="请选择">
+          <el-select size="small" v-model="value" class="select_height" placeholder="请选择">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -13,7 +13,7 @@
             </el-option>
           </el-select>
         </el-col>
-        <el-col><el-button>确定</el-button></el-col>
+        <el-col><el-button size="small">确定</el-button></el-col>
       </el-row>
     </slot>
     <div>
@@ -36,18 +36,19 @@
         <el-col class="middle_box" :span="6">
           <el-row>
             <el-col>
-              <el-button :disabled="isDisabled" @click="handleJudge('AddAll')"
+              <el-button :disabled="isDisabled" size="small" @click="handleJudge('AddAll')"
                 >全部添加</el-button
               ></el-col
             >
             <el-col>
-              <el-button :disabled="isDisabled" @click="handleJudge('AddPart')"
+              <el-button :disabled="isDisabled" size="small" @click="handleJudge('AddPart')"
                 >增加</el-button
               ></el-col
             >
             <el-col>
               <el-button
                 :disabled="isDisabled"
+                size="small"
                 @click="handleJudge('DeletePart')"
                 >删除</el-button
               ></el-col
@@ -55,6 +56,7 @@
             <el-col>
               <el-button
                 :disabled="isDisabled"
+                size="small"
                 @click="handleJudge('DeleteAll')"
                 >全部删除</el-button
               ></el-col
@@ -77,9 +79,9 @@
 
     <slot name="footer">
       <el-row>
-        <el-button type="primary" size="default" @click="">保存</el-button>
-        <el-button type="primary" size="default" @click="">提交审核</el-button>
-        <el-button type="primary" size="default" @click="">重置</el-button>
+        <el-button type="primary" size="small" @click="">保存</el-button>
+        <el-button type="primary" size="small" @click="">提交审核</el-button>
+        <el-button type="primary" size="small" @click="">重置</el-button>
       </el-row>
     </slot>
   </div>

src/views/sales_policy/marketing_list.vue

@@ -1,102 +1,79 @@
 <template>
-  <el-container v-if="isShow">
-    <el-header height="100%" class="mg">
-      <el-row>
-        <el-col :span="12">
-          <el-input
-            v-model="input"
-            placeholder="销售政策编号"
-            size="normal"
-            clearable
-            @change=""
-          ></el-input>
-        </el-col>
+  <div class="app-container" v-if="isShow == 1">
+    <div class="screen-container">
+      <el-form :model="form" ref="form" :inline="false">
+        <el-row :gutter="20">
+          <el-col :xs="24" :ms="12" :lg="12">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="营销活动管理"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
+          <el-col :xs="24" :ms="12" :lg="12" class="tr">
+            <el-form-item>
+              <el-button type="primary" size="small">查询</el-button>
+              <el-button size="small">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="btn-group">
+      <el-row type="flex">
+        <el-button type="primary" class="btn" size="small">导出</el-button>
+        <el-button type="text" size="small">打印</el-button>
       </el-row>
-      <el-row class="mg">
-        <el-button type="primary" size="default" @click="">查询</el-button>
-        <el-button type="primary" size="default" @click="">重置</el-button>
-        <el-button type="primary" size="default" @click="">新增</el-button>
-        <el-button type="primary" size="default" @click="">打印</el-button>
+    </div>
+    <div class="mymain-container">
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column fixed="left" label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small">编辑</el-button>
+            <el-button type="text" size="small">删除</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="状态" width="120" align="center">
+        </el-table-column>
+        <el-table-column prop="province" label="营销活动" align="center">
+        </el-table-column>
+        <el-table-column prop="city" label="生效时间" align="center">
+        </el-table-column>
+        <el-table-column prop="address" label="结束时间" align="center">
+        </el-table-column>
 
-      </el-row>
-    </el-header>
-    <el-main>
-    <el-table
-    ref="multipleTable"
-    :data="tableData"
-    border
-    tooltip-effect="dark"
-    style="width: 100%"
-    @selection-change="handleSelectionChange">
-    <el-table-column
-      type="selection"
-      align="center"
-      width="55">
-    </el-table-column>
-    <el-table-column
-      label="营销活动"
-      align="center"
-     >
-      <template slot-scope="scope">{{ scope.row.date }}</template>
-    </el-table-column>
-    <el-table-column
-      prop="name"
-      label="生效时间"
-      align="center"
-     >
-    </el-table-column>
-    <el-table-column
-      prop="address"
-      label="结束时间"
-      align="center"
-      show-overflow-tooltip>
-    </el-table-column>
-        <el-table-column
-      prop="name"
-      label="创建者"
-      align="center"
-     >
-    </el-table-column>
-        <el-table-column
-      prop="name"
-      label="创建时间"
-      align="center"
-     >
-    </el-table-column>
-        <el-table-column
-      prop="name"
-      label="更新者"
-      align="center"
-     >
-    </el-table-column>
-        <el-table-column
-      prop="name"
-      label="更新时间"
-      align="center"
-     >
-    </el-table-column>
-        <el-table-column
-      prop="name"
-      label="创建者"
-      align="center"
-     >
-    </el-table-column>
-  </el-table>
-    </el-main>
-    <Pagination />
-  </el-container>
-  <NewInfo v-else/>
+        <el-table-column prop="zip" label="创建者" align="center">
+        </el-table-column>
+        <el-table-column prop="zip" label="创建时间" align="center">
+        </el-table-column>
+        <el-table-column prop="zip" label="更新者" align="center">
+        </el-table-column>
+        <el-table-column prop="zip" label="更新时间" align="center">
+        </el-table-column>
+      </el-table>
+      <Pagination />
+    </div>
+  </div>
+  <AddPolicy v-else-if="isShow == 2" />
+  <AddCondition v-else-if="isShow == 3" />
+  <Examine v-else-if="isShow == 4" />
+  <AddModel v-else />
 </template>
 
 <script>
-import Pagination from "./components/Pagination";
-import NewInfo from './components/NewInfo'
+import AddPolicy from "./components/AddPolicy";
+import AddModel from "./components/AddModel";
+import Pagination from "@/components/Pagination";
+import AddCondition from "./components/AddCondition";
+import Examine from "./components/Examine";
 export default {
   data() {
     return {
-      isShow:false,
       input: "",
+      isShow: 1,
       tableData: [
         {
           date: "2016-05-02",
@@ -131,20 +108,32 @@ export default {
           zip: 200333,
         },
       ],
+      form: {},
+      options: {},
+      value: "",
+      imageUrl: "",
     };
   },
   components: {
+    Examine,
+    AddModel,
+    AddPolicy,
     Pagination,
-    NewInfo
+    AddCondition,
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.mg {
-  margin: 20px 0;
-}
 .btn {
-  text-align: right;
+  width: 80px;
+}
+
+.mpd {
+  padding: 20px 0 0 0;
+}
+
+.select_height {
+  width: 100%;
 }
 </style>

src/views/sales_policy/policy_list.vue

@@ -1,92 +1,157 @@
 <template>
-  <el-container v-if="isShow == 1">
-    <el-header class="header_" height="100%">
-      <el-row type="flex" gutter="20" class="header_input">
-        <el-col :span="6"
-          ><el-input v-model="input" placeholder="销售政策编号"></el-input>
-        </el-col>
-        <el-col :span="6"
-          ><el-input v-model="input" placeholder="销售政策说明"></el-input>
-        </el-col>
-        <el-col :span="6"
-          ><el-input v-model="input" placeholder="表头备注"></el-input>
-        </el-col>
-        <el-col :span="6"
-          ><el-input v-model="input" placeholder="生效日期"></el-input>
-        </el-col>
-      </el-row>
-      <el-row type="flex" gutter="20" class="header_input">
-        <el-col :span="6"
-          ><el-input v-model="input" placeholder="结束日期"></el-input>
-        </el-col>
-        <el-col :span="6"
-          ><el-input v-model="input" placeholder="制表日期"></el-input>
-        </el-col>
-        <el-col :span="6"
-          ><el-input v-model="input" placeholder="制表人"></el-input>
-        </el-col>
-        <el-col :span="6"
-          ><el-input v-model="input" placeholder="审核人"></el-input>
-        </el-col>
-      </el-row>
-      <el-row type="flex" gutter="20">
-        <el-col :span="6"
-          ><el-input v-model="input" placeholder="关闭人"></el-input>
-        </el-col>
-        <el-col :span="6">
-          <el-select
-            v-model="value"
-            disabled
-            placeholder="状态"
-            class="select_height"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-col>
-        <el-col :span="6">
-          <el-select
-            v-model="value"
-            disabled
-            placeholder="销售政策类型"
-            class="select_height"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-col>
-        <!-- <el-col :span="6">
-          <el-row type="flex" gutter="20" justify="space-between">
-            <el-col>
-              <el-button type="primary" class="btn">查询</el-button>
-            </el-col>
-            <el-col>
-              <el-button type="primary" class="btn" icon=""
-                ><i class="el-icon-delete"></i> </el-button
-            ></el-col>
-          </el-row>
-        </el-col> -->
-      </el-row>
-      <el-row type="flex" class="mpd">
-        <el-button type="primary" class="btn">新增</el-button>
-        <el-button type="primary" class="btn">导出</el-button>
-        <el-button type="primary" class="btn">查询</el-button>
-        <el-button type="primary" class="btn" icon=""
+  <div class="app-container" v-if="isShow == 1">
+    <div class="screen-container">
+      <el-form :model="form" ref="form" :inline="false">
+        <el-row :gutter="20">
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="销售政策编号"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="销售政策说明"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="表头备注"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="生效日期"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="结束日期"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="制表日期"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="制表人"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="审核人"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="关闭人"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-select
+                size="small"
+                v-model="value"
+                disabled
+                placeholder="状态"
+                class="select_height"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-select
+                size="small"
+                v-model="value"
+                disabled
+                placeholder="销售政策类型"
+                class="select_height"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :ms="6" :lg="6" class="tr">
+            <el-form-item>
+              <el-button type="primary" size="small">查询</el-button>
+              <el-button size="small">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="btn-group">
+      <el-row type="flex">
+        <el-button type="primary" class="btn" size="small">新增</el-button>
+        <el-button type="primary" class="btn" size="small">导出</el-button>
+        <el-button type="primary" class="btn" size="small">查询</el-button>
+        <el-button type="primary" class="btn" icon="" size="small"
           ><i class="el-icon-delete"></i>
         </el-button>
       </el-row>
-    </el-header>
-    <el-main>
+    </div>
+    <div class="mymain-container">
       <el-table :data="tableData" border style="width: 100%" height="600">
         <el-table-column fixed="left" label="操作" width="200" align="center">
           <template slot-scope="scope">
@@ -133,11 +198,12 @@
         <el-table-column prop="zip" label="关闭日期" width="120" align="center">
         </el-table-column>
       </el-table>
-    </el-main>
+    </div>
     <Pagination />
-  </el-container>
+  </div>
   <AddPolicy v-else-if="isShow == 2" />
   <AddCondition v-else-if="isShow == 3" />
+  <Examine v-else-if="isShow == 4"/>
   <AddModel v-else />
 </template>
 
@@ -146,11 +212,12 @@ import AddPolicy from "./components/AddPolicy";
 import AddModel from "./components/AddModel";
 import Pagination from "./components/Pagination";
 import AddCondition from "./components/AddCondition";
+import Examine from './components/Examine'
 export default {
   data() {
     return {
       input: "",
-      isShow: 3,
+      isShow: 4,
       tableData: [
         {
           date: "2016-05-02",
@@ -185,9 +252,14 @@ export default {
           zip: 200333,
         },
       ],
+      form: {},
+      options: {},
+      value: "",
+      imageUrl:''
     };
   },
   components: {
+    Examine,
     AddModel,
     AddPolicy,
     Pagination,
@@ -200,16 +272,11 @@ export default {
 .btn {
   width: 80px;
 }
+
 .mpd {
   padding: 20px 0 0 0;
 }
 
-.header_ {
-  margin-top: 20px;
-  &input {
-    padding-bottom: 10px;
-  }
-}
 .select_height {
   width: 100%;
 }

src/views/sales_rebate/rebate_list.vue

@@ -0,0 +1,231 @@
+<template>
+  <div class="app-container">
+    <div class="screen-container">
+      <el-form
+        :model="screenForm"
+        ref="screenForm"
+        :inline="false"
+        size="normal"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="返利品类名称"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="返利品类"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="销售类型编码"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="销售类型名称"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <!-- <el-select v-model="select" placeholder="请选择" size="small">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :ms="18" :lg="18" class="tr">
+            <el-form-item>
+              <el-button type="primary" size="small" @click="submitScreenForm"
+                >查询</el-button
+              >
+              <el-button type="primary" size="small" @click="resetScreenForm"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="btn-group">
+      <el-button type="primary" size="small" @click="dialogVisible = true"
+        >新增</el-button
+      >
+      <el-button type="primary" size="small" @click="dialogVisible = true"
+        >编辑</el-button
+      >
+      <el-button type="primary" size="small" @click="">删除</el-button>
+      <el-button type="primary" size="small" @click="">导入</el-button>
+      <el-button type="primary" size="small" @click="">导出</el-button>
+    </div>
+    <div class="mymain-container">
+      <el-table
+        v-loading="listLoading"
+        :data="dataList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+      >
+        <el-table-column type="selection" width="55" align="center">
+        </el-table-column>
+        <template v-for="col in columns">
+          <el-table-column
+            align="center"
+            :label="col.lable"
+            :prop="col.prop"
+            :min-width="col.widht"
+            show-overflow-tooltip
+            v-if="col.prop == 'status'"
+          >
+            <template slot-scope="scope">
+              <el-switch
+                v-model="isSwitch"
+                disabled
+                :active-text="isSwitch ? '已啓用' : '已禁用'"
+              >
+              </el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-else
+            align="center"
+            :label="col.lable"
+            :prop="col.prop"
+            :min-width="col.widht"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+        </template>
+
+        <el-table-column
+          align="center"
+          fixed="right"
+          label="操作"
+          min-width="160"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small">查看</el-button>
+            <el-button type="text" size="small">编辑</el-button>
+            <el-button type="text" size="small">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <Pagination @pagination="pagination" />
+    </div>
+    <div>
+      <el-dialog :visible.sync="dialogVisible" width="50%">
+        <el-form
+          :model="dialogForm"
+          ref="dialogForm"
+          label-width="120px"
+          :inline="false"
+          size="normal"
+        >
+          <el-form-item label="返利使用钱包">
+            <el-input v-model="dialogForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="产品使用品类">
+            <el-input v-model="dialogForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="销售类型编码">
+            <el-input v-model="dialogForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="销售类型名称">
+            <el-input v-model="dialogForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="返利折扣比例">
+            <el-input v-model="dialogForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-switch :active-text="true ? '启用' : ''"> </el-switch>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="hanleCancel">取 消</el-button>
+          <el-button type="primary" @click="handelInfo">确 定</el-button>
+        </span>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import Mixin from "@/mixin/index";
+import Pagination from "@/components/Pagination";
+export default {
+  mixins: [Mixin],
+  data() {
+    return {
+      input: "",
+      select: "",
+      isSwitch: true,
+      screenForm: {},
+      dialogForm: { name: "" },
+
+      dataList: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          label: "姓名",
+          address: "上海市普陀区金沙江路 1518 弄",
+        },
+      ],
+      columns: [
+        { prop: "name", lable: "销售类型编码", widht: 160 },
+        { prop: "date", lable: "销售类型名称", widht: 160 },
+        { prop: "date", lable: "返利使用钱包", widht: 160 },
+        { prop: "date", lable: "返利折扣比例", widht: 160 },
+        { prop: "status", lable: "状态", widht: 160 },
+        { prop: "date", lable: "创建人", widht: 160 },
+        { prop: "date", lable: "创建时间", widht: 160 },
+        { prop: "date", lable: "更新人", widht: 160 },
+        { prop: "date", lable: "更新时间", widht: 160 },
+      ],
+    };
+  },
+  methods: {
+    getList() {},
+    pagination(val) {
+      console.log(val, 123);
+      // this.handleCurrentChange(val)
+      // this.handleSizeChange()
+    },
+    handelInfo() {
+      this.dialogVisible = false;
+    },
+    hanleCancel() {
+      this.dialogVisible = false;
+    },
+  },
+  components: {
+    Pagination,
+  },
+};
+</script>
+
+<style scoped></style>

src/views/sales_rebate/salestype_list.vue

@@ -0,0 +1,203 @@
+<template>
+  <div class="app-container">
+    <div class="screen-container">
+      <el-form
+        :model="screenForm"
+        ref="screenForm"
+        :inline="false"
+        size="normal"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="销售类型编码"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <el-input
+                v-model="input"
+                placeholder="销售类型名称"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :ms="6" :lg="6">
+            <el-form-item label="">
+              <!-- <el-select v-model="select" placeholder="请选择" size="small">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :ms="6" :lg="6" class="tr">
+            <el-form-item>
+              <el-button type="primary" size="small" @click="submitScreenForm"
+                >查询</el-button
+              >
+              <el-button type="primary" size="small" @click="resetScreenForm"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="btn-group">
+      <el-button type="primary" size="small" @click="dialogVisible = true"
+        >新增</el-button
+      >
+      <el-button type="primary" size="small" @click="dialogVisible = true"
+        >编辑</el-button
+      >
+      <el-button type="primary" size="small" @click="">删除</el-button>
+      <el-button type="primary" size="small" @click="">导入</el-button>
+      <el-button type="primary" size="small" @click="">导出</el-button>
+    </div>
+    <div class="mymain-container">
+      <el-table
+        v-loading="listLoading"
+        :data="dataList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+      >
+        <el-table-column type="selection" width="55" align="center">
+        </el-table-column>
+        <template v-for="col in columns">
+          <el-table-column
+            align="center"
+            :label="col.lable"
+            :prop="col.prop"
+            :min-width="col.widht"
+            show-overflow-tooltip
+            v-if="col.prop == 'status'"
+          >
+            <template slot-scope="scope">
+              <el-switch
+                v-model="isSwitch"
+                disabled
+                :active-text="isSwitch ? '已啓用' : '已禁用'"
+              >
+              </el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-else
+            align="center"
+            :label="col.lable"
+            :prop="col.prop"
+            :min-width="col.widht"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+        </template>
+
+        <el-table-column
+          align="center"
+          fixed="right"
+          label="操作"
+          min-width="160"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="small">查看</el-button>
+            <el-button type="text" size="small">编辑</el-button>
+            <el-button type="text" size="small">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <Pagination @pagination="pagination" />
+    </div>
+    <div>
+      <el-dialog :visible.sync="dialogVisible" width="50%">
+        <el-form
+          :model="dialogForm"
+          ref="dialogForm"
+          label-width="120px"
+          :inline="false"
+          size="normal"
+        >
+          <el-form-item label="销售类型编码">
+            <el-input v-model="dialogForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="销售类型名称">
+            <el-input v-model="dialogForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="品类">
+            <el-input v-model="dialogForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-switch :active-text="true ? '启用' : ''"> </el-switch>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="dialogVisible = false"
+            >确 定</el-button
+          >
+        </span>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import Mixin from "@/mixin/index";
+import Pagination from "@/components/Pagination";
+
+export default {
+  mixins: [Mixin],
+  data() {
+    return {
+      input: "",
+      select: "",
+      isSwitch: true,
+      screenForm: {},
+      dialogForm: { name: "" },
+      dataList: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          label: "姓名",
+          address: "上海市普陀区金沙江路 1518 弄",
+        },
+      ],
+      columns: [
+        { prop: "name", lable: "销售类型编码", widht: 160 },
+        { prop: "date", lable: "销售类型名称", widht: 160 },
+        { prop: "date", lable: "出库类型", widht: 160 },
+        { prop: "date", lable: "品类", widht: 160 },
+        { prop: "status", lable: "状态", widht: 160 },
+        { prop: "date", lable: "创建人", widht: 160 },
+        { prop: "date", lable: "创建时间", widht: 160 },
+        { prop: "date", lable: "更新人", widht: 160 },
+        { prop: "date", lable: "更新时间", widht: 160 },
+      ],
+    };
+  },
+  methods: {
+    getList() {},
+    pagination(val) {
+      console.log(val, 123);
+      // this.handleCurrentChange(val)
+      // this.handleSizeChange()
+    },
+  },
+  components: {
+    Pagination,
+  },
+};
+</script>
+
+<style scoped></style>