1

.env.production

@@ -4,8 +4,8 @@
 
 NODE_ENV = 'production'
 # base api
-#VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
-VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
+VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
+#VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
 
 # 微服务相关接口配置
 ## 任务消息

.env.test

@@ -4,7 +4,7 @@
 
 NODE_ENV = 'production'
 # base api
-VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
+VUE_APP_BASE_API = 'https://apitest2.eliangeyun.com'
 
 # 微服务相关接口配置
 ## 任务消息

package-lock.json

@@ -88,6 +88,12 @@
           "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
           "dev": true
         },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -3065,6 +3071,14 @@
         "@babel/helper-plugin-utils": "^7.10.1",
         "resolve": "^1.8.1",
         "semver": "^5.5.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
@@ -3751,6 +3765,59 @@
         "postcss": "^7.0.0"
       }
     },
+    "@jiaminghi/bezier-curve": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz",
+      "integrity": "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==",
+      "requires": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
+    "@jiaminghi/c-render": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz",
+      "integrity": "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/bezier-curve": "*",
+        "@jiaminghi/color": "*",
+        "@jiaminghi/transition": "*"
+      }
+    },
+    "@jiaminghi/charts": {
+      "version": "0.2.18",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz",
+      "integrity": "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/c-render": "^0.4.3"
+      }
+    },
+    "@jiaminghi/color": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-0.1.1.tgz",
+      "integrity": "sha512-M09+Sb5HGqVim0zo+nG5gU1v+6gXT8ptr0BZR6dMGt83XmCJgnZtO8s7llTW4hLFFFM5co6geZvTekqLpSPAAQ==",
+      "requires": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
+    "@jiaminghi/data-view": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/data-view/-/data-view-2.10.0.tgz",
+      "integrity": "sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/charts": "*"
+      }
+    },
+    "@jiaminghi/transition": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz",
+      "integrity": "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==",
+      "requires": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
     "@malept/cross-spawn-promise": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
@@ -4550,6 +4617,14 @@
             "invariant": "^2.2.2",
             "js-levenshtein": "^1.1.3",
             "semver": "^5.3.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
+            }
           }
         }
       }
@@ -4833,6 +4908,12 @@
             "ajv-keywords": "^3.1.0"
           }
         },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
         "url-loader": {
           "version": "1.1.2",
           "resolved": "https://registry.npm.taobao.org/url-loader/download/url-loader-1.1.2.tgz",
@@ -5355,6 +5436,11 @@
         "xml2js": "^0.4.16"
       },
       "dependencies": {
+        "js-base64": {
+          "version": "2.6.4",
+          "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz",
+          "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="
+        },
         "mime": {
           "version": "2.5.2",
           "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
@@ -8669,6 +8755,14 @@
         "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "cryptiles": {
@@ -10618,9 +10712,9 @@
       }
     },
     "element-ui": {
-      "version": "2.13.2",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.2.tgz",
-      "integrity": "sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==",
+      "version": "2.15.9",
+      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.9.tgz",
+      "integrity": "sha512-dx45nQLt4Hn87/Z9eRr3ex6KFZbxlFAwEU3QoW3wA5EsYftvHTyL9Pq7VnXXD7hu1Eiaup2jcs6kp+/VSFmXuA==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -10632,7 +10726,7 @@
       "dependencies": {
         "async-validator": {
           "version": "1.8.5",
-          "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
+          "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz",
           "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
           "requires": {
             "babel-runtime": "6.x"
@@ -11020,6 +11114,13 @@
             "yallist": "^2.1.2"
           }
         },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true,
+          "optional": true
+        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -13506,9 +13607,9 @@
       "dev": true
     },
     "js-base64": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npm.taobao.org/js-base64/download/js-base64-2.5.2.tgz",
-      "integrity": "sha1-MTtidN2nGPcU0AszMLuubjjpAgk="
+      "version": "3.7.2",
+      "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.2.tgz",
+      "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
     },
     "js-cookie": {
       "version": "2.2.0",
@@ -14581,6 +14682,14 @@
       "requires": {
         "pify": "^4.0.1",
         "semver": "^5.6.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "make-fetch-happen": {
@@ -15502,6 +15611,13 @@
       "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
       "requires": {
         "semver": "^5.4.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "node-addon-api": {
@@ -15574,6 +15690,13 @@
         "semver": "^5.7.1",
         "tar": "^4.4.12",
         "which": "^1.3.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "node-gyp-build": {
@@ -15654,6 +15777,14 @@
         "rimraf": "^2.6.1",
         "semver": "^5.3.0",
         "tar": "^4.4.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "optional": true
+        }
       }
     },
     "node-rancher-client-api": {
@@ -15924,6 +16055,13 @@
         "resolve": "^1.10.0",
         "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "normalize-path": {
@@ -15946,8 +16084,8 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+      "resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
     },
     "npm-bundled": {
       "version": "1.1.1",
@@ -18698,6 +18836,11 @@
         "source-map": "^0.4.2"
       },
       "dependencies": {
+        "js-base64": {
+          "version": "2.6.4",
+          "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz",
+          "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="
+        },
         "source-map": {
           "version": "0.4.4",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
@@ -18737,9 +18880,27 @@
       }
     },
     "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz",
-      "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc="
+      "version": "7.3.7",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
+      }
     },
     "semver-compare": {
       "version": "1.0.0",
@@ -22346,6 +22507,13 @@
       "integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
       "requires": {
         "semver": "^5.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "winsea-component-library": {

package.json

@@ -45,14 +45,15 @@
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@babel/polyfill": "^7.12.1",
     "@babel/preset-env": "^7.14.4",
+    "@jiaminghi/data-view": "^2.10.0",
     "axios": "^0.20.0",
     "babel-polyfill": "^6.26.0",
     "base-core-lib": "^1.3.16",
     "base-template-lib": "^1.0.7-beta",
     "countup": "^1.8.2",
-    "echarts": "4.2.1",
+    "echarts": "^4.2.1",
     "element-china-area-data": "^5.0.2",
-    "element-ui": "^2.13.2",
+    "element-ui": "^2.15.9",
     "file-saver": "^2.0.5",
     "form-making-advanced": "^1.2.6",
     "html2canvas": "^1.3.2",
@@ -69,6 +70,7 @@
     "register-service-worker": "^1.0.0",
     "sass-loader": "^7.1.0",
     "script-loader": "^0.7.2",
+    "semver": "^7.3.7",
     "serialport": "^9.2.1",
     "sortablejs": "^1.8.4",
     "tinymce": "4.9.2",

public/index.html

@@ -22,6 +22,7 @@
   <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV]) { %>
       <link href="<%= htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV][i] %>" rel="stylesheet">
   <% } %>
+  <script src="./js/echarts.min.js"></script>
   <title>易粮易运</title>
   <link rel="icon" href="<%= BASE_URL %>/logo.ico">
   <% if (process.env.NODE_ENV === 'production') { %>

public/static/collectionContractRecordPrint.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
       table tr td {
@@ -233,8 +233,8 @@
       </div>
     </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/inspection.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
 
     <style>
@@ -337,7 +337,7 @@
     </div>
   </body>
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/inspectionnew.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
 
     <style>
@@ -336,8 +336,8 @@
       </div>
     </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/outInspectionPrint.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
 
     <style>
@@ -314,9 +314,8 @@
       </div>
     </div>
   </body>
-  <!-- <script src="https://cdn.jsdelivr.net/npm/vue@2"></script> -->
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/outWeightPrint.html

@@ -1,9 +1,8 @@
 <!DOCTYPE html>
 <html>
-
 <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
         .number {
@@ -65,12 +64,14 @@
 
         .config {
             margin-top: 20px;
-            margin-right: 120px;
+      width: 30%;
+      min-width: 200px;
         }
 
         .autograph {
             margin-top: 20px;
-            margin-right: 120px;
+        width: 30%;
+        min-width: 200px;
         }
 
         .bottom-row3 {
@@ -136,7 +137,7 @@
             <table class="table">
                 <tr class="row">
                     <td class="col col-bgc">收货单位</td>
-                    <td class="col" colspan="2">{{tableData.contractManagement?tableData.contractManagement.buyer:""}}</td>
+                    <td class="col" colspan="2">{{tableData.customer?tableData.customer:(tableData.contractManagement?tableData.contractManagement.buyer:"")}}</td>
                     <td class="col col-bgc">客户电话</td>
                     <td class="col">{{tableData.contractManagement?tableData.contractManagement.buyerPhone:""}}</td>
                     <td class="col col-bgc">车牌号</td>
@@ -144,7 +145,7 @@
                 </tr>
                 <tr class="row">
                     <td class="col col-bgc">出库单位</td>
-                    <td class="col" colspan="2">{{tableData.compName}}</td>
+                    <td class="col" colspan="2">{{tableData.contractManagement?tableData.contractManagement.seller:tableData.compName}}</td>
                     <td class="col col-bgc">联系人</td>
                     <td class="col">{{tableData.person}}</td>
                     <td class="col col-bgc">联系电话</td>
@@ -158,23 +159,27 @@
                     <td class="col col-bgc">容量（克/升）</td>
                     <td class="col">{{tableData.qualityInspectionManagement ?
                         tableData.qualityInspectionManagement.bulkDensity:""}}</td>
-                    <td class="col col-bgc">不完善粒（%）</td>
-                    <td class="col">{{tableData.qualityInspectionManagement ?
-                        tableData.qualityInspectionManagement.imperfectGrain:""}}</td>
+                    <!-- <td class="col col-bgc">不完善粒（%）</td>
+                    <td class="col">{{tableData.qualityInspectionManagement ?tableData.qualityInspectionManagement.imperfectGrain:""}}</td> -->
+                    <td class="col col-bgc">水分（%）</td>
+                    <td class="col">{{ tableData.qualityInspectionManagement ? tableData.qualityInspectionManagement.waterContent:""}}</td>
                 </tr>
                 <tr class="row">
                     <td class="col col-bgc">等级</td>
                     <td class="col">{{tableData.qualityInspectionManagement ?
                         tableData.qualityInspectionManagement.grade:""}}</td>
-                    <td class="col col-bgc">水分（%）</td>
-                    <td class="col">{{ tableData.qualityInspectionManagement ?
-                        tableData.qualityInspectionManagement.waterContent:""}}</td>
+                 
                     <td class="col col-bgc">热损伤（%）</td>
                     <td class="col">{{tableData.qualityInspectionManagement ?
                         tableData.qualityInspectionManagement.jiaorenli:""}}</td>
-                    <td class="col" colspan="2"></td>
+                    <td class="col col-bgc">杂质（%）</td>
+                    <td class="col">{{ tableData.qualityInspectionManagement ?
+                        tableData.qualityInspectionManagement.impurity:""}}</td>
+                    <td class="col col-bgc">扣杂</td>
+                    <td class="col">{{tableData.qualityInspectionManagement ?
+                        tableData.qualityInspectionManagement.buckleMiscellaneous:""}}</td>
                 </tr>
-                <tr class="row">
+                <!-- <tr class="row">
                     <td class="col col-bgc">杂质（%）</td>
                     <td class="col">{{ tableData.qualityInspectionManagement ?
                         tableData.qualityInspectionManagement.impurity:""}}</td>
@@ -185,7 +190,7 @@
                     <td class="col">{{tableData.qualityInspectionManagement ?
                         tableData.qualityInspectionManagement.buckleMiscellaneous:""}}</td>
                     <td class="col" colspan="2"></td>
-                </tr>
+                </tr> -->
                 <tr class="row">
                     <td class="col col-bgc">毛重（公斤）</td>
                     <td class="col">{{tableData.grossWeight}}</td>
@@ -196,6 +201,16 @@
                     <td class="col col-bgc">净重（公斤）</td>
                     <td class="col">{{tableData.netWeight}}</td>
                 </tr>
+                <tr class="row">
+                    <td class="col col-bgc">箱号-1</td>
+                    <td class="col">{{tableData.boxNo}}</td>
+                    <td class="col col-bgc">箱号-2</td>
+                    <td class="col">{{tableData.boxNoOther}}</td>
+                     <td class="col col-bgc">封号-1</td>
+                    <td class="col">{{tableData.titleNo}}</td>
+                    <td class="col col-bgc">封号-2</td>
+                    <td class="col">{{tableData.titleNoOther}}</td>
+                  </tr>
                 <tr class="row">
                     <td class="col col-bgc" colspan="2">毛重检斤时间</td>
                     <td class="col" colspan="2">{{tableData.grossDate}}</td>
@@ -217,7 +232,6 @@
                     <div class="autograph">客户签名：</div>
                     <div class="autograph">司机签名：</div>
                 </div>
-                <div class="bottom-row3">扫一扫</div>
             </div>
         </div>
         <div class="small-content" v-if="smallContent">
@@ -244,7 +258,7 @@
             </div>
             <div class="small-row">
                 <div>出库单位</div>
-                <div>{{tableData.compName}}</div>
+                <div>{{tableData.contractManagement?tableData.contractManagement.seller:tableData.compName}}</div>
             </div>
             <div class="small-row">
                 <div>联系人</div>
@@ -296,7 +310,7 @@
     </div>
 </body>
 <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-<script src="https://unpkg.com/element-ui/lib/index.js"></script>
+<script src="../cdn/element-ui/2.13.2/index.js"></script>
 <script type="text/javascript">
     new Vue({
         el: '#app',

public/static/payprint.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
       table tr td {
@@ -165,20 +165,26 @@
 
       .sfcard-content img {
         width: 100%;
-        height: 130vh;
+        height: 110vh;
       }
 
       .sfcard-title {
         font-size: 28px;
         text-align: center;
+        height:10vh;
       }
 
       .center {
-        height: 140vh;
+        height: 130vh;
+      }
+.bankcard {
+        height: 130vh;
+      }
+      .part1 {
+        height: 130vh;
       }
-
       .part2 {
-        height: 140vh;
+        height: 130vh;
         /* background: red; */
       }
 
@@ -209,8 +215,8 @@
             </div>
             <div class="center" v-if="isShowPrintType3">
               <div class="header1">{{ printData1[index].compName}}结算凭证</div>
-              <div class="line"></div>
-              <div class="line"></div>
+             <!-- <div class="line"></div>
+              <div class="line"></div> -->
               <div class="header">
                 <div>单位名称：{{ printData1[index].compName}}</div>
                 <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
@@ -421,9 +427,9 @@
               <div style="height: 120px;">
 
                 <div class="title">入库检斤单</div>
-                <div class="leftimg">
+               <!-- <div class="leftimg">
                   <img :src="printData1[index].weighingManagement.codeUrl" alt="">
-                </div>
+                </div> -->
                 <div class="number1">{{printData1[index].weighingManagement.number}}</div>
               </div>
 
@@ -438,11 +444,11 @@
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">收货单位</td>
-                  <td class="col" colspan="2">{{printData1[index].weighingManagement.compName}}</td>
+                  <td class="col" colspan="2">{{printData1[index].compName}}</td>
                   <td class="col col-bgc">联系人</td>
-                  <td class="col">{{printData1[index].weighingManagement.person}}</td>
+                  <td class="col">{{printData1[index].contacts}}</td>
                   <td class="col col-bgc">联系电话</td>
-                  <td class="col" colspan="2">{{printData1[index].weighingManagement.personPhone}}</td>
+                  <td class="col" colspan="2">{{printData1[index].contactsPhone}}</td>
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">货名</td>
@@ -546,7 +552,7 @@
             </div>
             <div class="bankcard" v-if="isShowPrintType2">
 
-              <div class="sfcard-content part2">
+              <div class="sfcard-content">
                 <div class="sfcard-title">
                   {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
                 </div>
@@ -755,9 +761,9 @@
           <div>
 
             <div class="title">入库检斤单</div>
-            <div class="leftimg">
+            <!-- <div class="leftimg">
               <img :src="tableData.codeUrl" alt="">
-            </div>
+            </div> -->
             <div class="number1">{{tableData.number}}</div>
           </div>
           <table class="table">
@@ -771,11 +777,11 @@
             </tr>
             <tr class="row">
               <td class="col col-bgc">收货单位</td>
-              <td class="col" colspan="2">{{tableData.compName}}</td>
+              <td class="col" colspan="2">{{printData.compName}}</td>
               <td class="col col-bgc">联系人</td>
-              <td class="col">{{tableData.person}}</td>
+              <td class="col">{{printData.contacts}}</td>
               <td class="col col-bgc">联系电话</td>
-              <td class="col" colspan="2">{{tableData.personPhone}}</td>
+              <td class="col" colspan="2">{{tableData.contactsPhone}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">货名</td>
@@ -1074,7 +1080,7 @@
     </div>
   </body>
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/payprint1.html

@@ -0,0 +1,1266 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
+    <title></title>
+    <style>
+      table tr td {
+        border: 2px solid #333333;
+        padding: 5px 0;
+      }
+
+      #app {
+        height: 88vh;
+        position: relative;
+      }
+
+      .simple {
+        height: 120vh !important;
+      }
+
+      .content {
+        width: 1000px;
+        margin: auto;
+      }
+
+      table {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+      }
+
+      .col-bgc {
+        background: #f6f7fb;
+      }
+
+      .bottom-row1 {
+        display: flex;
+        justify-content: space-between;
+        margin: 20px 0;
+      }
+
+      .bottom-row2 {
+        display: flex;
+        margin: 10px 0;
+      }
+
+      img {
+        width: 80px;
+        height: 80px;
+        /* margin-right: 118px; */
+      }
+
+      .leftimg {
+        width: 80px;
+        height: 80px;
+        position: absolute;
+        right: 20px;
+        top: 3px;
+      }
+
+      .config {
+        margin-right: 240px;
+      }
+
+      .bottom-row3 {
+        margin: 10px 0;
+      }
+
+      .title {
+        text-align: center;
+        font-size: 24px;
+      }
+
+      .number {
+        text-align: right;
+        margin-bottom: 10px;
+      }
+
+      .number1 {
+        text-align: right;
+        margin-bottom: 10px;
+        margin-top: 60px;
+      }
+
+      .small-row {
+        display: flex;
+      }
+
+      .small-content {
+        width: 400px;
+        margin: 0 auto;
+        border: 1px solid #ccc;
+        padding: 20px 20px 160px 20px;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: auto;
+        height: 650px;
+      }
+
+      .small-title {
+        text-align: center;
+        font-size: 18px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+
+      .small-row {
+        display: flex;
+        justify-content: space-between;
+        margin: 10px;
+      }
+
+      .small-img {
+        margin-right: 0;
+      }
+
+      .sign {
+        margin-right: 100px;
+      }
+
+      .header {
+        display: flex;
+        justify-content: space-between;
+        font-size: 16px;
+        margin: 10px 0;
+      }
+
+      .header1 {
+        font-size: 24px;
+        /* margin: 30px 60px 10px 60px; */
+        display: flex;
+        justify-content: center;
+      }
+
+      .line {
+        height: 2px;
+        width: 410px;
+        margin: 3px auto;
+        background: black;
+      }
+
+      .line:nth-of-type(3) {
+        margin-bottom: 30px;
+      }
+
+      .header-top {
+        display: flex;
+        justify-content: space-between;
+      }
+
+      .sfcard {
+        background: red;
+      }
+
+      .sfcard-content {
+        /*        display: flex;
+        align-items: center;
+        justify-content: space-evenly; */
+      }
+
+      .sfcard-content img {
+        width: 100%;
+        height: 130vh;
+      }
+
+      .sfcard-title {
+        font-size: 28px;
+        text-align: center;
+      }
+
+      .center {
+        height: 140vh;
+      }
+
+      .part2 {
+        height: 140vh;
+        /* background: red; */
+      }
+
+      .part5 {
+        width: 100%
+      }
+
+      .paymentScreenshot {
+        width: 100%;
+        height: 130vh
+      }
+
+      /* .onlypz-center{
+        height: 130vh;
+      } */
+    </style>
+  </head>
+  <body>
+    <div id="app">
+      <div v-if="selectPrint">
+        <div v-for="(item,index) in printData1" :key="index">
+          <div class="content">
+            <div class="part5" v-if="isShowPrintType5">
+              <div class="header1">
+                付款回执单
+              </div>
+              <img :src="printData1[index].codeUrl" class="paymentScreenshot" />
+            </div>
+            <div class="center" v-if="isShowPrintType3">
+              <div class="header1">{{ printData1[index].compName}}结算凭证</div>
+              <div class="line"></div>
+              <div class="line"></div>
+              <div class="header">
+                <div>单位名称：{{ printData1[index].compName}}</div>
+                <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
+              </div>
+              <div class="header-top">
+                <div>单位：公斤/元</div>
+                <div>No.</div>
+              </div>
+              <div class="header-top">
+                <div>开票日期：{{printData1[index].createDate}}</div>
+                <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
+                <div class="number">
+                  {{dealNo(printData1[index].paymentNo)}}
+                </div>
+              </div>
+              <table class="table">
+                <tr class="row">
+                  <td rowspan="4" class="col col-bgc">买方</td>
+                  <td class="col col-bgc">单位名称</td>
+                  <td class="col" colspan="3">
+                    {{ printData1[index].compName}}
+                  </td>
+                  <td rowspan="4" class="col col-bgc">卖方</td>
+                  <td class="col col-bgc">姓名</td>
+                  <td class="col" colspan="4">
+                    {{ printData1[index].customerName}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">税务登记号</td>
+                  <td class="col" colspan="3">
+                    {{ printData1[index].taxRegistrationNo}}
+                  </td>
+                  <td class="col col-bgc">身份证号</td>
+                  <td class="col" colspan="4">
+                    {{
+                    printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">业务编号</td>
+                  <td class="col" colspan="3">
+                    {{ printData1[index].paymentNo}}
+                  </td>
+                  <td class="col col-bgc">卡号</td>
+                  <td class="col" colspan="4">
+                    {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">收货仓库</td>
+                  <td class="col" colspan="3">
+                    {{printData1[index].warehouseName}}
+                  </td>
+                  <td class="col col-bgc">地址</td>
+                  <td class="col" colspan="4">
+                    {{printData1[index].identityAuthenticationInfo.compAddress}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">货名</td>
+                  <td class="col col-bgc">类型</td>
+                  <td class="col col-bgc">等级</td>
+                  <td class="col col-bgc">水分%</td>
+                  <td class="col col-bgc">杂质%</td>
+                  <td class="col col-bgc">容重（克/升）</td>
+                  <td class="col col-bgc">毛重</td>
+                  <td class="col col-bgc">皮重</td>
+                  <td class="col col-bgc">扣杂重</td>
+                  <td class="col col-bgc">净重</td>
+                </tr>
+                <tr class="row">
+                  <td class="col">{{ printData1[index].goodsName}}</td>
+                  <td class="col">{{ printData1[index].type}}</td>
+                  <td class="col">
+                    {{ printData1[index].qualityInspectionManagement.grade}}
+                  </td>
+                  <td class="col">
+                    {{
+                    printData1[index].qualityInspectionManagement.waterContent}}
+                  </td>
+                  <td class="col">
+                    {{ printData1[index].qualityInspectionManagement.impurity}}
+                  </td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}
+                  </td>
+                  <td class="col">{{ printData1[index].grossWeight}}</td>
+                  <td class="col">{{ printData1[index].tare}}</td>
+                  <td class="col">
+                    {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
+                  </td>
+                  <td class="col">{{ printData1[index].netWeight}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">纯重</td>
+                  <td class="col col-bgc" v-if="printData1[index].type == '潮粮'">
+                    净重单价
+                  </td>
+                  <td class="col col-bgc" v-if="printData1[index].type == '干粮'">
+                    单价
+                  </td>
+                  <td class="col col-bgc">扣单价</td>
+                  <td class="col col-bgc">粮款</td>
+                  <td class="col col-bgc">称重补助</td>
+                  <td class="col col-bgc">运费补助</td>
+                  <td class="col col-bgc">卸车补助</td>
+                  <td class="col col-bgc">其他补助</td>
+                  <td class="col col-bgc">称重扣款</td>
+                  <td class="col col-bgc">运费扣款</td>
+                </tr>
+                <tr class="row">
+                  <td class="col">{{ printData1[index].pureWeight}}</td>
+                  <td class="col " v-if="printData1[index].type == '潮粮'">
+                    {{printData1[index].tidalGrainPrice}}
+                  </td>
+                  <td class="col " v-if="printData1[index].type == '干粮'">
+                    {{printData1[index].qualityInspectionManagement.dryGrainPrice}}
+                  </td>
+                  <td class="col ">{{ printData1[index].unitDeduction}}</td>
+                  <td class="col ">{{ printData1[index].grainMoney}}</td>
+                  <td class="col ">{{ printData1[index].weighingSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].freightSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].unloadSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].otherSubsidy}}</td>
+                  <td class="col ">{{ printData1[index].weighingDeduction}}</td>
+                  <td class="col ">{{ printData1[index].freightDeduction}}</td>
+                  <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">卸车扣款</td>
+                  <td class="col col-bgc">质量扣款</td>
+                  <td class="col col-bgc">其他扣款</td>
+                  <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                    纯重单价
+                  </td>
+                  <td class="col col-bgc">合计应付</td>
+                  <td class="col col-bgc">购粮性质</td>
+                  <td class="col col-bgc">车牌号</td>
+                  <td class="col col-bgc" colspan="4">记事</td>
+                </tr>
+                <tr class="row">
+                  <td class="col ">{{ printData1[index].unloadDeduction}}</td>
+                  <td class="col ">{{ printData1[index].qualityDeduction}}</td>
+                  <td class="col ">{{ printData1[index].otherDeduction}}</td>
+                  <td class="col " v-if="printData1[index].type == '潮粮'">
+                    {{ printData1[index].solidGrainPrice}}
+                  </td>
+                  <td class="col ">
+                    {{ printData1[index].calculationPayable}}
+                  </td>
+                  <td class="col ">
+                    {{
+                    printData1[index].qualityInspectionManagement.natureOfGrainPurchase}}
+                  </td>
+                  <td class="col ">{{ printData1[index].carNo}}</td>
+                  <td class="col " colspan="4">
+                    {{ printData1[index].remarks}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">实付金额</td>
+                  <td class="col " colspan="2">
+                    {{printData1[index].actualPayment}}
+                  </td>
+                  <td class="col col-bgc" colspan="3">人民币（大写）</td>
+                  <td class="col " colspan="4">
+                    {{printData1[index].capitalize}}
+                  </td>
+                </tr>
+              </table>
+
+              <div class="bottom">
+                <div class="bottom-row1">
+                  <div>
+                    质检：{{
+                    printData1[index].qualityInspectionManagement.qualityInspector}}
+                  </div>
+                  <div>
+                    毛检：{{
+                    printData1[index].weighingManagement.secretaryWeigher}}
+                  </div>
+                  <div>
+                    皮检：{{
+                    printData1[index].weighingManagement.skinInspector}}
+                  </div>
+                  <div>结算：{{ printData1[index].settlementClerk}}</div>
+                  <div>付款：{{ printData1[index].cashier}}</div>
+                  <div>复点：{{ }}</div>
+                  <div></div>
+                </div>
+                <div class="bottom-row2">
+                  <!-- <div class="left">
+                   <img src="../../../../public/img/add.png" alt="" />
+                 </div> -->
+                  <div class="config">收货单位签名或盖章</div>
+                  <div class="">客户签名</div>
+                </div>
+                <!-- <div class="bottom-row3">扫一扫</div> -->
+                <!-- <div class="bottom-row4">
+                 <el-button type="primary">关闭</el-button>
+                  <el-button type="primary" @click="printSmall">打印小票</el-button>
+                  <el-button type="primary" @click="printBig">打印单据</el-button>
+               </div> -->
+              </div>
+            </div>
+            <div v-if="isShowPrintType4" class="part2">
+              <div style="height: 120px;">
+
+                <div class="title">入库检斤单</div>
+                <div class="leftimg">
+                  <img :src="printData1[index].weighingManagement.codeUrl" alt="">
+                </div>
+                <div class="number1">{{printData1[index].weighingManagement.number}}</div>
+              </div>
+
+              <table class="table">
+                <tr class="row">
+                  <td class="col col-bgc">客户姓名</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.customer}}</td>
+                  <td class="col col-bgc">客户电话</td>
+                  <td class="col">{{printData1[index].weighingManagement.customerPhone}}</td>
+                  <td class="col col-bgc">车牌号</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.carNumber}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">收货单位</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.compName}}</td>
+                  <td class="col col-bgc">联系人</td>
+                  <td class="col">{{printData1[index].weighingManagement.person}}</td>
+                  <td class="col col-bgc">联系电话</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.personPhone}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">货名</td>
+                  <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
+                  <td class="col col-bgc">类型</td>
+                  <td class="col">{{printData1[index].weighingManagement.type}}</td>
+                  <td class="col col-bgc">容量（克/升）</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
+                  </td>
+                  <td class="col col-bgc">不完善粒（%）</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">等级</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.grade:''}}
+                  </td>
+                  <td class="col col-bgc">水分（%）</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.waterContent:''}}
+                  </td>
+                  <td class="col col-bgc">热损伤（%）</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.jiaorenli:''}}
+                  </td>
+                  <td class="col col-bgc">质检时间</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.qualityDate:''}}
+                  </td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">杂质（%）</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.impurity:''}}
+                  </td>
+                  <td class="col col-bgc">霉变粒（%）</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.mildewGrain:''}}
+                  </td>
+                  <td class="col col-bgc">扣杂</td>
+                  <td class="col">
+                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.buckleMiscellaneous:''}}
+                  </td>
+                  <td class="col " colspan="2"></td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc">毛重（公斤）</td>
+                  <td class="col">{{printData1[index].weighingManagement.grossWeight}}</td>
+                  <td class="col col-bgc">皮重（公斤）</td>
+                  <td class="col">{{printData1[index].weighingManagement.tare}}</td>
+                  <td class="col col-bgc">扣重（公斤）</td>
+                  <td class="col">{{printData1[index].weighingManagement.buckleMiscellaneous}}</td>
+                  <td class="col col-bgc">净重（公斤）</td>
+                  <td class="col">{{printData1[index].weighingManagement.netWeight}}</td>
+                </tr>
+                <tr class="row">
+                  <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.grossDate}}</td>
+                  <td class="col col-bgc" colspan="2">皮重检斤时间</td>
+                  <td class="col" colspan="2">{{printData1[index].weighingManagement.tareDate}}</td>
+                </tr>
+              </table>
+
+              <div class="bottom">
+                <div class="bottom-row1">
+                  <div>毛检：{{printData1[index].weighingManagement.secretaryWeigher}}</div>
+                  <div style="margin-left:60px">
+                    皮检：{{printData1[index].weighingManagement.skinInspector}}
+                  </div>
+                  <!-- <div>{{tableData.qualityDate}}</div> -->
+                </div>
+                <div class="bottom-row2">
+                  <!-- <div class="leftimg">
+                    <img src="../img/add.png" alt="">
+                  </div> -->
+                  <div class="config">收货单位签名或盖章：</div>
+                  <div class="autograph">客户签名：</div>
+                </div>
+                <!-- <div class="bottom-row3">扫一扫</div> -->
+              </div>
+            </div>
+
+            <div class="part1" v-if="isShowPrintType1">
+              <div class="sfcard-content">
+                <div class="sfcard-title">
+                  {{
+                  printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl1" class="avatar" />
+              </div>
+         <!--     <div class="sfcard-content">
+                <div class="sfcard-title">
+                  {{
+                  printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl2" class="avatar" />
+              </div> -->
+            </div>
+            <div class="bankcard" v-if="isShowPrintType2">
+
+              <div class="sfcard-content part2">
+                <div class="sfcard-title">
+                  {{printData1[index].bankDeposit}}{{printData1[index].bankCard}}
+                </div>
+                <!-- <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" /> -->
+                <img :src="printData1[index].imgURl.imageUrl3" class="avatar" />
+                <img :src="printData1[index].imgURl.imageUrl4" class="avatar" />
+              </div>
+    <!--          <div class="sfcard-content part2">
+                <div class="sfcard-title">
+                  {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl4" class="avatar" />
+              </div> -->
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="content" v-else>
+        <div class="part5" v-if="isShowPrintType5">
+          <div class="header1">
+            付款回执单
+          </div>
+          <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
+        </div>
+        <div class="center part1" v-if="isShowPrintType3" :class="!selectPrint? 'simple':''">
+          <div class="header1">{{ printData.compName}}结算凭证</div>
+          <div class="line"></div>
+          <div class="line"></div>
+          <div class="header">
+            <div>单位名称：{{ printData.compName}}</div>
+            <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
+          </div>
+          <div class="header-top">
+            <div>单位：公斤/元</div>
+            <div>No.</div>
+          </div>
+          <div class="header-top">
+            <div>开票日期：{{printData.createDate}}</div>
+            <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
+            <div class="number">{{dealNo(printData.paymentNo)}}</div>
+          </div>
+          <table class="table">
+            <tr class="row">
+              <td rowspan="4" class="col col-bgc">买方</td>
+              <td class="col col-bgc">单位名称</td>
+              <td class="col" colspan="3">{{ printData.compName}}</td>
+              <td rowspan="4" class="col col-bgc">卖方</td>
+              <td class="col col-bgc">姓名</td>
+              <td class="col" colspan="4">{{ printData.customerName}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">税务登记号</td>
+              <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
+              <td class="col col-bgc">身份证号</td>
+              <td class="col" colspan="4">
+                {{ printData.identityAuthenticationInfo.customerNumberCard}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">业务编号</td>
+              <td class="col" colspan="3">{{ printData.paymentNo}}</td>
+              <td class="col col-bgc">卡号</td>
+              <td class="col" colspan="4">
+                {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">收货仓库</td>
+              <td class="col" colspan="3">{{printData.warehouseName}}</td>
+              <td class="col col-bgc">地址</td>
+              <td class="col" colspan="4">
+                {{printData.identityAuthenticationInfo.compAddress}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">货名</td>
+              <td class="col col-bgc">类型</td>
+              <td class="col col-bgc">等级</td>
+              <td class="col col-bgc">水分%</td>
+              <td class="col col-bgc">杂质%</td>
+              <td class="col col-bgc">毛重</td>
+              <td class="col col-bgc">皮重</td>
+              <td class="col col-bgc">扣杂重</td>
+              <td class="col col-bgc">净重</td>
+              <td class="col col-bgc">出库净重</td>
+              <!-- <td class="col col-bgc">纯重</td> -->
+            </tr>
+            <tr class="row">
+              <td class="col">{{ printData.goodsName}}</td>
+              <td class="col">{{ printData.type}}</td>
+              <td class="col">
+                {{ printData.qualityInspectionManagement.grade}}
+              </td>
+              <td class="col">
+                {{ printData.qualityInspectionManagement.waterContent}}
+              </td>
+              <td class="col">
+                {{ printData.qualityInspectionManagement.impurity}}
+              </td>
+              <td class="col">{{ printData.grossWeight}}</td>
+              <td class="col">{{ printData.tare}}</td>
+              <td class="col">
+                {{ printData.weighingManagement.buckleMiscellaneous}}
+              </td>
+              <td class="col">{{ printData.netWeight}}</td>
+              <td class="col">{{printData.contractManagement ? printData.contractManagement.weight : "0"}}</td>
+              <!-- <td class="col">{{ printData.pureWeight}}</td> -->
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">纯重</td>
+              <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                净重单价
+              </td>
+              <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
+              <td class="col col-bgc">扣单价</td>
+              <td class="col col-bgc">粮款</td>
+              <td class="col col-bgc">称重补助</td>
+              <td class="col col-bgc">运费补助</td>
+              <td class="col col-bgc">卸车补助</td>
+              <td class="col col-bgc">其他补助</td>
+              <td class="col col-bgc">称重扣款</td>
+              <td class="col col-bgc">运费扣款</td>
+              <!-- <td class="col col-bgc">1卸车扣款</td> -->
+            </tr>
+            <tr class="row">
+              <td class="col">{{ printData.pureWeight}}</td>
+              <td class="col " v-if="printData.type == '潮粮'">
+                {{printData.tidalGrainPrice}}
+              </td>
+              <td class="col " v-if="printData.type == '干粮'">
+                {{printData.qualityInspectionManagement.dryGrainPrice}}
+              </td>
+              <td class="col ">{{ printData.unitDeduction}}</td>
+              <td class="col ">{{ printData.grainMoney}}</td>
+              <td class="col ">{{ printData.weighingSubsidy}}</td>
+              <td class="col ">{{ printData.freightSubsidy}}</td>
+              <td class="col ">{{ printData.unloadSubsidy}}</td>
+              <td class="col ">{{ printData.otherSubsidy}}</td>
+              <td class="col ">{{ printData.weighingDeduction}}</td>
+              <td class="col ">{{ printData.freightDeduction}}</td>
+              <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">卸车扣款</td>
+              <td class="col col-bgc">质量扣款</td>
+              <td class="col col-bgc">其他扣款</td>
+              <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                纯重单价
+              </td>
+              <td class="col col-bgc">合计应付</td>
+              <td class="col col-bgc">购粮性质</td>
+              <td class="col col-bgc">车牌号</td>
+              <td class="col col-bgc" colspan="4">记事</td>
+            </tr>
+            <tr class="row">
+              <td class="col ">{{ printData.unloadDeduction}}</td>
+              <td class="col ">{{ printData.qualityDeduction}}</td>
+              <td class="col ">{{ printData.otherDeduction}}</td>
+              <td class="col " v-if="printData.type == '潮粮'">
+                {{ printData.solidGrainPrice}}
+              </td>
+              <td class="col ">{{ printData.calculationPayable}}</td>
+              <td class="col ">
+                {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
+              </td>
+              <td class="col ">{{ printData.carNo}}</td>
+              <td class="col " colspan="4">{{ printData.remarks}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">实付金额</td>
+              <td class="col " colspan="2">{{printData.actualPayment}}</td>
+              <td class="col col-bgc" colspan="3">人民币（大写）</td>
+              <td class="col " colspan="4">{{printData.capitalize}}</td>
+            </tr>
+          </table>
+          <div class="bottom">
+            <div class="bottom-row1">
+              <div>
+                质检：{{
+                printData.qualityInspectionManagement.qualityInspector}}
+              </div>
+              <div>
+                毛检：{{ printData.weighingManagement.secretaryWeigher}}
+              </div>
+              <div>皮检：{{ printData.weighingManagement.skinInspector}}</div>
+              <div>结算：{{ printData.settlementClerk}}</div>
+              <div>付款：{{ printData.cashier}}</div>
+              <div>复点：{{ }}</div>
+              <div></div>
+            </div>
+            <div class="bottom-row2">
+              <!-- <div class="left">
+               <img src="../../../../public/img/add.png" alt="" />
+             </div> -->
+              <div class="config">收货单位签名或盖章</div>
+              <div class="">客户签名</div>
+            </div>
+            <!-- <div class="bottom-row3">扫一扫</div> -->
+            <!-- <div class="bottom-row4">
+             <el-button type="primary">关闭</el-button>
+              <el-button type="primary" @click="printSmall">打印小票</el-button>
+              <el-button type="primary" @click="printBig">打印单据</el-button>
+           </div> -->
+          </div>
+        </div>
+
+        <div v-if="isShowPrintType4" class="part2">
+          <div>
+
+            <div class="title">入库检斤单</div>
+            <div class="leftimg">
+              <img :src="tableData.codeUrl" alt="">
+            </div>
+            <div class="number1">{{tableData.number}}</div>
+          </div>
+          <table class="table">
+            <tr class="row">
+              <td class="col col-bgc">客户姓名</td>
+              <td class="col" colspan="2">{{tableData.customer}}</td>
+              <td class="col col-bgc">客户电话</td>
+              <td class="col">{{tableData.customerPhone}}</td>
+              <td class="col col-bgc">车牌号</td>
+              <td class="col" colspan="2">{{tableData.carNumber}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">收货单位</td>
+              <td class="col" colspan="2">{{tableData.compName}}</td>
+              <td class="col col-bgc">联系人</td>
+              <td class="col">{{tableData.person}}</td>
+              <td class="col col-bgc">联系电话</td>
+              <td class="col" colspan="2">{{tableData.personPhone}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">货名</td>
+              <td class="col">{{tableData.goodsName}}</td>
+              <td class="col col-bgc">类型</td>
+              <td class="col">{{tableData.type}}</td>
+              <td class="col col-bgc">容量（克/升）</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
+              </td>
+              <td class="col col-bgc">不完善粒（%）</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">等级</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.grade:''}}
+              </td>
+              <td class="col col-bgc">水分（%）</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.waterContent:''}}
+              </td>
+              <td class="col col-bgc">热损伤（%）</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.jiaorenli:''}}
+              </td>
+              <td class="col col-bgc">质检时间</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.qualityDate:''}}
+              </td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">杂质（%）</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.impurity:''}}
+              </td>
+              <td class="col col-bgc">霉变粒（%）</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.mildewGrain:''}}
+              </td>
+              <td class="col col-bgc">扣杂</td>
+              <td class="col">
+                {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.buckleMiscellaneous:''}}
+              </td>
+              <td class="col " colspan="2"></td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc">毛重（公斤）</td>
+              <td class="col">{{tableData.grossWeight}}</td>
+              <td class="col col-bgc">皮重（公斤）</td>
+              <td class="col">{{tableData.tare}}</td>
+              <td class="col col-bgc">扣重（公斤）</td>
+              <td class="col">{{tableData.buckleMiscellaneous}}</td>
+              <td class="col col-bgc">净重（公斤）</td>
+              <td class="col">{{tableData.netWeight}}</td>
+            </tr>
+            <tr class="row">
+              <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+              <td class="col" colspan="2">{{tableData.grossDate}}</td>
+              <td class="col col-bgc" colspan="2">皮重检斤时间</td>
+              <td class="col" colspan="2">{{tableData.tareDate}}</td>
+            </tr>
+          </table>
+
+          <div class="bottom">
+            <div class="bottom-row1">
+              <div>毛检：{{tableData.secretaryWeigher}}</div>
+              <div style="margin-left:60px">
+                皮检：{{tableData.skinInspector}}
+              </div>
+              <!-- <div>{{tableData.qualityDate}}</div> -->
+            </div>
+            <div class="bottom-row2">
+              <!-- <div class="left">
+                <img src="../img/add.png" alt="">
+              </div> -->
+              <div class="config">收货单位签名或盖章：</div>
+              <div class="autograph">客户签名：</div>
+            </div>
+            <!-- <div class="bottom-row3">扫一扫</div> -->
+          </div>
+        </div>
+
+        <div class="sfcard part3" v-if="isShowPrintType1">
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{ printData.customerName}}{{
+              printData.identityAuthenticationInfo.customerNumberCard}}
+            </div>
+            <img :src="imageUrl1" class="avatar" />
+          </div>
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{ printData.customerName}}{{
+              printData.identityAuthenticationInfo.customerNumberCard}}
+            </div>
+            <img :src="imageUrl2" class="avatar" />
+          </div>
+        </div>
+
+        <div class="bankcard part4" v-if="isShowPrintType2">
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{printData.bankDeposit}}{{printData.bankCard}}
+            </div>
+            <img :src="imageUrl3" class="avatar" />
+          </div>
+          <div class="sfcard-content">
+            <div class="sfcard-title">
+              {{printData.bankDeposit}}{{printData.bankCard}}
+            </div>
+            <img :src="imageUrl4" class="avatar" />
+          </div>
+
+        </div>
+      </div>
+
+      <div class="small-content" v-if="smallContent">
+        <div class="small-title">
+          <div>
+            {{printData.compName}}结算凭证
+          </div>
+          <img class="small-img" src="../img/add.png" alt="" />
+        </div>
+        <div class="small-row">
+          <div>开票日期</div>
+          <div>{{printData.createDate}}</div>
+        </div>
+        <div class="small-row">
+          <div>买方单位名称</div>
+          <div>{{printData.compName}}</div>
+        </div>
+        <div class="small-row">
+          <div>买方姓名</div>
+          <div>{{printData.customerName}}</div>
+        </div>
+        <div class="small-row">
+          <div>税务登记号</div>
+          <div>{{printData.taxRegistrationNo}}</div>
+        </div>
+        <div class="small-row">
+          <div>身份证号</div>
+          <div>{{printData.customerNumberCard}}</div>
+        </div>
+        <div class="small-row">
+          <div>化验单号</div>
+          <div>{{printData.paymentNo}}</div>
+        </div>
+        <div class="small-row">
+          <div>卡号</div>
+          <div>{{printData.bankCard}}</div>
+        </div>
+        <div class="small-row">
+          <div>收货仓库</div>
+          <div>{{printData.warehouseName}}</div>
+        </div>
+        <div class="small-row">
+          <div>货名</div>
+          <div>{{printData.goodsName}}</div>
+        </div>
+        <div class="small-row">
+          <div>类型</div>
+          <div>{{printData.type}}</div>
+        </div>
+        <div class="small-row">
+          <div>等级</div>
+          <div>{{printData.grade}}</div>
+        </div>
+        <div class="small-row">
+          <div>水分%</div>
+          <div>{{printData.waterContent}}</div>
+        </div>
+        <div class="small-row">
+          <div>杂质%</div>
+          <div>{{printData.impurity}}</div>
+        </div>
+        <div class="small-row">
+          <div>毛重</div>
+          <div>{{printData.grossWeight}}</div>
+        </div>
+        <div class="small-row">
+          <div>皮重</div>
+          <div>{{printData.tare}}</div>
+        </div>
+        <div class="small-row">
+          <div>扣杂重</div>
+          <div>{{printData.weighingManagement.buckleMiscellaneous}}</div>
+        </div>
+        <div class="small-row">
+          <div>净重</div>
+          <div>{{printData.netWeight}}</div>
+        </div>
+        <div class="small-row">
+          <div>纯重</div>
+          <div>{{printData.pureWeight}}</div>
+        </div>
+        <div class="small-row">
+          <div>净重单价</div>
+          <div>{{printData.tidalGrainPrice}}</div>
+        </div>
+        <div class="small-row">
+          <div>粮款</div>
+          <div>{{printData.grainMoney}}</div>
+        </div>
+        <div class="small-row">
+          <div>称重补助</div>
+          <div>{{printData.weighingSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>运费补助</div>
+          <div>{{printData.freightSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>卸车补助</div>
+          <div>{{printData.unloadSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>其他补助</div>
+          <div>{{printData.otherSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>称重扣款</div>
+          <div>{{printData.weighingDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>运费扣款</div>
+          <div>{{printData.freightDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>卸车扣款</div>
+          <div>{{printData.unloadDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>质量扣款</div>
+          <div>{{printData.qualityDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>其他扣款</div>
+          <div>{{printData.otherDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>纯重单价</div>
+          <div>{{printData.solidGrainPrice}}</div>
+        </div>
+        <div class="small-row">
+          <div>合计应付</div>
+          <div>{{printData.calculationPayable}}</div>
+        </div>
+        <div class="small-row">
+          <div>购粮性质</div>
+          <div>{{printData.natureOfGrainPurchase}}</div>
+        </div>
+        <div class="small-row">
+          <div>车牌号</div>
+          <div>{{printData.carNo}}</div>
+        </div>
+        <div class="small-row">
+          <div>记事</div>
+          <div>{{printData.remarks}}</div>
+        </div>
+        <div class="small-row">
+          <div>实付金额</div>
+          <div>{{printData.actualPayment}}</div>
+        </div>
+        <div class="small-row">
+          <div>人民币（大写）</div>
+          <div>{{printData.capitalize}}</div>
+        </div>
+        <div class="small-row">
+          <div>质检</div>
+          <div>{{printData.qualityInspector}}</div>
+        </div>
+        <div class="small-row">
+          <div>毛检</div>
+          <div>{{printData.secretaryWeigher}}</div>
+        </div>
+        <div class="small-row">
+          <div>皮检</div>
+          <div>{{printData.skinInspector}}</div>
+        </div>
+        <div class="small-row">
+          <div>结算</div>
+          <div>{{printData.settlementClerk}}</div>
+        </div>
+        <div class="small-row">
+          <div>付款</div>
+          <div>{{printData.actualPayment}}</div>
+        </div>
+        <div class="small-row">
+          <div>复点</div>
+          <div>&nbsp;&nbsp;&nbsp;</div>
+        </div>
+      </div>
+    </div>
+  </body>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
+  <script type="text/javascript">
+    new Vue({
+      el: '#app',
+      data: {
+        isShowPrintType1: false,
+        isShowPrintType2: false,
+        isShowPrintType3: false,
+        isShowPrintType4: false,
+        isShowPrintType5: false,
+        showType: [],
+        printData: {},
+        printData1: [],
+        customerList: {},
+        customerList1: [],
+        name: '',
+        bigContent: false,
+        smallContent: false,
+        date: '',
+        imageUrl1: '',
+        imageUrl2: '',
+        imageUrl3: '',
+        imageUrl4: '',
+        identity: [],
+        bank: [],
+        selectPrint: false,
+        onlyShowPz: false,
+        tableData: []
+      },
+      computed: {},
+      methods: {
+        dealNo(str) {
+          return str.slice(4)
+        },
+        tableRowClassName({
+          row,
+          rowIndex
+        }) {
+          if (rowIndex === 1) {
+            return 'warning-row'
+          } else if (rowIndex === 3) {
+            return 'success-row'
+          }
+          return ''
+        },
+        getQueryVariable(variable) {
+          var query = window.location.search.substring(1)
+          var vars = query.split('&')
+          for (var i = 0; i < vars.length; i++) {
+            var pair = vars[i].split('=')
+            if (pair[0] == variable) {
+              return pair[1]
+            }
+          }
+          return false
+        },
+        printSmall() {},
+        printBig() {}
+      },
+      mounted() {
+        this.date = new Date().toLocaleString()
+        let _data = decodeURIComponent(this.getQueryVariable('dataList'))
+        if (!_data) {
+          this.selectPrint = true
+          this.printData1 = JSON.parse(
+            localStorage.getItem('selectPrint_selectPrintList')
+          )
+          console.log("对象", this.printData1)
+          console.log("对象", this.printData)
+          for (let i = 0; i < this.printData1.length; i++) {
+            if (!this.printData1[i].identityAuthenticationInfo.compAddress) this.printData1[i]
+              .identityAuthenticationInfo.compAddress = ''
+            if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 24) {
+              this.printData1[i].identityAuthenticationInfo.compAddress = this.printData1[i]
+                .identityAuthenticationInfo
+                .compAddress.substring(0, 24)
+            }
+          }
+        } else {
+          this.printData = JSON.parse(_data)
+          //地址过长截取
+          if (this.printData.identityAuthenticationInfo.compAddress.length > 24) {
+            this.printData.identityAuthenticationInfo.compAddress = this.printData.identityAuthenticationInfo
+              .compAddress.substring(0, 24)
+          }
+          this.selectPrint = false
+        }
+        let _type = decodeURIComponent(this.getQueryVariable('type'))
+        this.showType = decodeURIComponent(
+          this.getQueryVariable('printTypeList')
+        )
+        // this.pzList = this.showType.split(',')
+        // if((this.showType.indexOf('打印结算凭证')>-1)&&this.pzList.length==1){
+        //   this.onlyShowPz = true
+        // }
+        // this.pageType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+        let _data1 = decodeURIComponent(this.getQueryVariable('customerList'))
+        if (!_data1) {
+          this.customerList1 = JSON.parse(
+            localStorage.getItem('selectPrint_selectCustomerList')
+          )
+        } else {
+          this.customerList = JSON.parse(_data1)
+        }
+        console.log('cwprint', localStorage.getItem('cwprint'))
+        var cwprint = localStorage.getItem('cwprint')
+        if (cwprint == 'true') {
+          if (this.selectPrint) {
+            for (let i = 0; i < this.customerList1.length; i++) {
+              let _url1 = this.customerList1[i].cardAddressUrl.split(',')
+              // let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
+              this.customerList1[i].imgURl = {
+                imageUrl1: _url1[0],
+                imageUrl2: _url1[1],
+                // imageUrl3: _url2[0],
+                // imageUrl4: _url2[0]
+              }
+            }
+            for (let i = 0; i < this.printData1.length; i++) {
+              let _url2 = this.printData1[i].payeeAddressUrl.split(',')
+              this.printData1[i].imgURl = {
+                imageUrl3: _url2[0],
+                imageUrl4: _url2[1]
+              }
+            }
+          } else {
+            if (this.customerList.cardAddressUrl) {
+              this.identity = this.customerList.cardAddressUrl.split(',')
+              this.imageUrl1 = this.identity[0]
+              this.imageUrl2 = this.identity[1]
+            }
+            console.log(this.customerList)
+            if (this.customerList.payeeAddressUrl) {
+              this.bank = this.customerList.payeeAddressUrl.split(',')
+              this.imageUrl3 = this.bank[0]
+              this.imageUrl4 = this.bank[1]
+            }
+            if (this.printData.payeeAddressUrl){
+              this.bank = this.printData.payeeAddressUrl.split(',')
+              this.imageUrl3 = this.bank[0]
+              this.imageUrl4 = this.bank[1]
+            }
+
+            this.tableData = this.printData.weighingManagement
+          }
+          let _lsit = this.showType.split(',')
+          for (let i = 0; i < _lsit.length; i++) {
+            switch (_lsit[i]) {
+              case '打印身份证':
+                this.isShowPrintType1 = !this.isShowPrintType1
+                break
+              case '打印银行卡':
+                this.isShowPrintType2 = !this.isShowPrintType2
+                break
+              case '打印结算凭证':
+                this.isShowPrintType3 = !this.isShowPrintType3
+                break
+              case '打印检斤单':
+                this.isShowPrintType4 = !this.isShowPrintType4
+                break
+              case '打印回执单':
+                this.isShowPrintType5 = !this.isShowPrintType5
+                break
+            }
+          }
+        } else {
+          this.isShowPrintType3 = true
+        }
+        if (_type == 2) {
+          this.bigContent = true
+          this.smallContent = false
+        } else {
+          this.smallContent = true
+          this.bigContent = false
+        }
+        if (this.printData.compName == undefined) this.printData.compName = ''
+        document.title = this.printData.compName + '结算凭证'
+        window.print()
+        // sessionStorage.removeItem('selectPrint_selectPrintList');
+        // sessionStorage.removeItem('selectPrint_selectCustomerList');
+        window.onafterprint = function(event) {
+          window.history.back(-1)
+        }
+      },
+      watch: {}
+    })
+  </script>
+</html>

public/static/print.html

@@ -1,9 +1,8 @@
 <!DOCTYPE html>
 <html>
-
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
       .content {
@@ -265,7 +264,7 @@
     </div>
   </body>
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/tradeServicesPrint.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
       table,
@@ -276,7 +276,7 @@
     </div>
   </body>
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/warehouseBatchPrint.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
       body{
@@ -234,7 +234,7 @@
     </div>
   </body>
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/warehousePrint.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
       table,
@@ -239,7 +239,7 @@
     </div>
   </body>
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/weightCheck.html

@@ -1,103 +1,106 @@
 <!DOCTYPE html>
 <html>
-  <head>
+
+<head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
-      table,
-      table tr th,
-      table tr td {
-        border: 2px solid #333333;
-        padding: 5px 0;
-        height: 37px;
-      }
-      body{
-        margin: 0;
-      }
-
-      #app {
-        /* height: 98vh;
+        table,
+        table tr th,
+        table tr td {
+            border: 2px solid #333333;
+            padding: 5px 0;
+            height: 37px;
+        }
+        
+        body {
+            margin: 0;
+        }
+        
+        #app {
+            /* height: 98vh;
         position: relative; */
-      }
-
-      .content {
-        width: 1000px;
-        padding: 30px 20px 20px 20px;
-        font-size: 18px;
-        height: 570px;
-         position: relative;
-      }
-
-      .a5-content {
-        height: 130vh;
-      }
-
-      table {
-        width: 100%;
-        text-align: center;
-        border-collapse: collapse;
-        border: 3px solid #333333;
-      }
-
-      .col-bgc {
-        background: #f6f7fb;
-      }
-
-      .bottom-row1 {
-        display: flex;
-        /* justify-content: space-between; */
-        margin-top: 5px 0;
-      }
-
-      .bottom-row2 {
-        display: flex;
-      }
-
-      img,
-      .left {
-        width: 120px;
-        height: 120px;
-        position: absolute;
-           left: 12px;
-           top: 10px;
-      }
-
-      .config {
-        margin-top: 10px;
-        margin-right: 240px;
-      }
-
-      .autograph {
-        margin-top: 10px;
-        margin-right: 170px;
-      }
-
-      .bottom-row3 {
-        margin: 10px 0;
-      }
-
-      .title {
-        text-align: center;
-        font-size: 36px;
-        font-weight: 500;
-        position: relative;
-        /* margin-top: 47px; */
-      }
-
-      .number {
-        text-align: right;
-        margin-bottom: 10px;
-        margin-top: 30px;
-      }
-
-      .small-row {
-        display: flex;
-      }
-
-      .small-content {
-        width: 300px;
-        /* margin: 0 auto;
+        }
+        
+        .content {
+            width: 1000px;
+            padding: 30px 20px 20px 20px;
+            font-size: 18px;
+            height: 630px;
+            /* height: 570px; */
+            position: relative;
+        }
+        
+        .a5-content {
+            height: 130vh;
+        }
+        
+        table {
+            width: 100%;
+            text-align: center;
+            border-collapse: collapse;
+            border: 3px solid #333333;
+        }
+        
+        .col-bgc {
+            background: #f6f7fb;
+        }
+        
+        .bottom-row1 {
+            display: flex;
+            /* justify-content: space-between; */
+            margin-top: 5px 0;
+        }
+        
+        .bottom-row2 {
+            display: flex;
+        }
+        
+        img,
+        .left {
+            width: 120px;
+            height: 120px;
+            position: absolute;
+            left: 12px;
+            top: 10px;
+        }
+        
+        .config {
+            margin-top: 10px;
+            margin-right: 240px;
+        }
+        
+        .autograph {
+            margin-top: 10px;
+            margin-right: 170px;
+        }
+        
+        .bottom-row3 {
+            margin: 10px 0;
+        }
+        
+        .title {
+            text-align: center;
+            font-size: 36px;
+            font-weight: 500;
+            position: relative;
+            /* margin-top: 47px; */
+        }
+        
+        .number {
+            text-align: right;
+            margin-bottom: 10px;
+            margin-top: 30px;
+        }
+        
+        .small-row {
+            display: flex;
+        }
+        
+        .small-content {
+            width: 300px;
+            /* margin: 0 auto;
         border: 1px solid #ccc;
         padding: 20px 20px 160px 20px;
         position: absolute;
@@ -106,517 +109,523 @@
         left: 0;
         right: 0;
         margin: auto; */
-      }
-
-      .small-title {
-        text-align: center;
-        font-size: 18px;
-        /* display: flex; */
-        justify-content: space-between;
-        align-items: center;
-      }
-
-      .numberNo {
-        font-size: 36px;
-        margin: auto;
-      }
-
-      .small-row {
-        display: flex;
-        justify-content: space-between;
-        margin: 10px;
-      }
-
-      .small-img {
-        margin-right: 0;
-      }
-
-      .sign {
-        margin-right: 100px;
-      }
-
-      .small-code {
-        position: relative;
-        left: calc(50% - 55px)
-      }
+        }
+        
+        .small-title {
+            text-align: center;
+            font-size: 18px;
+            /* display: flex; */
+            justify-content: space-between;
+            align-items: center;
+        }
+        
+        .numberNo {
+            font-size: 36px;
+            margin: auto;
+        }
+        
+        .small-row {
+            display: flex;
+            justify-content: space-between;
+            margin: 10px;
+        }
+        
+        .small-img {
+            margin-right: 0;
+        }
+        
+        .sign {
+            margin-right: 100px;
+        }
+        
+        .small-code {
+            position: relative;
+            left: calc(50% - 55px)
+        }
     </style>
-  </head>
-  <body>
+</head>
+
+<body>
     <div id="app">
-      <div v-if="selectPrint">
-        <div v-for="(item,index) in tableData1" :key="index" v-if="!isDDPrint||isEWPrint">
-          <div class="content" :class="pageType=='A5'?'a5-content':''">
-            <!-- <div class="title">{{item.compName}}</div> -->
-            <div class="title">入库检斤单</div>
-            <div class="left">
-              <img :src="item.codeUrl" alt="">
-            </div>
-            <div class="number">{{item.number}}</div>
-            <table class="table">
-              <tr class="row">
-                <td class="col col-bgc">客户姓名</td>
-                <td class="col" colspan="2">{{item.customer}}</td>
-                <td class="col col-bgc">客户电话</td>
-                <td class="col">{{item.customerPhone}}</td>
-                <td class="col col-bgc">车牌号</td>
-                <td class="col" colspan="2">{{item.carNumber}}</td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">收货单位</td>
-                <td class="col" colspan="2">{{item.compName}}</td>
-                <td class="col col-bgc">联系人</td>
-                <td class="col">{{item.person}}</td>
-                <td class="col col-bgc">联系电话</td>
-                <td class="col" colspan="2">{{item.personPhone}}</td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">货名</td>
-                <td class="col">{{item.goodsName}}</td>
-                <td class="col col-bgc">类型</td>
-                <td class="col">{{item.type}}</td>
-                <td class="col col-bgc">容量（克/升）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
-                </td>
-                <td class="col col-bgc">不完善粒（%）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
-                </td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">等级</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
-                <td class="col col-bgc">水分（%）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
-                </td>
-                <td class="col col-bgc">热损伤（%）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
-                <td class="col col-bgc">质检时间</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}
-                </td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">杂质（%）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
-                <td class="col col-bgc">霉变粒（%）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
-                </td>
-                <td class="col col-bgc">扣杂</td>
-                <td class="col">
-                  {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
-                <td class="col " colspan="2"></td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">毛重（公斤）</td>
-                <td class="col">{{item.grossWeight}}</td>
-                <td class="col col-bgc">皮重（公斤）</td>
-                <td class="col">{{item.tare}}</td>
-                <td class="col col-bgc">扣重（公斤）</td>
-                <td class="col">{{item.buckleMiscellaneous}}</td>
-                <td class="col col-bgc">净重（公斤）</td>
-                <td class="col">{{item.netWeight}}</td>
-                <!-- <td class="col " colspan="2"></td> -->
+        <div v-if="selectPrint">
+            <div v-for="(item,index) in tableData1" :key="index" v-if="!isDDPrint||isEWPrint">
+                <div class="content" :class="pageType=='A5'?'a5-content':''">
+                    <!-- <div class="title">{{item.compName}}</div> -->
+                    <div class="title">入库检斤单</div>
+                    <div class="left">
+                        <img :src="item.codeUrl" alt="">
+                    </div>
+                    <div class="number">{{item.number}}</div>
+                    <table class="table">
+                        <tr class="row">
+                            <td class="col col-bgc">客户姓名</td>
+                            <td class="col" colspan="2">{{item.customer}}</td>
+                            <td class="col col-bgc">客户电话</td>
+                            <td class="col">{{item.customerPhone}}</td>
+                            <td class="col col-bgc">车牌号</td>
+                            <td class="col" colspan="2">{{item.carNumber}}</td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">收货单位</td>
+                            <td class="col" colspan="2">{{item.compName}}</td>
+                            <td class="col col-bgc">联系人</td>
+                            <td class="col">{{item.person}}</td>
+                            <td class="col col-bgc">联系电话</td>
+                            <td class="col" colspan="2">{{item.personPhone}}</td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">货名</td>
+                            <td class="col">{{item.goodsName}}</td>
+                            <td class="col col-bgc">类型</td>
+                            <td class="col">{{item.type}}</td>
+                            <td class="col col-bgc">容量（克/升）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+                            </td>
+                            <td class="col col-bgc">不完善粒（%）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+                            </td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">等级</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
+                            <td class="col col-bgc">水分（%）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
+                            </td>
+                            <td class="col col-bgc">热损伤（%）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
+                            <td class="col col-bgc">质检时间</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}
+                            </td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">杂质（%）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
+                            <td class="col col-bgc">霉变粒（%）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
+                            </td>
+                            <td class="col col-bgc">扣杂</td>
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
+                            <td class="col " colspan="2"></td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">毛重（公斤）</td>
+                            <td class="col">{{item.grossWeight}}</td>
+                            <td class="col col-bgc">皮重（公斤）</td>
+                            <td class="col">{{item.tare}}</td>
+                            <td class="col col-bgc">扣重（公斤）</td>
+                            <td class="col">{{item.buckleMiscellaneous}}</td>
+                            <td class="col col-bgc">净重（公斤）</td>
+                            <td class="col">{{item.netWeight}}</td>
+                            <!-- <td class="col " colspan="2"></td> -->
 
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc" colspan="2">毛重检斤时间</td>
-                <td class="col" colspan="2">{{item.grossDate}}</td>
-                <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-                <td class="col" colspan="2">{{item.tareDate}}</td>
-              </tr>
-            </table>
-            <div class="bottom">
-              <div class="bottom-row1">
-                <div>毛检：{{item.secretaryWeigher}}</div>
-                <div style="margin-left:60px">皮检：{{item.skinInspector}}</div>
-                <!-- <div>{{tableData.qualityDate}}</div> -->
-              </div>
-              <div class="bottom-row2">
-                <!-- <div class="left">
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                            <td class="col" colspan="2">{{item.grossDate}}</td>
+                            <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
+                            <td class="col" colspan="2">{{item.tareDate}}</td>
+                        </tr>
+                    </table>
+                    <div class="bottom">
+                        <div class="bottom-row1">
+                            <div>毛检：{{item.secretaryWeigher}}</div>
+                            <div style="margin-left:60px">皮检：{{item.skinInspector}}</div>
+                            <!-- <div>{{tableData.qualityDate}}</div> -->
+                        </div>
+                        <div class="bottom-row2">
+                            <!-- <div class="left">
                 <img :src="item.codeUrl" alt="">
               </div> -->
-                <div class="config">收货单位签名或盖章：</div>
-                <div class="autograph">客户签名：</div>
-                <div class="autograph">司机签名：</div>
-              </div>
-              <!-- <div class="bottom-row3">扫一扫</div> -->
-            </div>
-          </div>
-        </div>
-        <!-- 打印额外 -->
-        <div v-for="(item,index) in tableDataEW" :key="index" v-if="isDDPrint||isEWPrint">
-          <div class="content" :class="pageType=='A5'?'a5-content':''">
-            <!-- <div class="title">{{item.customer}}</div> -->
-            <div class="title">入库检斤单</div>
-            <div class="left">
-              <img :src="item.codeUrl" alt="">
+
+                            <div class="config" v-if="item.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
+                            <div class="config" v-if="item.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
+                            <div class="autograph">客户签名：</div>
+                            <div class="autograph" v-if="item.warehouseName!='白城补数据'">司机签名：</div>
+                        </div>
+                        <!-- <div class="bottom-row3">扫一扫</div> -->
+                    </div>
+                </div>
             </div>
-            <div class="number">{{item.number}}</div>
-            <table class="table">
-              <tr class="row">
-                <td class="col col-bgc" v-if="item.serviceManagementType == 3">客户姓名</td>
-                <td class="col" colspan="2" v-if="item.serviceManagementType == 3">{{item.customer}}</td>
-                <td class="col col-bgc" v-if="item.serviceManagementType == 1">发货单位</td>
-                <td class="col" colspan="2" v-if="item.serviceManagementType == 1">{{item.customer}}</td>
-                <td class="col col-bgc" v-if="item.serviceManagementType == 3">客户电话</td>
-                <td class="col" v-if="item.serviceManagementType == 3">{{item.customerPhone}}</td>
-                <td class="col col-bgc" v-if="item.serviceManagementType == 1">联系电话</td>
-                <td class="col" v-if="item.serviceManagementType == 1">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td>
-                <td class="col col-bgc">车牌号</td>
-                <td class="col" colspan="2">{{item.carNumber}}</td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">收货单位</td>
-                <td class="col" colspan="2">{{item.compName}}</td>
-                <td class="col col-bgc">联系人</td>
-                <td class="col">{{item.person}}</td>
-                <td class="col col-bgc">联系电话</td>
-                <td class="col" colspan="2">{{item.personPhone}}</td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">货名</td>
-                <td class="col">{{item.goodsName}}</td>
-                <td class="col col-bgc">类型</td>
-                <td class="col">{{item.type}}</td>
-                <td class="col col-bgc">容量（克/升）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
-                </td>
-                <td class="col col-bgc">不完善粒（%）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
-                </td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">等级</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
-                <td class="col col-bgc">水分（%）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
-                </td>
-                <td class="col col-bgc">热损伤（%）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
-                <td class="col col-bgc">质检时间</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}
-                </td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">杂质（%）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
-                <td class="col col-bgc">霉变粒（%）</td>
-                <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
-                </td>
-                <td class="col col-bgc">扣杂</td>
-                <td class="col">
-                  {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
-                <td class="col " colspan="2"></td>
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc">毛重（公斤）</td>
-                <td class="col">{{item.grossWeight}}</td>
-                <td class="col col-bgc">皮重（公斤）</td>
-                <td class="col">{{item.tare}}</td>
-                <td class="col col-bgc">扣重（公斤）</td>
-                <td class="col">{{item.buckleMiscellaneous}}</td>
-                <td class="col col-bgc">净重（公斤）</td>
-                <td class="col">{{item.netWeight}}</td>
-                <!-- <td class="col " colspan="2"></td> -->
+            <!-- 打印额外 -->
+            <div v-for="(item,index) in tableDataEW" :key="index" v-if="isDDPrint||isEWPrint">
+                <div class="content" :class="pageType=='A5'?'a5-content':''">
+                    <!-- <div class="title">{{item.customer}}</div> -->
+                    <div class="title">入库检斤单</div>
+                    <div class="left">
+                        <img :src="item.codeUrl" alt="">
+                    </div>
+                    <div class="number">{{item.number}}</div>
+                    <table class="table">
+                        <tr class="row">
+                            <td class="col col-bgc" v-if="item.serviceManagementType == 3">客户姓名</td>
+                            <td class="col" colspan="2" v-if="item.serviceManagementType == 3">{{item.customer}}</td>
+                            <td class="col col-bgc" v-if="item.serviceManagementType == 1">发货单位</td>
+                            <td class="col" colspan="2" v-if="item.serviceManagementType == 1">{{item.customer}}</td>
+                            <td class="col col-bgc" v-if="item.serviceManagementType == 3">客户电话</td>
+                            <td class="col" v-if="item.serviceManagementType == 3">{{item.customerPhone}}</td>
+                            <td class="col col-bgc" v-if="item.serviceManagementType == 1">联系电话</td>
+                            <td class="col" v-if="item.serviceManagementType == 1">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td>
+                            <td class="col col-bgc">车牌号</td>
+                            <td class="col" colspan="2">{{item.carNumber}}</td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">收货单位</td>
+                            <td class="col" colspan="2">{{item.compName}}</td>
+                            <td class="col col-bgc">联系人</td>
+                            <td class="col">{{item.person}}</td>
+                            <td class="col col-bgc">联系电话</td>
+                            <td class="col" colspan="2">{{item.personPhone}}</td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">货名</td>
+                            <td class="col">{{item.goodsName}}</td>
+                            <td class="col col-bgc">类型</td>
+                            <td class="col">{{item.type}}</td>
+                            <td class="col col-bgc">容量（克/升）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+                            </td>
+                            <td class="col col-bgc">不完善粒（%）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+                            </td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">等级</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
+                            <td class="col col-bgc">水分（%）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
+                            </td>
+                            <td class="col col-bgc">热损伤（%）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
+                            <td class="col col-bgc">质检时间</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}
+                            </td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">杂质（%）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
+                            <td class="col col-bgc">霉变粒（%）</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
+                            </td>
+                            <td class="col col-bgc">扣杂</td>
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
+                            <td class="col " colspan="2"></td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">毛重（公斤）</td>
+                            <td class="col">{{item.grossWeight}}</td>
+                            <td class="col col-bgc">皮重（公斤）</td>
+                            <td class="col">{{item.tare}}</td>
+                            <td class="col col-bgc">扣重（公斤）</td>
+                            <td class="col">{{item.buckleMiscellaneous}}</td>
+                            <td class="col col-bgc">净重（公斤）</td>
+                            <td class="col">{{item.netWeight}}</td>
+                            <!-- <td class="col " colspan="2"></td> -->
 
-              </tr>
-              <tr class="row">
-                <td class="col col-bgc" colspan="2">毛重检斤时间</td>
-                <td class="col" colspan="2">{{item.grossDate}}</td>
-                <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-                <td class="col" colspan="2">{{item.tareDate}}</td>
-              </tr>
-            </table>
-            <div class="bottom">
-              <div class="bottom-row1">
-                <div>毛检：{{item.secretaryWeigher}}</div>
-                <div style="margin-left:60px">皮检：{{item.skinInspector}}</div>
-                <!-- <div>{{tableData.qualityDate}}</div> -->
-              </div>
-              <div class="bottom-row2">
-                <!-- <div class="left">
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                            <td class="col" colspan="2">{{item.grossDate}}</td>
+                            <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
+                            <td class="col" colspan="2">{{item.tareDate}}</td>
+                        </tr>
+                    </table>
+                    <div class="bottom">
+                        <div class="bottom-row1">
+                            <div>毛检：{{item.secretaryWeigher}}</div>
+                            <div style="margin-left:60px">皮检：{{item.skinInspector}}</div>
+                            <!-- <div>{{tableData.qualityDate}}</div> -->
+                        </div>
+                        <div class="bottom-row2">
+                            <!-- <div class="left">
                 <img :src="item.codeUrl" alt="">
               </div> -->
-                <div class="config">收货单位签名或盖章：</div>
-                <div class="autograph">客户签名：</div>
-                <div class="autograph">司机签名：</div>
-              </div>
-              <!-- <div class="bottom-row3">扫一扫</div> -->
+                            <div class="config" v-if="item.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
+                            <div class="config" v-if="item.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
+                            <div class="autograph">客户签名：</div>
+                            <div class="autograph" v-if="item.warehouseName!='白城补数据'">司机签名：</div>
+                        </div>
+                        <!-- <div class="bottom-row3">扫一扫</div> -->
+                    </div>
+                </div>
             </div>
-          </div>
         </div>
-      </div>
-      <div v-else>
-        <div class="content" v-if="bigContent" v-for="(_item,index) in tableData ">
-          <!-- <div class="title">{{_item.compName}}</div> -->
-          <div class="title">入库检斤单</div>
-          <div class="left">
-            <img :src="_item.codeUrl" alt="">
-          </div>
-          <div class="number">{{_item.number}}</div>
-          <table class="table">
-            <tr class="row">
-              <td class="col col-bgc" v-if="_item.serviceManagementType == 3">客户姓名</td>
-              <td class="col" colspan="2" v-if="_item.serviceManagementType == 3">{{_item.customer}}</td>
-              <td class="col col-bgc" v-if="_item.serviceManagementType == 1">发货单位</td>
-              <td class="col" colspan="2" v-if="_item.serviceManagementType == 1">{{_item.customer}}</td>
-              <td class="col col-bgc" v-if="_item.serviceManagementType == 3">客户电话</td>
-              <td class="col" v-if="_item.serviceManagementType == 3">{{_item.customerPhone}}</td>
-              <td class="col col-bgc" v-if="_item.serviceManagementType == 1">联系电话</td>
-              <td class="col" v-if="_item.serviceManagementType == 1">{{_item.contractManagement ? _item.contractManagement.sellerPhone : ""}}</td>
-              <td class="col col-bgc">车牌号</td>
-              <td class="col" colspan="2">{{_item.carNumber}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc">收货单位</td>
-              <td class="col" colspan="2">{{_item.compName}}</td>
-              <td class="col col-bgc">联系人</td>
-              <td class="col">{{_item.person}}</td>
-              <td class="col col-bgc">联系电话</td>
-              <td class="col" colspan="2">{{_item.personPhone}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc">货名</td>
-              <td class="col">{{_item.goodsName}}</td>
-              <td class="col col-bgc">类型</td>
-              <td class="col">{{_item.type}}</td>
-              <td class="col col-bgc">容量（克/升）</td>
-              <td class="col">
-                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}</td>
-              <td class="col col-bgc">不完善粒（%）</td>
-              <td class="col">
-                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc">等级</td>
-              <td class="col">{{_item.qualityInspectionManagement?_item.qualityInspectionManagement.grade:''}}
-              </td>
-              <td class="col col-bgc">水分（%）</td>
-              <td class="col">
-                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.waterContent:''}}</td>
-              <td class="col col-bgc">热损伤（%）</td>
-              <td class="col">
-                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.jiaorenli:''}}</td>
-              <td class="col col-bgc">质检时间</td>
-              <td class="col">
-                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.qualityDate:''}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc">杂质（%）</td>
-              <td class="col">
-                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.impurity:''}}</td>
-              <td class="col col-bgc">霉变粒（%）</td>
-              <td class="col">
-                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.mildewGrain:''}}</td>
-              <td class="col col-bgc">扣杂</td>
-              <td class="col">
-                {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.buckleMiscellaneous:''}}
-              </td>
-              <td class="col " colspan="2"></td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc">毛重（公斤）</td>
-              <td class="col">{{_item.grossWeight}}</td>
-              <td class="col col-bgc">皮重（公斤）</td>
-              <td class="col">{{_item.tare}}</td>
-              <td class="col col-bgc">扣重（公斤）</td>
-              <td class="col">{{_item.buckleMiscellaneous}}</td>
-              <td class="col col-bgc">净重（公斤）</td>
-              <td class="col">{{_item.netWeight}}</td>
-              <td class="col " colspan="2"></td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc" colspan="2">毛重检斤时间</td>
-              <td class="col" colspan="2">{{_item.grossDate}}</td>
-              <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-              <td class="col" colspan="2">{{_item.tareDate}}</td>
-            </tr>
-          </table>
-          <div class="bottom">
-            <div class="bottom-row1">
-              <div>毛检：{{_item.secretaryWeigher}}</div>
-              <div style="margin-left:60px">皮检：{{_item.skinInspector}}</div>
-              <!-- <div>{{tableData.qualityDate}}</div> -->
-            </div>
-            <div class="bottom-row2">
-              <!-- <div class="left">
+        <div v-else>
+            <div class="content" v-if="bigContent" v-for="(_item,index) in tableData ">
+                <!-- <div class="title">{{_item.compName}}</div> -->
+                <div class="title">入库检斤单</div>
+                <div class="left">
+                    <img :src="_item.codeUrl" alt="">
+                </div>
+                <div class="number">{{_item.number}}</div>
+                <table class="table">
+                    <tr class="row">
+                        <td class="col col-bgc" v-if="_item.serviceManagementType == 3">客户姓名</td>
+                        <td class="col" colspan="2" v-if="_item.serviceManagementType == 3">{{_item.customer}}</td>
+                        <td class="col col-bgc" v-if="_item.serviceManagementType == 1">发货单位</td>
+                        <td class="col" colspan="2" v-if="_item.serviceManagementType == 1">{{_item.customer}}</td>
+                        <td class="col col-bgc" v-if="_item.serviceManagementType == 3">客户电话</td>
+                        <td class="col" v-if="_item.serviceManagementType == 3">{{_item.customerPhone}}</td>
+                        <td class="col col-bgc" v-if="_item.serviceManagementType == 1">联系电话</td>
+                        <td class="col" v-if="_item.serviceManagementType == 1">{{_item.contractManagement ? _item.contractManagement.sellerPhone : ""}}</td>
+                        <td class="col col-bgc">车牌号</td>
+                        <td class="col" colspan="2">{{_item.carNumber}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">收货单位</td>
+                        <td class="col" colspan="2">{{_item.compName}}</td>
+                        <td class="col col-bgc">联系人</td>
+                        <td class="col">{{_item.person}}</td>
+                        <td class="col col-bgc">联系电话</td>
+                        <td class="col" colspan="2">{{_item.personPhone}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">货名</td>
+                        <td class="col">{{_item.goodsName}}</td>
+                        <td class="col col-bgc">类型</td>
+                        <td class="col">{{_item.type}}</td>
+                        <td class="col col-bgc">容量（克/升）</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}</td>
+                        <td class="col col-bgc">不完善粒（%）</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">等级</td>
+                        <td class="col">{{_item.qualityInspectionManagement?_item.qualityInspectionManagement.grade:''}}
+                        </td>
+                        <td class="col col-bgc">水分（%）</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.waterContent:''}}</td>
+                        <td class="col col-bgc">热损伤（%）</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.jiaorenli:''}}</td>
+                        <td class="col col-bgc">质检时间</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.qualityDate:''}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">杂质（%）</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.impurity:''}}</td>
+                        <td class="col col-bgc">霉变粒（%）</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.mildewGrain:''}}</td>
+                        <td class="col col-bgc">扣杂</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.buckleMiscellaneous:''}}
+                        </td>
+                        <td class="col " colspan="2"></td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">毛重（公斤）</td>
+                        <td class="col">{{_item.grossWeight}}</td>
+                        <td class="col col-bgc">皮重（公斤）</td>
+                        <td class="col">{{_item.tare}}</td>
+                        <td class="col col-bgc">扣重（公斤）</td>
+                        <td class="col">{{_item.buckleMiscellaneous}}</td>
+                        <td class="col col-bgc">净重（公斤）</td>
+                        <td class="col">{{_item.netWeight}}</td>
+                        <td class="col " colspan="2"></td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                        <td class="col" colspan="2">{{_item.grossDate}}</td>
+                        <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
+                        <td class="col" colspan="2">{{_item.tareDate}}</td>
+                    </tr>
+                </table>
+                <div class="bottom">
+                    <div class="bottom-row1">
+                        <div>毛检：{{_item.secretaryWeigher}}</div>
+                        <div style="margin-left:60px">皮检：{{_item.skinInspector}}</div>
+                        <!-- <div>{{tableData.qualityDate}}</div> -->
+                    </div>
+                    <div class="bottom-row2">
+                        <!-- <div class="left">
                 <img :src="tableData.codeUrl" alt="">
               </div> -->
-              <div class="config">收货单位签名或盖章：</div>
-              <div class="autograph">客户签名：</div>
-              <div class="autograph">司机签名：</div>
+
+                        <div class="config" v-if="_item.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
+                        <div class="config" v-if="_item.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
+                        <div class="autograph">客户签名：</div>
+                        <div class="autograph" v-if="_item.warehouseName!='白城补数据'">司机签名：</div>
+                    </div>
+                    <!-- <div class="bottom-row3">扫一扫</div> -->
+                </div>
             </div>
-            <!-- <div class="bottom-row3">扫一扫</div> -->
-          </div>
         </div>
-      </div>
 
-      <div class="small-content" v-if="smallContent">
-        <div class="small-title">
-          <div class="numberNo">{{tableData.number.substring(tableData.number.length - 3)}}</div>
-          <div style="margin: auto;">粮食检斤单</div>
-        </div>
-        <img :src="tableData.codeUrl" alt="" class="small-code">
-        <div class="small-row">
-          <div>业务编号</div>
-          <div>{{tableData.number}}</div>
-        </div>
-        <div class="small-row" v-if="tableData.serviceManagementType == 3">
-          <div>客户姓名</div>
-          <div>{{tableData.customer}}</div>
-        </div>
-        <div class="small-row" v-if="tableData.serviceManagementType == 3">
-          <div>客户电话</div>
-          <div>{{tableData.customerPhone}}</div>
-        </div>
-        <div class="small-row" v-if="tableData.serviceManagementType == 1">
-          <div>发货单位</div>
-          <div>{{tableData.contractManagement ? tableData.contractManagement.seller : ""}}</div>
-        </div>
-        <div class="small-row" v-if="tableData.serviceManagementType == 1">
-          <div>联系电话</div>
-          <div>{{tableData.contractManagement ? tableData.contractManagement.sellerPhone : ""}}</div>
-        </div>
-        <div class="small-row">
-          <div>车牌号</div>
-          <div>{{tableData.carNumber}}</div>
-        </div>
-        <div class="small-row">
-          <div>仓位号：</div>
-          <div>{{tableData.binNumber}}</div>
-        </div>
-        <div class="small-row">
-          <div>收货单位</div>
-          <div>{{tableData.compName}}</div>
-        </div>
-        <div class="small-row">
-          <div>联系人</div>
-          <div>{{tableData.person}}</div>
-        </div>
-        <div class="small-row">
-          <div>联系电话</div>
-          <div>{{tableData.personPhone}}</div>
-        </div>
-        <div class="small-row">
-          <div>货名</div>
-          <div>{{tableData.goodsName}}</div>
-        </div>
-        <div class="small-row">
-          <div>类型</div>
-          <div>{{tableData.type}}</div>
-        </div>
-        <div class="small-row">
-          <div>毛重（公斤）</div>
-          <div>{{tableData.grossWeight}}</div>
-        </div>
-        <div class="small-row">
-          <div>毛检时间</div>
-          <div>{{tableData.grossDate}}</div>
-        </div>
-        <div class="small-row">
-          <div>皮重（公斤）</div>
-          <div>{{tableData.tare}}</div>
-        </div>
-        <div class="small-row">
-          <div>皮检时间</div>
-          <div>{{tableData.tareDate}}</div>
-        </div>
-        <div class="small-row" v-if="tableData.qualityInspectionManagement.paramType == 2 || tableData.serviceManagementType == 1">
-          <div>扣重（公斤）</div>
-          <div>{{tableData.buckleMiscellaneous}}</div>
-        </div>
-        <div class="small-row">
-          <div>净重（公斤）</div>
-          <div>{{tableData.netWeight}}</div>
-        </div>
-        <div class="small-row">
-          <div>收货单位签名或盖章:</div>
+        <div class="small-content" v-if="smallContent">
+            <div class="small-title">
+                <div class="numberNo">{{tableData.number.substring(tableData.number.length - 3)}}</div>
+                <div style="margin: auto;">粮食检斤单</div>
+            </div>
+            <img :src="tableData.codeUrl" alt="" class="small-code">
+            <div class="small-row">
+                <div>业务编号</div>
+                <div>{{tableData.number}}</div>
+            </div>
+            <div class="small-row" v-if="tableData.serviceManagementType == 3">
+                <div>客户姓名</div>
+                <div>{{tableData.customer}}</div>
+            </div>
+            <div class="small-row" v-if="tableData.serviceManagementType == 3">
+                <div>客户电话</div>
+                <div>{{tableData.customerPhone}}</div>
+            </div>
+            <div class="small-row" v-if="tableData.serviceManagementType == 1">
+                <div>发货单位</div>
+                <div>{{tableData.contractManagement ? tableData.contractManagement.seller : ""}}</div>
+            </div>
+            <div class="small-row" v-if="tableData.serviceManagementType == 1">
+                <div>联系电话</div>
+                <div>{{tableData.contractManagement ? tableData.contractManagement.sellerPhone : ""}}</div>
+            </div>
+            <div class="small-row">
+                <div>车牌号</div>
+                <div>{{tableData.carNumber}}</div>
+            </div>
+            <div class="small-row">
+                <div>仓位号：</div>
+                <div>{{tableData.binNumber}}</div>
+            </div>
+            <div class="small-row">
+                <div>收货单位</div>
+                <div>{{tableData.compName}}</div>
+            </div>
+            <div class="small-row">
+                <div>联系人</div>
+                <div>{{tableData.person}}</div>
+            </div>
+            <div class="small-row">
+                <div>联系电话</div>
+                <div>{{tableData.personPhone}}</div>
+            </div>
+            <div class="small-row">
+                <div>货名</div>
+                <div>{{tableData.goodsName}}</div>
+            </div>
+            <div class="small-row">
+                <div>类型</div>
+                <div>{{tableData.type}}</div>
+            </div>
+            <div class="small-row">
+                <div>毛重（公斤）</div>
+                <div>{{tableData.grossWeight}}</div>
+            </div>
+            <div class="small-row">
+                <div>毛检时间</div>
+                <div>{{tableData.grossDate}}</div>
+            </div>
+            <div class="small-row">
+                <div>皮重（公斤）</div>
+                <div>{{tableData.tare}}</div>
+            </div>
+            <div class="small-row">
+                <div>皮检时间</div>
+                <div>{{tableData.tareDate}}</div>
+            </div>
+            <div class="small-row" v-if="tableData.qualityInspectionManagement.paramType == 2 || tableData.serviceManagementType == 1">
+                <div>扣重（公斤）</div>
+                <div>{{tableData.buckleMiscellaneous}}</div>
+            </div>
+            <div class="small-row">
+                <div>净重（公斤）</div>
+                <div>{{tableData.netWeight}}</div>
+            </div>
+            <div class="small-row">
+                <div>收货单位签名或盖章:</div>
+            </div>
         </div>
-      </div>
     </div>
-  </body>
-  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
-  <script type="text/javascript">
+</body>
+<script src="../cdn/vue/2.6.10/vue.min.js"></script>
+<script src="../cdn/element-ui/2.13.2/index.js"></script>
+<script type="text/javascript">
     new Vue({
-      el: '#app',
-      data: {
-        tableData: {
-          // qualityInspectionManagement:{}
+        el: '#app',
+        data: {
+            tableData: {
+                // qualityInspectionManagement:{}
+            },
+            tableData1: [],
+            tableDataEW: [],
+            selectPrint: false,
+            name: "",
+            bigContent: false,
+            smallContent: false,
+            pageType: '',
+            isDDPrint: false,
+            isEWPrint: false,
         },
-        tableData1: [],
-        tableDataEW: [],
-        selectPrint: false,
-        name: "",
-        bigContent: false,
-        smallContent: false,
-        pageType: '',
-        isDDPrint:false,
-         isEWPrint:false,
-      },
-      computed: {},
-      methods: {
-        tableRowClassName({
-          row,
-          rowIndex
-        }) {
-          if (rowIndex === 1) {
-            return 'warning-row';
-          } else if (rowIndex === 3) {
-            return 'success-row';
-          }
-          return '';
+        computed: {},
+        methods: {
+            tableRowClassName({
+                row,
+                rowIndex
+            }) {
+                if (rowIndex === 1) {
+                    return 'warning-row';
+                } else if (rowIndex === 3) {
+                    return 'success-row';
+                }
+                return '';
+            },
+            getQueryVariable(variable) {
+                var query = window.location.search.substring(1);
+                var vars = query.split("&");
+                for (var i = 0; i < vars.length; i++) {
+                    var pair = vars[i].split("=");
+                    if (pair[0] == variable) {
+                        return pair[1];
+                    }
+                }
+                return (false);
+            },
+            printSmall() {},
+            printBig() {},
         },
-        getQueryVariable(variable) {
-          var query = window.location.search.substring(1);
-          var vars = query.split("&");
-          for (var i = 0; i < vars.length; i++) {
-            var pair = vars[i].split("=");
-            if (pair[0] == variable) {
-              return pair[1];
+        mounted() {
+            let _data = decodeURIComponent(this.getQueryVariable("tableData"))
+            let _type = this.getQueryVariable("type")
+            let _ew = this.getQueryVariable("selectEW")
+            let _ewdd = this.getQueryVariable("selectEWDD")
+            this.pageType = this.getQueryVariable("radioType")
+            if (_type == 2) {
+                this.bigContent = true
+                this.smallContent = false
+            } else {
+                this.smallContent = true
+                this.bigContent = false
             }
-          }
-          return (false);
-        },
-        printSmall() {},
-        printBig() {},
-      },
-      mounted() {
-        let _data = decodeURIComponent(this.getQueryVariable("tableData"))
-        let _type = decodeURIComponent(this.getQueryVariable("type"))
-        let _ew = decodeURIComponent(this.getQueryVariable("selectEW"))
-        let _ewdd = decodeURIComponent(this.getQueryVariable("selectEWDD"))
-        this.pageType = decodeURIComponent(this.getQueryVariable("radioType"))
-        if (_type == 2) {
-          this.bigContent = true
-          this.smallContent = false
-        } else {
-          this.smallContent = true
-          this.bigContent = false
-        }
-        if (_data == 'false') {
-          this.selectPrint = true;
-          this.tableData1 = JSON.parse(localStorage.getItem('selectPrint_jjSelectPrintList'))
-          if(_ew== 'true'){
-             this.tableDataEW = JSON.parse(localStorage.getItem('selectPrint_EWjjSelectPrintList'))
-               this.isEWPrint = true
-          }
-          if(_ewdd== 'true'){
-             this.tableDataEW = JSON.parse(localStorage.getItem('selectPrint_EWjjSelectPrintList'))
-            this.isDDPrint = true
-          }
-        } else {
-          this.tableData = JSON.parse(_data)
-        }
-        // sessionStorage.setItem('record_print', JSON.stringify(response))
-        // this.tableData = JSON.parse(sessionStorage.getItem("record_print"))
+            if (_data == 'false') {
+                this.selectPrint = true;
+                this.tableData1 = JSON.parse(localStorage.getItem('selectPrint_jjSelectPrintList'))
+                if (_ew == 'true') {
+                    this.tableDataEW = JSON.parse(localStorage.getItem('selectPrint_EWjjSelectPrintList'))
+                    this.isEWPrint = true
+                }
+                if (_ewdd == 'true') {
+                    this.tableDataEW = JSON.parse(localStorage.getItem('selectPrint_EWjjSelectPrintList'))
+                    this.isDDPrint = true
+                }
+            } else {
+                this.tableData = JSON.parse(_data.replace(/baifenhao/g, '%'))
+            }
+            // sessionStorage.setItem('record_print', JSON.stringify(response))
+            // this.tableData = JSON.parse(sessionStorage.getItem("record_print"))
 
-        document.title = "粮食检斤单"
-        window.print()
-        window.onafterprint = function(event) {
-          window.history.back(-1)
-        };
-      },
-      watch: {}
+            document.title = "粮食检斤单"
+            window.print()
+            window.onafterprint = function(event) {
+                window.history.back(-1)
+            };
+        },
+        watch: {}
     })
-  </script>
+</script>
 
-</html>
+</html>

public/static/weightCheckInOut.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
       table,
@@ -184,7 +184,7 @@
     </div>
   </body>
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/weightCheckOut.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
       table,
@@ -185,7 +185,7 @@
     </div>
   </body>
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

public/static/weightChecknew.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
     <title></title>
     <style>
       table,
@@ -409,8 +409,8 @@
       </div>
     </div>
   </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+  <script src="../cdn/vue/2.6.10/vue.min.js"></script>
+  <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
     new Vue({
       el: '#app',

src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view v-if="isRouterAlive"/>
     <ws-common-loading v-if="isLoadding"></ws-common-loading>
     <!-- <rookie-training v-if="roles && roles.length"></rookie-training> -->
   </div>

src/api/V2/charts/index.js

@@ -1,2 +1,4 @@
 
-export const API_GET_GETCHARTSDATA = `/biInfoController/selectBiInfo`
+// export const API_GET_GETCHARTSDATA = `/biInfoController/selectBiInfo`
+export const API_GET_GETCHARTSDATA = `/biInfoController/selectBiInfoNew`
+export const API_GET_CLEARCACHE = `/biInfoController/clearCache`

src/api/V2/houseSelfCollect/index.js

@@ -106,5 +106,14 @@ export const API_POST_WORKFLOW_TASK = `/newWorkflow/getTaskWebsocket`
 export const API_POST_SUSPENDINSTANCE ='/paymentManagement/api/ReSettlement'
 //导入
 export const API_POST_IMPORT ='/qualityInspectionManagement/api/importQuality'
+//导入移库
+export const API_POST_IMPORT_YK ='/weighingManagement/api/importWeighing'
 // 结算单
 export const API_GET_SETTLEACCOUT = '/warehouseInOutInfo/getInfo'
+// 退回
+export const API_POST_RETURN= '/weighingManagement/weightReturn'
+// 新检斤保存
+export const API_POST_SUBMIT= '/warehouseInOutInfo/api/newInOutWarehouse'
+// 换仓
+export const API_POST_CHANE_NO = `/weighingManagement/api/changeWarehouse`
+

src/api/V2/outboundManagement/index.js

@@ -36,3 +36,18 @@ export const API_POST_COLLECTION_MONEY = '/paymentManagement/api/collectMoney'
 export const API_POST_COLLECTION_EDITCOLLECT = '/paymentManagement/api/editCollect'
 // 添加备注
 export const API_POST_COLLECTION_ADDREMARKS = '/paymentManagement/api/addRemarks'
+// 新检斤保存
+export const API_POST_NEW_SUBMIT = '/warehouseInOutInfo/api/newInOutWarehouse'
+// 换仓
+export const API_POST_CHANE_NO = `/weighingManagement/api/changeWarehouse`
+// 退回
+export const API_POST_GO_BACK = `/weighingManagement/api/outWeightReturn`
+//导入销售出库
+export const API_POST_IMPORT_SALE ='/weighingManagement/api/importWeighingOut'
+//导入移库出库
+export const API_POST_IMPORT_YK ='/weighingManagement/api/importWeighingMoveOut'
+//出库类型查询
+export const API_GAT_INFO = '/commonSysParameter/getInfo'
+// 是否创建运输任务
+export const API_GET_TRANTASK ='/inOutWarehouseTask/tranTaskCount'
+

src/api/V2/profitable/index.js

@@ -15,4 +15,56 @@ export const API_GET_LOOKINFO = '/nonContractExpenses/getInfo'
 //审核
 export const API_POST_WORKFLOW_API_HANDLE = '/workflow/api/handle'
 //审核记录
-export const API_POST_AUDITRECORD = '/billOperateHis/query/commonBillOperateHis'
+export const API_POST_AUDITRECORD = '/billOperateHis/query/commonBillOperateHis'
+//仓库
+export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouse'
+// 费用管理提交
+export const API_POST_SUBMIT = '/feeDetailsInfo/submit'
+// 费用管理查看
+export const API_GET_LOOK = '/feeDetailsInfo/selectInfo'
+// 费用管理付款，确认付款
+export const API_POST_SUBMITPAY = '/feeDetailsInfo/submitPay'
+// 费用管理编辑 、 收款、付款
+export const API_POST_SHOUGUAN = '/feeDetailsInfo/payShou'
+//合同编号下拉
+export const API_GET_WAREHOUSE_NO = '/warehouseBaseInfo/selectContractNoList'
+// 费用管理详情列表
+export const API_GET_EXPENSEINFO = '/expenseInfo/selectInfo'
+// 费用管理请款收款
+export const API_SET_EXPENSEINFO = '/expenseInfo/api/addInfo'
+// 获取仓库的入库单
+export const API_GET_SELECTWAREHOUSINGORDER ='/expenseInfo/selectWarehousingOrder'
+// 费用管理编辑、分配、完成、确认收款、确认分配
+export const API_EDIT_EXPENSEINFO ='/expenseInfo/editInfo'
+// 费用管理查看
+export const API_LOOK_EXPENSEINFO ='/expenseInfo/ExpenseInfo'
+// 费用管理删除
+export const API_DEL_EXPENSEINFO ='/expenseInfo/deleteInfo'
+// 费用管理分配删除
+export const API_DEL_ALLOCATIONINFO ='/expenseInfo/deleteAllocationInfo'
+// 费用管理分配编辑单条删除
+export const API_DEL_ONE_ALLOCATIONINFO ='/expenseAllocationInfo/deleteInfo'
+// 费用管理付款
+export const API_PAYMNET ='/expenseInfo/payment'
+// 合同费用，库点费用
+export const API_GET_CONTRACTEXPENSEINFO ='/contractExpensesInfo/selectContractExpensesInfo'
+// 合同库存、收购库存
+export const API_GET_INVENTORYINFO ='/contractInventoryDistribution/selectContractInventoryInfo'
+// 合同利润详情
+export const API_GET_CONTRACTDETAILS ='/contractManagementInfo/selectContractInfo'
+// 合同利润图表
+export const API_GET_CONTRACTCHART  ='/contractManagementInfo/selectContractChart'
+// 库点利润详情
+export const API_GET_WAREHOUSETAILS ='/warehouseBaseInfo/selectBaseInfo'
+// 库点利润图表
+export const API_GET_WAREHOUSECHART  ='/warehouseBaseInfo/selectWarehouseChart'
+// 费用管理图表
+export const API_EXPENSECHAT ='/expenseInfo/expenseChart'
+// 费用管理收支表
+export const API_EXPENSECHATLIST ='/expenseInfo/expenseList'
+// 当天提交的费用条数
+export const API_EXPENSECOUNT ='/expenseInfo/api/expenseCount'
+// 采购账户信息
+export const API_PAYEEINFO ='/customerInfo/getPayeeInfo'
+// 收购账户信息
+export const API_BUYPAYEEINFO ='/identityAuthenticationInfo/getPayeeInfo'

src/api/V2/taskspost/index.js

@@ -49,3 +49,13 @@ export const API_POST_DEL_HAULAGE_STAGE= '/tranProcessInfo/api/deleteTranProcess
 export const API_GET_TASKHISTORIES= '/workflowHistory/query/taskHistories'
 // 获取发货人
 export const API_GET_STAFF = '/staff/query/getStaffListByCompId'
+// 货源提交
+export const API_EDIT_SOURCEOFGOODS = '/warehousingOrder/editSourceOfGoods'
+// 货源查看
+export const API_GET_SOURCEGOOD = 'warehousingOrder/getSourceOfGoodsList'
+// 退库货源列表
+export const API_GET_SOURCEOFGOODS = '/warehousingOrder/getSourceOfGoodsList'
+// 矫正
+export const API_SET_CORRECT= '/inOutWarehouseTask/api/correct'
+// 出库货源列表
+export const API_GET_GOODSOURCEINFO= '/warehousingOrder/selectGoodSourceInfo'

src/api/V2/warehouse/index.js

@@ -11,7 +11,6 @@ export const API_POST_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse
 export const API_GET_WAREHOUSE_DELETELIST = '/warehouseBaseInfo/selectAllWarehouse'
 //隐藏
 export const API_POST_WAREHOUSE_HIDE = '/warehouseBaseInfo/api/editShow'
-
 export const API_GET_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
 
 //仓库编辑
@@ -84,6 +83,8 @@ export const API_GET_RECEIPTTASKNO = '/inOutWarehouseTask/selectInOutWarehouseNo
 export const API_POST_EXPORT = '/warehouseBaseInfo/export'
 //导出出库
 export const API_POST_EXPORTOUT = '/warehouseBaseInfo/exportOut'
+//导出历史库存记录
+export const API_POST_EXPORTHISTORICALINVENTORY = '/historicalInventoryInfo/exportHistoricalInventory'
 //打印增量
 export const API_GET_PRINT = '/commonConstantFalse/getInfo'
 // 仓位号
@@ -108,4 +109,17 @@ export const API_GET_WAREHOUSE_ALL = '/warehouseBaseInfo/allWarehouse'
 export const API_SEND_BACK ='/warehouseInOutInfo/returnWarehouse'
 //删除
 export const API_DELETE_WAREHOUSE ='/warehouseInOutInfo/api/deleteWarehouse'
-
+//查看自己负责的仓库
+export const API_GET_WAREHOUSENAME='/warehouseBaseInfo/selectWarehouseSelf'
+// 入库单列表
+export const API_GET_WAREHOUSINGORDER = '/warehousingOrder/selectInfo'
+// 盘盈、盘亏
+export const API_EDIT_WAREHOUSINGORDER = '/warehousingOrder/editInfo'
+//请款、收款
+export const API_SET_PAYMONEY = 'warehousingOrder/api/payMoney'
+// //费用详情
+// export const API_GET_EXPENSEINFO = '/expenseInfo/selectInfo'z
+//审核
+export const API_WORKFLOWHANDLE ='/newWorkflow/api/handle'
+//查看可分配金额
+export const API_GET_EXPENSE='/expenseAllocationInfo/getExpenseAllocationInfo'

src/common.js

@@ -1,10 +1,35 @@
-
-   const houseName= [{ payname: "" },{ payname: "" },{ payname: "" },{ payname: "" }]
-   let commonWeighingList = []
-   const name = ''
+const houseName = [{ payname: '' }, { payname: '' }, { payname: '' }, { payname: '' }]
+let commonWeighingList = []
+const name = ''
+let setBrowserSecurityUrl = (key) => {
+    const encodeArr = [{
+        code: '%',
+        encode: '%25'
+    }, {
+        code: '?',
+        encode: '%3F'
+    }, {
+        code: '#',
+        encode: '%23'
+    }, {
+        code: '&',
+        encode: '%26'
+    }, {
+        code: '=',
+        encode: '%3D'
+    }];
+    return key.replace(/[%?#&=]/g, ($, index, str) => {
+        for (const k of encodeArr) {
+            if (k.code === $) {
+                return k.encode;
+            }
+        }
+    });
+}
 
 export default {
     houseName,
     commonWeighingList,
-    name
+    name,
+    setBrowserSecurityUrl
 }

src/components/WsUpload/index.vue

@@ -19,8 +19,13 @@
         @click="_handleUploadClick"
         >{{ buttonName ? buttonName : $t('upload.uploadButton') }}</el-button
       >
+      <!-- <el-tooltip class="item" effect="dark" :content="$t('upload.uploadText01')+formatTxt+'格式的文件，单个文件大小不能超过10M'" placement="top">
+        <i class="el-icon-question"></i>
+      </el-tooltip> -->
+      
       <div class="tip">
-        {{ $t('upload.uploadText01') }}{{ formatTxt }}
+        {{ $t('upload.uploadText01') }}
+        {{  formatTxt}}
         格式的文件，单个文件大小不能超过10M
       </div>
     </div>
@@ -39,11 +44,14 @@
       </template>
       <template v-slot:file="{ file }">
         <div class="thumbnail-group">
-          <img
+          <img 
+          v-if='getFileClass(file)=="ext png"||getFileClass(file)=="ext jpg"||getFileClass(file)=="ext jpeg"'
           :src='file.url'
             class="el-upload-list__item-thumbnail"
             :class="getFileClass(file)"
           />
+          <div v-else class="el-upload-list__item-thumbnail"
+            :class="getFileClass(file)"></div>
         </div>
         <div class="fileName" v-if="showName" :title="file.name">
           {{ file.name }}
@@ -212,6 +220,7 @@ export default {
   },
   computed: {
     formatTxt() {
+      console.log(this.accept)
       return this.accept
         .replace(/\./g, '')
         .replace(/ /g, '')

src/components/balanceAlert.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div class="content">
     <div class="title" v-if="information.indexOf('毛重') > -1">毛重</div>
@@ -23,7 +22,7 @@ export default {
     return {
       param: 9600,
       grossWeightVal: '',
-      tareVal: '',
+      tareVal: ''
     }
   },
   activated() {},
@@ -56,16 +55,19 @@ export default {
           // The Web Serial API is supported.
           console.log('the Web Serial API is supported.')
           const port = await navigator.serial.requestPort()
-          if (this.deptBudgetList.warehouseName == '白城内陆港'||this.deptBudgetList.warehouseName == '肇东金信库') {
+          if (
+            this.deptBudgetList.warehouseName == '白城内陆港' ||
+            this.deptBudgetList.warehouseName == '肇东金信库'
+          ) {
             this.param = 1200
-          } else if(this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
+          } else if (this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
             this.param = 2400
-          }else {
+          } else {
             this.param = 9600
           }
           console.log(this.param)
           await port.open({
-            baudRate: this.param,
+            baudRate: this.param
           }) // set baud rate
           this.reader = port.readable.getReader()
           console.log('port  ', port)
@@ -108,36 +110,39 @@ export default {
           //     this.deptBudgetList.tare = parseInt(result)
           //   }
           // }
-          
-          if(value.length > 3 ){
-             if(value.length <= 6){
+
+          if (value.length > 3) {
+            if (value.length <= 6) {
               continue
-             }
-            if(this.deptBudgetList.warehouseName == '肇东金信库' && value.length < 10){
-              var start = (new Date()).getTime();
-              while((new Date()).getTime() - start < 200) {
-              }
+            }
+            if (
+              this.deptBudgetList.warehouseName == '肇东金信库' &&
+              value.length < 10
+            ) {
+              var start = new Date().getTime()
+              while (new Date().getTime() - start < 200) {}
               continue
             }
             console.log('value23:', value)
-          }
-          else if(this.deptBudgetList.warehouseName == '白城内陆港' ||this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库'){
+          } else if (
+            this.deptBudgetList.warehouseName == '白城内陆港' ||
+            this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库'
+          ) {
             console.log('value:', value)
-            var start = (new Date()).getTime();
-            while((new Date()).getTime() - start < 400) {
-
-            }
-            continue;
+            var start = new Date().getTime()
+            while (new Date().getTime() - start < 400) {}
+            continue
           }
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
+              this.deptBudgetList.warehouseName == '山东园丰库' ||
               this.deptBudgetList.warehouseName == '克东千红库' ||
               this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库' ||
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
               this.deptBudgetList.warehouseName == '龙江金信库' ||
-              this.deptBudgetList.warehouseName == '白城内陆港'||
-              this.deptBudgetList.warehouseName == '肇东金信库'||
+              this.deptBudgetList.warehouseName == '白城内陆港' ||
+              this.deptBudgetList.warehouseName == '肇东金信库' ||
               this.deptBudgetList.warehouseName == '呼兰大金仓')
           ) {
             for (var i = 0; i < value.length; i++) {
@@ -257,8 +262,8 @@ export default {
       } else {
         console.log('the Web Serial API is not supported.', navigator)
       }
-    },
-  },
+    }
+  }
 }
 </script>
 

src/components/echart/index.vue

@@ -0,0 +1,72 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-02-28 16:29:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-04-25 15:45:57
+ * @FilePath: \web-pc\src\pages\big-screen\components\echart\index.vue
+-->
+<template>
+  <div :id="id" :class="className" :style="{ height: height, width: width }" />
+</template>
+
+<script>
+import tdTheme from './theme.json' // 引入默认主题
+
+export default {
+  name: 'echart',
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    id: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '100%'
+    },
+    options: {
+      type: Object,
+      default: ()=>({})
+    }
+  },
+  data () {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    options: {
+      handler (options) {
+        // 设置true清空echart缓存
+        this.chart.setOption(options, true)
+      },
+      deep: true
+    }
+  },
+  mounted () {
+    // echarts.registerTheme('tdTheme', tdTheme); // 覆盖默认主题
+    this.initChart();
+  },
+  beforeDestroy () {
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart () {
+      // 初始化echart
+      this.chart = echarts.init(this.$el, 'tdTheme')
+      this.chart.setOption(this.options, true)
+    }
+  }
+}
+</script>
+
+<style>
+</style>

src/components/echart/theme.json

@@ -0,0 +1,490 @@
+{
+  "color": [
+    "#2d8cf0",
+    "#19be6b",
+    "#ff9900",
+    "#E46CBB",
+    "#9A66E4",
+    "#ed3f14"
+  ],
+  "backgroundColor": "rgba(0,0,0,0)",
+  "textStyle": {},
+  "title": {
+    "textStyle": {
+      "color": "#516b91"
+    },
+    "subtextStyle": {
+      "color": "#93b7e3"
+    }
+  },
+  "line": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": "2"
+      }
+    },
+    "lineStyle": {
+      "normal": {
+        "width": "2"
+      }
+    },
+    "symbolSize": "6",
+    "symbol": "emptyCircle",
+    "smooth": true
+  },
+  "radar": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": "2"
+      }
+    },
+    "lineStyle": {
+      "normal": {
+        "width": "2"
+      }
+    },
+    "symbolSize": "6",
+    "symbol": "emptyCircle",
+    "smooth": true
+  },
+  "bar": {
+    "itemStyle": {
+      "normal": {
+        "barBorderWidth": 0,
+        "barBorderColor": "#ccc"
+      },
+      "emphasis": {
+        "barBorderWidth": 0,
+        "barBorderColor": "#ccc"
+      }
+    }
+  },
+  "pie": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "scatter": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "boxplot": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "parallel": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "sankey": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "funnel": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "gauge": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "candlestick": {
+    "itemStyle": {
+      "normal": {
+        "color": "#edafda",
+        "color0": "transparent",
+        "borderColor": "#d680bc",
+        "borderColor0": "#8fd3e8",
+        "borderWidth": "2"
+      }
+    }
+  },
+  "graph": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    },
+    "lineStyle": {
+      "normal": {
+        "width": 1,
+        "color": "#aaa"
+      }
+    },
+    "symbolSize": "6",
+    "symbol": "emptyCircle",
+    "smooth": true,
+    "color": [
+      "#2d8cf0",
+      "#19be6b",
+      "#f5ae4a",
+      "#9189d5",
+      "#56cae2",
+      "#cbb0e3"
+    ],
+    "label": {
+      "normal": {
+        "textStyle": {
+          "color": "#eee"
+        }
+      }
+    }
+  },
+  "map": {
+    "itemStyle": {
+      "normal": {
+        "areaColor": "#f3f3f3",
+        "borderColor": "#516b91",
+        "borderWidth": 0.5
+      },
+      "emphasis": {
+        "areaColor": "rgba(165,231,240,1)",
+        "borderColor": "#516b91",
+        "borderWidth": 1
+      }
+    },
+    "label": {
+      "normal": {
+        "textStyle": {
+          "color": "#000"
+        }
+      },
+      "emphasis": {
+        "textStyle": {
+          "color": "rgb(81,107,145)"
+        }
+      }
+    }
+  },
+  "geo": {
+    "itemStyle": {
+      "normal": {
+        "areaColor": "#f3f3f3",
+        "borderColor": "#516b91",
+        "borderWidth": 0.5
+      },
+      "emphasis": {
+        "areaColor": "rgba(165,231,240,1)",
+        "borderColor": "#516b91",
+        "borderWidth": 1
+      }
+    },
+    "label": {
+      "normal": {
+        "textStyle": {
+          "color": "#000"
+        }
+      },
+      "emphasis": {
+        "textStyle": {
+          "color": "rgb(81,107,145)"
+        }
+      }
+    }
+  },
+  "categoryAxis": {
+    "axisLine": {
+      "show": true,
+      "lineStyle": {
+        "color": "#cccccc"
+      }
+    },
+    "axisTick": {
+      "show": false,
+      "lineStyle": {
+        "color": "#333"
+      }
+    },
+    "axisLabel": {
+      "show": true,
+      "textStyle": {
+        "color": "#fff"
+      }
+    },
+    "splitLine": {
+      "show": false,
+      "lineStyle": {
+        "color": [
+          "#eeeeee"
+        ]
+      }
+    },
+    "splitArea": {
+      "show": false,
+      "areaStyle": {
+        "color": [
+          "rgba(250,250,250,0.05)",
+          "rgba(200,200,200,0.02)"
+        ]
+      }
+    }
+  },
+  "valueAxis": {
+    "axisLine": {
+      "show": true,
+      "lineStyle": {
+        "color": "#cccccc"
+      }
+    },
+    "axisTick": {
+      "show": false,
+      "lineStyle": {
+        "color": "#333"
+      }
+    },
+    "axisLabel": {
+      "show": true,
+      "textStyle": {
+        "color": "#fff"
+      }
+    },
+    "splitLine": {
+      "show": false,
+      "lineStyle": {
+        "color": [
+          "#eeeeee"
+        ]
+      }
+    },
+    "splitArea": {
+      "show": false,
+      "areaStyle": {
+        "color": [
+          "rgba(250,250,250,0.05)",
+          "rgba(200,200,200,0.02)"
+        ]
+      }
+    }
+  },
+  "logAxis": {
+    "axisLine": {
+      "show": true,
+      "lineStyle": {
+        "color": "#cccccc"
+      }
+    },
+    "axisTick": {
+      "show": false,
+      "lineStyle": {
+        "color": "#333"
+      }
+    },
+    "axisLabel": {
+      "show": true,
+      "textStyle": {
+        "color": "#999999"
+      }
+    },
+    "splitLine": {
+      "show": true,
+      "lineStyle": {
+        "color": [
+          "#eeeeee"
+        ]
+      }
+    },
+    "splitArea": {
+      "show": false,
+      "areaStyle": {
+        "color": [
+          "rgba(250,250,250,0.05)",
+          "rgba(200,200,200,0.02)"
+        ]
+      }
+    }
+  },
+  "timeAxis": {
+    "axisLine": {
+      "show": true,
+      "lineStyle": {
+        "color": "#cccccc"
+      }
+    },
+    "axisTick": {
+      "show": false,
+      "lineStyle": {
+        "color": "#333"
+      }
+    },
+    "axisLabel": {
+      "show": true,
+      "textStyle": {
+        "color": "#999999"
+      }
+    },
+    "splitLine": {
+      "show": true,
+      "lineStyle": {
+        "color": [
+          "#eeeeee"
+        ]
+      }
+    },
+    "splitArea": {
+      "show": false,
+      "areaStyle": {
+        "color": [
+          "rgba(250,250,250,0.05)",
+          "rgba(200,200,200,0.02)"
+        ]
+      }
+    }
+  },
+  "toolbox": {
+    "iconStyle": {
+      "normal": {
+        "borderColor": "#999"
+      },
+      "emphasis": {
+        "borderColor": "#666"
+      }
+    }
+  },
+  "legend": {
+    "textStyle": {
+      "color": "#fff"
+    }
+  },
+  "tooltip": {
+    "axisPointer": {
+      "lineStyle": {
+        "color": "#ccc",
+        "width": 1
+      },
+      "crossStyle": {
+        "color": "#ccc",
+        "width": 1
+      }
+    }
+  },
+  "timeline": {
+    "lineStyle": {
+      "color": "#8fd3e8",
+      "width": 1
+    },
+    "itemStyle": {
+      "normal": {
+        "color": "#8fd3e8",
+        "borderWidth": 1
+      },
+      "emphasis": {
+        "color": "#8fd3e8"
+      }
+    },
+    "controlStyle": {
+      "normal": {
+        "color": "#8fd3e8",
+        "borderColor": "#8fd3e8",
+        "borderWidth": 0.5
+      },
+      "emphasis": {
+        "color": "#8fd3e8",
+        "borderColor": "#8fd3e8",
+        "borderWidth": 0.5
+      }
+    },
+    "checkpointStyle": {
+      "color": "#8fd3e8",
+      "borderColor": "rgba(138,124,168,0.37)"
+    },
+    "label": {
+      "normal": {
+        "textStyle": {
+          "color": "#8fd3e8"
+        }
+      },
+      "emphasis": {
+        "textStyle": {
+          "color": "#8fd3e8"
+        }
+      }
+    }
+  },
+  "visualMap": {
+    "color": [
+      "#516b91",
+      "#59c4e6",
+      "#a5e7f0"
+    ]
+  },
+  "dataZoom": {
+    "backgroundColor": "rgba(0,0,0,0)",
+    "dataBackgroundColor": "rgba(255,255,255,0.3)",
+    "fillerColor": "rgba(167,183,204,0.4)",
+    "handleColor": "#a7b7cc",
+    "handleSize": "100%",
+    "textStyle": {
+      "color": "#333"
+    }
+  },
+  "markPoint": {
+    "label": {
+      "normal": {
+        "textStyle": {
+          "color": "#eee"
+        }
+      },
+      "emphasis": {
+        "textStyle": {
+          "color": "#eee"
+        }
+      }
+    }
+  }
+}

src/components/item-wrap/item-wrap.vue

@@ -0,0 +1,97 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-03-01 09:16:22
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-05-07 11:06:23
+ * @FilePath: \web-pc\src\pages\big-screen\components\item-wrap\item-wrap.vue
+-->
+<template>
+  <dv-border-box-13 class="lr_titles">
+    <div class="item_title" v-if="title !== ''">
+      <div class="zuo"></div>
+      <span class="title-inner"> &nbsp;&nbsp;{{ title }}&nbsp;&nbsp; </span>
+      <div class="you"></div>
+    </div>
+    <div
+      :class="title !== '' ? 'item_title_content' : 'item_title_content_def'"
+    >
+      <slot></slot>
+    </div>
+  </dv-border-box-13>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  props: {
+    title: {
+      type: String,
+      default: () => '',
+    },
+  },
+  created() {},
+
+  mounted() {},
+  methods: {},
+};
+</script>
+<style lang='scss' scoped>
+$item-title-height: 38px;
+$item_title_content-height: calc(100% - 38px);
+
+.lr_titles {
+  box-sizing: border-box;
+
+  ::v-deep .border-box-content {
+    box-sizing: border-box;
+    padding: 6px 0px 0px;
+  }
+
+  .item_title {
+    height: $item-title-height;
+    line-height: $item-title-height;
+    width: 100%;
+    color: #31abe3;
+    text-align: center;
+    // background: linear-gradient(to right, transparent, #0f0756, transparent);
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .zuo,
+    .you {
+      width: 58px;
+      height: 14px;
+      background-image: url("../../assets/images/titles/zuo.png");
+    }
+
+    .you {
+      transform: rotate(180deg);
+    }
+    .title-inner {
+      font-weight: 900;
+      letter-spacing: 2px;
+      background: linear-gradient(
+        92deg,
+        #0072ff 0%,
+        #00eaff 48.8525390625%,
+        #01aaff 100%
+      );
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  }
+
+  .item_title_content {
+    height: $item_title_content-height;
+  }
+
+  .item_title_content_def {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>

src/components/kong.vue

@@ -0,0 +1,43 @@
+<template>
+  <div class='kong'>
+      <slot></slot>
+  </div>
+</template>
+
+<script>
+
+export default {
+  components: {},
+  data() {
+    return {
+    
+    };
+  },
+  props:{
+    data:{
+      type:Array,
+      default:()=>[]
+    }
+  },
+  computed: {},
+  methods: {
+    init(){
+    },
+  },
+  created() {
+  
+  },
+  mounted() {
+  
+  },
+  beforeDestroy() { 
+  },
+}
+</script>
+
+<style lang='scss' scoped>
+.kong{
+    width: 100%;
+    height: 100%;
+}
+</style>

src/components/mapdrag/indexMap.vue

@@ -158,11 +158,11 @@
         var that = this
         this.makeJsonData()
         AMapLoader.load({
-          "key": "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key，首次调用 load 时必填
-          "version": "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-          "plugins": ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch','AMap.Geolocation', 'Geolocation'],
-          "Loca": { // 是否加载 Loca， 缺省不加载
-            "version": '2.0.0' // Loca 版本，缺省 1.3.2
+          'key': '211dd6f989e719022aaf47ddb0659c47', // 申请好的Web端开发者Key，首次调用 load 时必填
+          'version': '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+          'plugins': ['plugin=AMap.Scale', 'AMap.ToolBar','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch','AMap.Geolocation', 'Geolocation'],
+          'Loca': { // 是否加载 Loca， 缺省不加载
+            'version': '2.0.0' // Loca 版本，缺省 1.3.2
           },
         }).then((AMap) => {
           this.loadmap()
@@ -192,26 +192,26 @@
           _coordinates1.push(Number(_position1[1]))
           _coordinates1.push(Number(_position1[0]))
           let _obj1 = {
-            "type": "Feature",
-            "properties": {
-              "type": i,
+            'type': 'Feature',
+            'properties': {
+              'type': i,
             },
-            "geometry": {
-              "type": "Point",
-              "coordinates": _coordinates1
+            'geometry': {
+              'type': 'Point',
+              'coordinates': _coordinates1
             }
           }
           let _position11 = _data.startPlace ? _data.startPlace.split(',') : []
           _coordinates11.push(Number(_position11[1]))
           _coordinates11.push(Number(_position11[0]))
           let _obj11 = {
-            "type": "Feature",
-            "properties": {
-              "type": i,
+            'type': 'Feature',
+            'properties': {
+              'type': i,
             },
-            "geometry": {
-              "type": "Point",
-              "coordinates": _coordinates11
+            'geometry': {
+              'type': 'Point',
+              'coordinates': _coordinates11
             }
           }
 
@@ -235,31 +235,31 @@
           _marker.name = _data.name
           this.markerList.push(_marker)
           let _obj2 = {
-            "type": "Feature",
-            "properties": {
+            'type': 'Feature',
+            'properties': {
 
             },
-            "geometry": {
-              "type": "LineString",
-              "coordinates": _coordinates2
+            'geometry': {
+              'type': 'LineString',
+              'coordinates': _coordinates2
             }
           }
           _features2.push(_obj2)
         }
         this.mapPointData = {
-          "type": "FeatureCollection",
-          "features": _features1
+          'type': 'FeatureCollection',
+          'features': _features1
         }
         this.mapLineData = {
-          "type": "FeatureCollection",
-          "features": _features2
+          'type': 'FeatureCollection',
+          'features': _features2
         }
-        console.log("this.mapPointData", this.mapPointData)
-        console.log("this.mapPointData", this.mapLineData)
+        console.log('this.mapPointData', this.mapPointData)
+        console.log('this.mapPointData', this.mapLineData)
 
       },
       loadmap(val) {
-        var map = new AMap.Map('mapContainer', {
+          let map = new AMap.Map('mapContainer', {
           zoom: 4.89,
           showLabel: true,
           viewMode: '3D',
@@ -270,13 +270,13 @@
           showIndoorMap: false,
         });
 
-        var loca = new Loca.Container({
+        let loca = new Loca.Container({
           map,
         });
         for (let i = 0; i < this.markerList.length; i++) {
           // 构造点标记
           if (this.markerList[i].iconSrc[0] && this.markerList[i].iconSrc[1]) {
-            var marker = new AMap.Marker({
+            let marker = new AMap.Marker({
               position: this.markerList[i].iconSrc,
               anchor: 'bottom-center',
               icon: new AMap.Icon({
@@ -288,7 +288,7 @@
             map.add(marker);
             marker.setLabel({
               offset: new AMap.Pixel(0, 0), //设置文本标注偏移量
-              content: "<div class = 'maker-item'>" + this.markerList[i].name + "</div>", //设置文本标注内容
+              content: '<div class = \'maker-item\'>' + this.markerList[i].name + '</div>', //设置文本标注内容
               direction: 'right' //设置文本标注方位
 
             });
@@ -301,8 +301,8 @@
         this.timer = setInterval(function() {
           _markerDom[_index].style.opacity = 1
           _markerDom[_index].style.transition = '2s'
-          var elseLi = _markerDom;
-          for (var i = 0; i < elseLi.length; i++) {
+          let elseLi = _markerDom;
+          for (let i = 0; i < elseLi.length; i++) {
             if (elseLi[i] !== _markerDom[_index]) { //判断是否是ele节点，是否与触发事件的节点相同
               elseLi[i].style.opacity = 0
               _markerDom[_index].style.transition = '2s'
@@ -314,7 +314,7 @@
 
 
         // 呼吸点
-        var scatter = new Loca.ScatterLayer({
+        let scatter = new Loca.ScatterLayer({
           loca,
           zIndex: 10,
           opacity: 0.6,
@@ -322,7 +322,7 @@
           zooms: [2, 22],
         });
 
-        var pointGeo = new Loca.GeoJSONSource({
+        let pointGeo = new Loca.GeoJSONSource({
           // url: 'https://a.amap.com/Loca/static/loca-v2/demos/mock_data/pulselink-china-city-point.json',
           data: this.mapPointData
         });
@@ -338,7 +338,7 @@
         loca.add(scatter);
 
         // 弧线
-        var pulseLink = new Loca.PulseLinkLayer({
+        let pulseLink = new Loca.PulseLinkLayer({
           // loca,
           zIndex: 10,
           opacity: 1,
@@ -347,7 +347,7 @@
           depth: true,
         });
 
-        var geo = new Loca.GeoJSONSource({
+        let geo = new Loca.GeoJSONSource({
           // url: 'https://a.amap.com/Loca/static/loca-v2/demos/mock_data/data-line-out.json',
           data: this.mapLineData
         });

src/components/syClick.vue

@@ -0,0 +1,159 @@
+<template>
+    <div class="nav-click">
+        <div class='nav-wrap'>
+            <i  v-if='titles.length>8' @click='navleft' class="el-icon-arrow-left"></i>
+            <div class='nav-click-div'>
+               <div ref='navclickwrap' class='nav-click-wrap'>
+              <ul>
+                    <li class="nav-click-body" :class="item.showClick?'nav-click-body-active':''" v-for="(item,index) in titles" :key="index" :title="item.title"
+                     @click="changeTag(index)">
+                        <div class="nav-click-body-title" >{{item.title}} {{item.flag}}</div>
+                        <div v-if="item.showClick" class="nav-click-body-close" @click.stop="removeTag(index)">×</div>
+                    </li>
+                </ul>  
+            </div> 
+            </div>
+            
+            <i v-if='titles.length>8' @click='navright' class="el-icon-arrow-right"></i>
+        </div>
+        <el-button v-if='titles.length>1' class='close-button' @click='removeElseTag' type="primary">关闭其他</el-button>
+    </div>
+</template>
+<script>
+    export default {
+        name:'syClick',
+        props:{
+            // 路由组件页标签列表
+            titles:{
+                type: Array,
+                default: ()=>{
+			        return []
+			    }
+            }
+        },
+        data() {
+            return {
+                left:0,
+            }
+        },
+
+        methods: {
+            navleft(){
+                this.left+=100
+                if(this.left<this.$refs.navclickwrap.offsetWidth){
+                   this.$refs.navclickwrap.style.left = -this.left+'px' 
+                }else{
+                    this.left=this.$refs.navclickwrap.offsetWidth
+                    this.$refs.navclickwrap.style.left = -this.$refs.navclickwrap.offsetWidth+'px' 
+                }
+            },
+            navright(){
+                 this.left-=100
+                console.log(this.left)
+                if(-this.left<0){
+                   this.$refs.navclickwrap.style.left = -this.left+'px' 
+                }else{
+                    this.left=0
+                    this.$refs.navclickwrap.style.left = '0px' 
+                }
+            },
+            // 删除标签页
+            removeTag(index) {
+                if(this.titles.length>1){
+                    this.titles.splice(index,1)
+                    if(index>0){
+                       this.titles[index-1].showClick=true
+                       this.$router.push({
+                            path: this.titles[index-1].path,
+                            query: this.titles[index-1].query,
+                        })
+                    }else{
+                         this.titles[index].showClick=true
+                         this.$router.push({
+                            path: this.titles[index].path,
+                            query: this.titles[index].query,
+                        })
+                    }
+                }
+            },
+            removeElseTag(){
+                this.$emit('removeElseTag')
+            },
+            // 切换标签页
+            changeTag(index) {
+                console.log(this.titles[index])
+                for (let i = 0; i < this.titles.length; i++) {
+                    this.titles[i].showClick=false;
+                }
+                this.titles[index].showClick=true
+                this.$router.push({
+                    path: this.titles[index].path,
+                    query: this.titles[index].query,
+                })
+            }
+        }
+    }
+</script>
+<style lang="scss" scoped>
+.nav-click{
+    position:relative;
+    padding:10px 0;
+    .nav-wrap{
+        position:relative;
+        width:94%;
+    }
+    .el-icon-arrow-left,.el-icon-arrow-right{
+        position:absolute;
+        top:50%;
+        transform: translateY(-50%);
+        cursor:pointer;
+        z-index:10;
+    }
+    .nav-click-div{
+        overflow:hidden;
+        margin:0 40px;
+    }
+    .nav-click-wrap{
+        position:relative;
+    }
+    .el-icon-arrow-left{
+        left:15px;
+    }
+    .el-icon-arrow-right{
+        right:15px;
+    }
+    ul{
+        display:flex;
+        margin:0;
+        padding:0;
+    }
+    ul>li{
+        list-style:none;display:flex;
+        cursor:pointer;
+        padding:10px;
+        margin:0 5px;
+        color:#4E5969;
+          
+        // display:inline-block;
+    }
+    ul>li:hover{
+        background:#F2F3F5;
+    }
+    li.nav-click-body-active{
+        background:#F6F7F9;
+    }
+    .nav-click-body-title{
+        margin-right:5px;
+        max-width: 100px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+    .close-button{
+        position:absolute;
+        right:10px;
+        top:50%;
+        transform: translateY(-50%);
+    }
+}
+</style>

src/lang/zh.js

@@ -481,12 +481,12 @@ export default {
     protectionInventory: '劳保库存',
     // 合同管理
     contractManagement: '合同管理',
-    purchaseContract: '现货采购合同',
+    purchaseContract: '采购合同',
     collectionContract: '代收合同',
-    purchaseContractAdd: '现货采购合同  /  添加',
-    purchaseContractcost:'现货采购合同  /  费用',
+    purchaseContractAdd: '采购合同  /  添加',
+    purchaseContractcost:'采购合同  /  费用',
     collectionContractAdd: '代收合同  /  添加',
-    purchaseContractEdit: '现货采购合同  /  编辑',
+    purchaseContractEdit: '采购合同  /  编辑',
     collectionContractEdit: '代收合同  /  编辑',
     collectionContractExamine:'代收合同  /  查看',
     collectionContractRecord:'代收合同  /  记录',
@@ -496,13 +496,17 @@ export default {
     storageContractExamine: '代储合同  /  查看',
     storageContractRecord:'代储合同  /  代储费',
     storageContractRecord:'代储合同  /  记录',
-    purchaseContractExamine: '现货采购合同  /  查看',
-    salesContract: '现货销售合同',
-    salesContractEdit: '现货销售合同  /  编辑',
-    salesContractcost: '现货销售合同  /  费用',
-    salesContractExamine: '现货销售合同  /  查看',
-    salesContractAudit: '现货销售合同  /  审核',
-    salesContractAdd: '现货销售合同  /  添加',
+    purchaseContractExamine: '采购合同  /  查看',
+    acquisitionContract:'收购合同',
+    acquisitionContractAdd: '收购合同  /  添加',
+    acquisitionContractEdit: '收购合同  /  编辑',
+    acquisitionContractExamine: '收购合同  /  查看',
+    salesContract: '销售合同',
+    salesContractEdit: '销售合同  /  编辑',
+    salesContractcost: '销售合同  /  费用',
+    salesContractExamine: '销售合同  /  查看',
+    salesContractAudit: '销售合同  /  审核',
+    salesContractAdd: '销售合同  /  添加',
     futuresPurchaseContract: '期货采购合同',
     futuresPurchaseContractAdd: '期货采购合同  /  添加',
     futuresPurchaseContractEdit: '期货采购合同  /  编辑',
@@ -542,7 +546,7 @@ export default {
     //客户管理
     customerList: '客户管理',
     //客户管理
-    customerFundList: '客户资金管理',
+    customerFundList: '客户管理',
     customerFundEdit: '客户管理编辑',
     customerFundAdd: '客户管理添加',
     //采购管理
@@ -605,6 +609,12 @@ export default {
     tranManagementTransportAdd: '运输任务添加',
     tranManagementTransportEdit: '运输任务编辑',
     tranManagementWarehouseInOutTask: '出入库任务',
+    supplyofgoods:'出入库任务  /  添加  /  选择货源',
+    outsupplyofgoods:'出入库任务  /  添加  /  选择货源',
+    supplyofgoodslook:'出入库任务  /  审核  /  查看货源',
+    outsupplyofgoodslook:'出入库任务  /  审核  /  查看货源',
+    supplyofgoodsedit:'出入库任务  /  编辑  /  选择货源',
+    outsupplyofgoodsedit:'出入库任务  /  编辑  /  选择货源',
     tranManagementWarehouseInOutTaskAdd: '出入库任务添加',
     tranManagementWarehouseInOutTaskEdit: '编辑',
     tranManagementWarehouseInOutTaskaudit: '审核',
@@ -654,7 +664,8 @@ export default {
     quotesDetail: '报价单详情',
     purchasDetail: '采购详情',
     billDetail: '备件结算详情',
-
+    warehousingOrder: '入库单',
+    inventoryCheck:'库存盘点',
     sparepartMa: '物料采购',
     applDetailMa: '物料申请详情',
     enquiryDetailMa: '物料询价详情',
@@ -1057,7 +1068,27 @@ export default {
     //利润核算
     profitable:'利润核算',
     contractOtherMoney: '合同外费用',
+    contractprofitsdetails:'合同利润  /  利润详情',
+    warehouseprofitsdetails:'库点利润  /  利润详情',
+    expensemanagementdetails:'费用管理  /  费用详情',
+    contractinventory:'合同利润  /  利润详情  /  库存',
+    warehouseinventory:'库点利润  /  利润详情  /  库存',
+    warehousecost:'库点利润  /  利润详情  /  费用',
+    contractcost:'合同利润  /  利润详情  /  费用',
+    cashout:'费用管理  /  费用详情  /  请款',
+    cashoutedit:'费用管理  /  费用详情  /  请款编辑',
+    cashoutaduit:'费用管理  /  费用详情  /  审核',
+    payment:'费用管理  /  费用详情  /  付款',
+    receiptaduit:'费用管理  /  费用详情  /  确认',
+    receipt:'费用管理  /  费用详情  /  收款',
+    expensemanagentedit:'费用管理  /  费用详情  /  编辑',
+    expenseallot:'费用管理  /  费用详情  /  分配',
+    expenseallotaduit:'费用管理  /  费用详情  /  确认',
+    expensemanagentlook:'费用管理  /  费用详情  /  查看',
     earningsLook: '盈收概览',
+    contractprofits: '合同利润',
+    warehouseprofits: '库点利润',
+    expensemanagement: '费用管理',
     inOutDetailed: '收支明细',
 
     //出库管理

src/layout/index/index.vue

@@ -4,6 +4,7 @@
     <div class="winseaview-header">
       <!-- 顶部导航栏 -->
       <top />
+      <div> <sy-Click :titles="openRoute" @removeElseTag='removeElseTag'></sy-Click></div>
     </div>
 
     <div class="winseaview-layout">
@@ -33,6 +34,7 @@
     mapGetters
   } from 'vuex';
   import screenshot from './screenshot';
+  import syClick from '@/components/syClick'
   import tags from './tags';
   import top from './top/';
   import sidebar from './sidebar/';
@@ -46,7 +48,8 @@
       top,
       tags,
       sidebar,
-      screenshot
+      screenshot,
+      syClick,
     },
     name: 'index',
     data() {
@@ -54,7 +57,9 @@
         //刷新token锁
         refreshLock: false,
         //刷新token的时间
-        refreshTime: ''
+        refreshTime: '',
+        
+         // 标签页
       };
     },
     created() {
@@ -64,10 +69,25 @@
     mounted() {
       this.init();
     },
-    computed: mapGetters(['isLock', 'isCollapse', 'website']),
+    computed: mapGetters(['isLock', 'isCollapse', 'website','openRoute']),
     props: [],
     methods: {
       ...mapActions(['setScreen']),
+      removeAll(){
+
+      },
+      removeTab(){
+
+      },
+      changeTag(){
+
+      },
+      removeElseTag(){
+        var arr=[this.openRoute.find((item)=>{return item.showClick==true})]
+        console.log(arr)
+        this.$store.commit('user/SET_OPEN_ROUTE',arr);
+        
+      },
       showCollapse() {
         this.$store.commit('SET_COLLAPSE');
       },

src/layout/index/sidebar/sidebarItem.vue

@@ -89,7 +89,7 @@ export default {
     console.log(this.menu)
   },
   computed: {
-    ...mapGetters(['roles']),
+    ...mapGetters(['roles','openRoute']),
     labelKey() {
       return this.props.label || this.config.propsDefault.label
     },
@@ -128,6 +128,7 @@ export default {
       return validatenull(val)
     },
     open(item) {
+
       if (this.screen <= 1) this.$store.commit('SET_COLLAPSE')
       // this.$router.$winseaviewRouter.group = item.group;
       // this.$router.$winseaviewRouter.meta = item.meta;

src/layout/index/top/index.vue

@@ -69,11 +69,11 @@
         {{ $t('common.trialDays') }}
         <span style="padding: 0 2px">{{ getDay }}</span>{{ $t('common.days') }}
       </div>
-      <el-tooltip v-if="showColor" effect="dark" :content="$t('navbar.color')" placement="bottom">
+      <!-- <el-tooltip v-if="showColor" effect="dark" :content="$t('navbar.color')" placement="bottom">
         <div class="top-bar__item">
           <top-color></top-color>
         </div>
-      </el-tooltip>
+      </el-tooltip> -->
 
       <el-tooltip v-if="showTheme" effect="dark" :hide-after="1500" :content="$t('navbar.theme')" placement="bottom">
         <div class="top-bar__item top-bar__item--show">
@@ -120,7 +120,7 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
-
+  
     <topSetting v-model="settingDrawer" @close="() => (settingDrawer = !settingDrawer)" />
 
     <!--个人信息-->
@@ -174,6 +174,7 @@
         }}</ws-button>
       </span>
     </WinseaContentModal>
+    
   </div>
 </template>
 <script>
@@ -185,6 +186,7 @@
   from '@/model/indexRx'
   import Cookies from 'js-cookie'
   import { setToken, getCompanyId, clearStorage } from '@/utils/auth'
+
   import {
     mapActions,
     mapGetters,
@@ -248,10 +250,12 @@
       topSetting,
       breadCrumb,
       smallTips,
+      
     },
     name: 'top',
     data() {
       return {
+        index:0,
         //status1:已初检未称毛重状态 status2:已初检且已称毛重状态  status3:已复检且已称毛重  status4:已复检且已称皮重状态
         //status5:已确认质检且已称皮重且未结算状态  status6:已结算状态
         btnStatus: {
@@ -265,6 +269,8 @@
         toPageData: {},
         userINfo: {},
         barCode: '',
+       
+
         compNameoptions:[],
         isOpenCodeGun: false,
         smAlert: false,
@@ -387,6 +393,7 @@
     methods: {
       ...mapActions('common', ['setLocalVessels']),
       ...mapActions('user', ['getUserInfo','toSetShow']),
+      
       payCode() {
 		  console.log('input', this.barCode)
         this.btnStatus = {
@@ -630,35 +637,36 @@
         _saomadata.cangid = this.cangid
         _saomadata.id = this.toPageData.qualityInspectionManagement.id
         _saomadata.warehouseName = this.toPageData.qualityInspectionManagement.warehouseName
-       _saomadata.managementType = this.toPageData.qualityInspectionManagement.managementType//贸易入库1 收购入库3
+       _saomadata.managementType = this.toPageData.qualityInspectionManagement.serviceManagementType//贸易入库1 收购入库3
          this.barCode = ''
         let _url = ''
         if (type === 1) {
            _saomadata.type = 1
-           localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+           localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
           this.$router.push({
-          	name: 'inspectionManagementNew'
+          	name: 'inspectionManagementNew',query: {  id:this.index++ }
           })
         } else if (type === 2) {
            _saomadata.type = 2
-           localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+           localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
             this.$router.push({
-          	name: 'inspectionManagementNew'
+          	name: 'inspectionManagementNew',query: {  id:this.index++ }
           })
         } else if (type === 3) {
            _saomadata.type = 3
-           localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
-            this.$router.push({
-          	name: 'inspectionManagementNew'
-          })
+           localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
+          //   this.$router.push({
+          // 	name: 'inspectionManagementNew'
+          // })
+          this.$router.push({ name: 'inspectionManagementNew',query: {  id:this.index++ }})
         } else if (type === 4) {
            _saomadata.typeNo = 1
            _saomadata.monitorUrl1 = this.toPageData.warehouseBaseInfo.monitorUrl1
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
-            localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+            localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
              this.$router.push({
-            name: 'newWeighingManagement'
+            name: 'newWeighingManagement',query: {  id:this.index++ }
           })
         } else if (type === 5) {
              localStorage.setItem('paymentManagementReturn', false)
@@ -674,7 +682,7 @@
            _saomadata.monitorUrl1 = this.toPageData.warehouseBaseInfo.monitorUrl1
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
-            localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+            localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
            this.$router.push({
             name: 'newWeighingManagement',
           })

src/layout/index/top/top-setting.vue

@@ -35,7 +35,9 @@
                       @change="changeVesslBankMethod" />
         </BaseCol>
       </BaseRow>
-
+      <BaseRow >
+       <button @click="clear()">清理后台缓存</button>
+      </BaseRow>
       <span class="version">{{$t('systemVersion')+ ' ' + systemVersion}}</span>
     </BaseCol>
   </BaseDrawer>
@@ -43,6 +45,8 @@
 
 <script>
 import { mapActions, mapGetters, mapState } from 'vuex';
+import { clearCache }
+  from '@/model/home/index'
 export default {
   props: {
     value: {
@@ -116,6 +120,12 @@ export default {
         typeId: 'shipMap',
         showFlag: val
       }])
+    },
+    clear(){
+       clearCache({
+        }).toPromise().then(res => {
+          this.$message.success('缓存清理成功')
+        })
     }
   }
 };

src/lib/currency.js

@@ -0,0 +1,432 @@
+/*
+ * @Author: daidai
+ * @Date: 2021-12-06 15:53:24
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-04-22 09:31:24
+ * @FilePath: \web-pc\src\lib\currency.js
+ */
+import router from '@/router'
+import { isString, isHtmlElement } from './types'
+import UtilVar from "@/config/UtilVar";
+export const returnWeek = () => {
+  var week = new Date().getDay();
+  switch (week) {
+    case 1:
+      return '周一'
+    case 2:
+      return '周二'
+    case 3:
+      return '周三'
+    case 4:
+      return '周四'
+    case 5:
+      return '周五'
+    case 6:
+      return '周六'
+    case 0:
+      return '周日'
+  }
+}
+
+/**
+ * 获取uuid
+ */
+export function getUUID() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+    return (c === 'x' ? (Math.random() * 16 | 0) : ('r&0x3' | '0x8')).toString(16)
+  })
+}
+
+/**
+ * 是否有权限
+ * @param {*} key
+ */
+export function isAuth(key) {
+  // console.log("key",key,sessionStorage.getItem('permissions'))
+  // if(process.env.VUE_APP_CONFIG=="dev"){
+  //   return true
+  // }
+  return JSON.parse(sessionStorage.getItem('permissions') || '[]').indexOf(key) !== -1 || false
+}
+export const rowClassName = ({ row, rowIndex }) => {
+  if (rowIndex % 2 == 0) {
+    return 'lightColour';
+  } else {
+    return 'DarkColor';
+  }
+}
+
+export const getToken = () => {
+  return localStorage.getItem("token");
+}
+//跳转当前页面并传参
+export const currentQuery = (param) => {
+  let newParam = { ...param }
+  for (let i in newParam) {
+    if (newParam[i] === "") {
+      delete newParam[i]
+    }
+  }
+  // console.log(newParam)
+  router.push({
+    path: router.currentRoute.path,
+    query: newParam
+  })
+}
+/**
+ * 树形数据转换
+ * @param {*} data
+ * @param {*} id
+ * @param {*} pid
+ * @param {*} order
+ */
+export function treeDataTranslate(data, id, pid, order) {
+  // console.log(Array.isArray(data))
+  if (data == null || !Array.isArray(data)) {
+    return [];
+  }
+  if (order) {
+    data.sort(function (a, b) {
+      return a[order] - b[order];
+    })
+  }
+  // console.log(data)
+  var res = []
+  var temp = {}
+  for (var i = 0; i < data.length; i++) {
+    temp[data[i][id]] = data[i]
+  }
+  for (var k = 0; k < data.length; k++) {
+
+    if (temp[data[k][pid]] && data[k][id] !== data[k][pid]) {
+      if (!temp[data[k][pid]]['subs']) {
+        temp[data[k][pid]]['subs'] = []
+      }
+      if (!temp[data[k][pid]]['_level']) {
+        temp[data[k][pid]]['_level'] = 1
+      }
+      data[k]['_level'] = temp[data[k][pid]]._level + 1
+      temp[data[k][pid]]['subs'].push(data[k])
+
+
+    } else {
+      res.push(data[k])
+    }
+  }
+  // console.log(outurls)
+  // console.log(res)
+  return res
+}
+
+//带了一个 margin-left  
+export const dragss = (e, marginleft) => {
+
+  let odiv = e.currentTarget.parentElement;
+  let disX = e.clientX - odiv.offsetLeft;
+  let disY = e.clientY - odiv.offsetTop;
+  document.onmousemove = (e) => {
+    odiv.style.left = e.clientX - disX + marginleft + 'px';
+    odiv.style.top = e.clientY - disY + 'px';
+    return false;
+  };
+  document.onmouseup = (e) => {
+    document.onmousemove = null;
+    document.onmouseup = null;
+  };
+  return false;
+}
+
+//转base64
+
+export const turnStr = (data) => {
+  return window.btoa(window.encodeURI(JSON.stringify(data)));
+}
+// 验证只能输入数字和小数，小数且只能输入2位，第一位不能输入小数点
+//   .replace(/[^\d.]/g, '')
+//   .replace(/\.{2,}/g, '.')
+//   .replace('.', '$#$')
+//   .replace(/\./g, '')
+//   .replace('$#$', '.')
+//   .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
+//   .replace(/^\./g, '')
+/**
+ * 清除登录信息
+ */
+export function clearLoginInfo() {
+  router.options.isAddDynamicMenuRoutes = false;
+  localStorage.removeItem('token')
+  sessionStorage.removeItem("menuList")
+  sessionStorage.removeItem("permissions")
+}
+
+
+//对象拼成路径传参
+export const convertObj = (data) => {
+  var _result = [];
+  for (var key in data) {
+    var value = data[key];
+    if (value.constructor == Array) {
+      value.forEach(function (_value) {
+        _result.push(key + "=" + _value);
+      });
+    } else {
+      _result.push(key + '=' + value);
+    }
+  }
+  return _result.join('&');
+}
+//判断浏览器
+function getExplorer() {
+  var explorer = window.navigator.userAgent;
+  if (explorer.indexOf('MSIE') >= 0) {
+    return 'ie';        // ie
+  } else if (explorer.indexOf('Firefox') >= 0) {
+    return 'Firefox';   // firefox
+  } else if (explorer.indexOf('Chrome') >= 0) {
+    return 'Chrome';    // Chrome
+  } else if (explorer.indexOf('Opera') >= 0) {
+    return 'Opera';     // Opera
+  } else if (explorer.indexOf('Safari') >= 0) {
+    return 'Safari';    // Safari
+  } else if (!!explorer.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {
+    return 'IOS';
+  } else if (u.indexOf('Android') > -1 || u.indexOf('Adr') > -1) {
+    return 'Android';
+  } else {
+    return explorer
+  }
+};
+
+//导出文档流
+export const exportFile = (data, name) => {
+  return new Promise((resolve, reject) => {
+    let types = getExplorer()
+    if (types == 'IOS') {
+      resolve({
+        success: false,
+        msg: "请使用设备自带浏览器导出！"
+      })
+      return
+    }
+    if (data.type && data.type.indexOf('application/vnd.ms-excel') >= 0) {
+      // console.log(data)
+      try {
+        let blob = new Blob([data], {
+          type:data.type|| 'application/vnd.ms-excel;charset=UTF-8'
+        })
+        if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+          window.navigator.msSaveOrOpenBlob(blob, name);
+        } else {
+          const link = document.createElement('a')
+          link.style.display = 'none';
+          link.href = URL.createObjectURL(blob);
+          if (types == 'Safari') {
+            link.download = `${name || "未命名"}`;
+          } else {
+            link.download = `${name || "未命名"}.xlsx`;
+          }
+          // Safari thinks _blank anchor are pop ups. We only want to set _blank
+          // target if the browser does not support the HTML5 download attribute.
+          // This allows you to download files in desktop safari if pop up blocking
+          // is enabled.
+          if (typeof link.download === 'unde fined') {
+            tempLink.setAttribute('target', '_blank');
+          }
+          document.body.appendChild(link)
+          link.click()
+          // Fixes "webkit blob resource error 1"
+          let timer = setTimeout(function () {
+            document.body.removeChild(link)
+            window.URL.revokeObjectURL(link.href);
+            clearTimeout(timer)
+          }, 200)
+        }
+        resolve({
+          success: true,
+          msg: "导出成功"
+        })
+      } catch (error) {
+        resolve({
+          success: false,
+          msg: "未知异常，请联系管理员！"
+        })
+      }
+    } else {
+      // console.log(data)
+       readFile(data).then(res => {
+        resolve(res)
+      }).catch(err => {
+        resolve({
+          success: false,
+          msg: "未知异常，请联系管理员！"
+        })
+      })
+    }
+  })
+
+}
+//阅读 blod
+export const readFile = (data) => {
+  return new Promise((resole, reject) => {
+    if (Object.prototype.toString.call(data)==='[object Blob]') {
+      let reader = new FileReader()
+      reader.readAsText(data, 'utf-8')
+      reader.onload = (e) => {
+        console.log('--导出--', JSON.parse(reader.result))
+        let result = JSON.parse(reader.result)
+        if (result.code == UtilVar.code) {
+          router.push("/login")
+        }
+        resole(result)
+      }
+    } else {
+      resole(data)
+    }
+
+    // reader.readAsText(data)
+  })
+
+}
+
+//element 时间选择
+
+
+
+export const shortcuts = [{
+  text: '最近一周',
+  onClick(picker) {
+    const end = new Date();
+    const start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    picker.$emit('pick', [start, end]);
+  }
+}, {
+  text: '最近一个月',
+  onClick(picker) {
+    const end = new Date();
+    const start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+    picker.$emit('pick', [start, end]);
+  }
+}, {
+  text: '最近三个月',
+  onClick(picker) {
+    const end = new Date();
+    const start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 89);
+    picker.$emit('pick', [start, end]);
+  }
+}]
+export const pickerOptions = {
+  shortcuts: shortcuts
+}
+/**
+ * 清除相同
+ * @param {*} origin
+ * @param {*} target
+ */
+export const ArrayCleanRepeat = (origin, target) => {
+  if (target) origin = origin.concat(target);
+  const result = []
+  const tagObj = {}
+  for (const i of origin) {
+    if (!tagObj[i]) {
+      result.push(i)
+      tagObj[i] = 1
+    }
+  }
+  return result
+}
+/**
+ * @description: 
+ * @param {file:Object} 文件
+ * @return {*}
+ */
+export const beforeUpoads = (file) => {
+  // console.log(file)
+  var testmsg = file.name.substring(file.name.lastIndexOf('.') + 1)
+  if (
+    testmsg != 'png' &&
+    testmsg != 'jpg' &&
+    testmsg != 'jpeg' &&
+    testmsg != 'webp'
+  ) {
+    // testmsg != 'gif' &&
+    return {
+      success: false,
+      msg: "上传图片格式不正确！"
+    }
+  }
+  const if10M = file.size / 1024 / 1024 < 20
+  if (!if10M) {
+    return {
+      success: false,
+      msg: "上传图片大小不能超过20M!"
+    }
+  }
+  // console.log("上传前",file, this.filelist)
+  return {
+    success: true
+  }
+}
+//复制文字
+export const copy = (value) => {
+  let transfer = document.createElement('input')
+
+  document.body.appendChild(transfer)
+  transfer.value = value // 这里表示想要复制的内容
+  transfer.focus()
+  transfer.select()
+  if (document.execCommand('copy')) {
+    document.execCommand('copy')
+  }
+  transfer.blur()
+  document.body.removeChild(transfer)
+  //选中文字
+  //   let range = document.createRange()
+  //   let referenceNode = this.$refs.xy
+  //   range.selectNodeContents(referenceNode)
+  //   var selection = window.getSelection()
+  //   selection.removeAllRanges()
+  //   selection.addRange(range)
+}
+// 取出两个数组的不同元素
+export const getArrDifference = (arr1, arr2) => {
+  return arr1.concat(arr2).filter(function (v, i, arr) {
+    return arr.indexOf(v) === arr.lastIndexOf(v);
+  });
+}
+
+/**
+ * 表格最大高度
+ * @param {ElementDom} dom 
+ * @param {Boolean} isPaging 是否拥有分页 false 没有 ||  true 有 默认有
+ * @returns 
+ */
+export const tableHeight = (dom,isPaging=true) => {
+  //定位父级到文档高度
+  if (isString(dom)) {
+    dom = document.querySelector(dom)
+    // if (dom) {
+    //   return window.innerHeight - top
+    // }
+  }
+  if (isHtmlElement(dom)) {
+    var parent = dom.offsetParent;
+    var top = dom.offsetTop
+    if(isPaging){
+      top= top+ 63 + 4
+    }else{
+      top= top+ 16
+    }
+    while (parent != null) {
+      top += parent.offsetTop;
+      parent = parent.offsetParent;
+    };
+    return window.innerHeight - top
+  }
+
+  return null
+}
+
+//

src/lib/dd-moment.js

@@ -0,0 +1,93 @@
+
+/*
+ * @Author: daidai
+ * @Date: 2021-12-16 14:40:18
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-04-19 14:44:14
+ * @FilePath: \web-pc\src\lib\dd-moment.js
+ */
+
+
+const DDmoment = function (date) {
+    let time;
+    if (!date) {
+        time = new Date()
+    }else if(date){
+        time=new Date(date);
+    }
+    return {
+        time,
+        format,
+        subtract,
+        getTime,
+    }
+}
+/**
+ * @content 前多少天
+ * @param  days  天 ||  years 年  || months 月 ||  weeks 周 
+ * @returns 
+ */
+function subtract(num, type) {
+    let time = this.time
+    time.setTime(time.getTime()-getNeedTime(num, type))
+    time=new Date(time)
+    return {
+        time,
+        format,
+        getTime
+    }
+}
+/**
+ * @param  Yy年  ||  M 月  || Dd 日 ||  Hh 时 || m 分 || Ss 秒
+ * @returns 
+ */
+function format(fmt) {
+    let date = this.time
+    let ret;
+    const opt = {
+        "Y+": date.getFullYear().toString(),        // 年
+        "y+": date.getFullYear().toString(),        // 年
+        "M+": (date.getMonth() + 1).toString(),     // 月
+        "d+": date.getDate().toString(),            // 日
+        "D+": date.getDate().toString(),            // 日
+        "h+": date.getHours().toString(),           // 时
+        "H+": date.getHours().toString(),           // 时
+        "m+": date.getMinutes().toString(),         // 分
+        "S+": date.getSeconds().toString(),         // 秒
+        "s+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    };
+    for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+            fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+        };
+    };
+    return fmt;
+}
+//时间戳转时间
+function getTime() {
+    return new Date(this.time)
+}
+//获取需要的时间
+function getNeedTime(num, type) {
+    let time=0
+    switch (type) {
+        case "days":
+            time= 3600 * 1000 * 24 * num;
+            break;
+        case "years":
+            time=3600 * 1000 * 24 *365 *num;
+            break;
+        case "months":
+            time = 3600 * 1000 * 24 *30* num;
+            break;
+        case "weeks":
+            time= 3600 * 1000 * 24 *7* num;
+            break;
+        default:
+            break;
+    }
+    return time;
+}
+export default DDmoment

src/lib/index.js

@@ -0,0 +1,9 @@
+import DDmoment from "./dd-moment"
+import { colors,colors2 } from "./modules/echarts-options"
+import { shortcuts } from "./currency";
+
+export {DDmoment,colors,colors2}
+
+export {
+    shortcuts
+}

src/lib/types.js

@@ -0,0 +1,46 @@
+/*
+ * @Author: daidai
+ * @Date: 2021-12-14 09:15:11
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-04-25 10:11:04
+ * @FilePath: \web-pc\src\lib\types.js
+ */
+
+export function hasOwn(obj, key) {
+    return hasOwnProperty.call(obj, key);
+  };
+  export function isVNode(node) {
+    return node !== null && typeof node === 'object' && hasOwn(node, 'componentOptions');
+  };
+  
+// 是否字符串
+export function isString2(str) {
+    return (typeof str == 'string') && str.constructor == String;
+}
+export function isString(obj) {
+    return Object.prototype.toString.call(obj) === '[object String]';
+}
+export function isObject(obj) {
+    return Object.prototype.toString.call(obj) === '[object Object]';
+}
+export function isNumber(obj) {
+    return Object.prototype.toString.call(obj) === '[object Number]';
+}
+// 是否完整的
+export function isDef(val) {
+    return val !== undefined && val !== null;
+}
+//
+export function isKorean(text) {
+    const reg = /([(\uAC00-\uD7AF)|(\u3130-\u318F)])+/gi;
+    return reg.test(text);
+}
+
+export function isHtmlElement(node) {
+    return node && node.nodeType === Node.ELEMENT_NODE;
+}
+export const isUndefined = (val) => {
+    return val === void 0;
+};
+
+

src/main.js

@@ -1,13 +1,19 @@
 import Vue from 'vue'
 import App from './App'
 import './event-bus' // load events
+// 将自动注册所有组件为全局组件
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+import ElementUI from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css';
+Vue.use(ElementUI);
 
 import './global/index'
 import notification from './notification'
 import '@/styles/common.scss' // global css
 import i18n from '@/lang' // Internationalization
 import './permission' // permission control
-import './registerServiceWorker'; 
+import './registerServiceWorker';
 import Print from 'vue-print-nb'
 Vue.use(Print);
 import crudCommon from '@/mixins/crud'
@@ -15,52 +21,58 @@ window.$crudCommon = crudCommon;
 import vendors from '@/vendors'
 const { router, store } = vendors
 Vue.config.productionTip = false
-// import AMap from 'vue-amap';
-// Vue.use(AMap);
+    // import AMap from 'vue-amap';
+    // Vue.use(AMap);
 import imgPreview from '@/components/imgPreview'
 Vue.use(imgPreview)
-import echarts from "echarts";
+import echarts from 'echarts';
+import geoJson from '@/styles/china.json'
+echarts.registerMap('china', geoJson);
+
 Vue.prototype.$echarts = echarts;
-import $ from 'jquery'
 // import Warehouse from './common.js'
 import Warehouse from './common.js'
 Vue.prototype.WAREHOUSE = Warehouse.houseName
 Vue.prototype.common = Warehouse
-import axios from "axios";
+import axios from 'axios';
 Vue.prototype.$axios = axios;
 import global from './global.js'
 Vue.prototype.global = global
-// 初始化vue-amap
-// AMap.initAMapApiLoader({
-//   // 高德key
-//   key: 'd5486742b76ab0969e4c3ce26f46dfc6',
-//   // 插件集合 （插件按需引入）
-//   plugin: ['AMap.Geolocation', 'Geolocation', 'AMap.DistrictSearch', "AMap.PlaceSearch",'AMap.Autocomplete', 'AMap.Geocoder', 'AMap.DistrictSearch'],
-//   v: '1.4.4'
-// });
-// ------------ 通过域名判断起始的登陆页面 开始 --------------------
-//使用login的Url
-// const urls = [
-//   'www.winsea.com',
-//   'product-test.winsea.com',
-//   'test.winsea.com',
-//   'saas.winsea.com',
-//   'saas-test.winsea.com'
-// ]
-// urls.includes(window.location.host)
-//   ? localStorage.setItem('ws_login_type', 2)
-//   : localStorage.removeItem('ws_login_type')
+import ItemWrap from './components/item-wrap/item-wrap.vue'
+Vue.component('ItemWrap',ItemWrap)
+import Echart from './components/echart/index.vue'
+Vue.component('Echart',Echart)
+    // 初始化vue-amap
+    // AMap.initAMapApiLoader({
+    //   // 高德key
+    //   key: 'd5486742b76ab0969e4c3ce26f46dfc6',
+    //   // 插件集合 （插件按需引入）
+    //   plugin: ['AMap.Geolocation', 'Geolocation', 'AMap.DistrictSearch', "AMap.PlaceSearch",'AMap.Autocomplete', 'AMap.Geocoder', 'AMap.DistrictSearch'],
+    //   v: '1.4.4'
+    // });
+    // ------------ 通过域名判断起始的登陆页面 开始 --------------------
+    //使用login的Url
+    // const urls = [
+    //   'www.winsea.com',
+    //   'product-test.winsea.com',
+    //   'test.winsea.com',
+    //   'saas.winsea.com',
+    //   'saas-test.winsea.com'
+    // ]
+    // urls.includes(window.location.host)
+    //   ? localStorage.setItem('ws_login_type', 2)
+    //   : localStorage.removeItem('ws_login_type')
 
 // ------------ 通过域名判断起始的登陆页面 结束 --------------------
 
 var vue = new Vue({
-  el: '#app',
-  router,
-  store,
-  i18n,
-  render: h => h(App)
+    el: '#app',
+    router,
+    store,
+    i18n,
+    render: h => h(App)
 })
 
 // 初始化通知监听
 notification.init(vue, localStorage.getItem('ws-pf_userId'))
-notification.start()
+notification.start()

src/model/defalutConfig/indexRx.js

@@ -9,10 +9,23 @@ const instance = axios.create({
 
 instance.interceptors.request.use(
   (config) => {
-    // console.info(config.url, 'config.url')
-    if (ignoreUrl.indexOf(config.url) === -1) {
-      EventBus.$emit('showLoading')
+    if(config.params){
+      if(config.params.loadingstatus){
+        // EventBus.$emit('hideLoading')
+      }else{
+        if (ignoreUrl.indexOf(config.url) === -1) {
+          EventBus.$emit('showLoading')
+        }
+      }
+    }else{
+      if (ignoreUrl.indexOf(config.url) === -1) {
+        EventBus.$emit('showLoading')
+      }
     }
+    
+    // console.info(config.url, 'config.url')
+    console.log(config, 'config.url')
+    
     return config
   },
   (error) => {

src/model/home/index.js

@@ -10,6 +10,7 @@ import { API_GET_NOTICE_QUERY_NOTICENUMBER } from '@/api/V2/notice'
 
 import {
   API_GET_GETCHARTSDATA,
+  API_GET_CLEARCACHE
 } from '@/api/V2/charts'
 import {
   API_GET_ANNOUNCEMENTISSUE_QUERY_QUERYHOMEPAGE,
@@ -27,4 +28,5 @@ export const getCurrentUserInfo = appRx.get(API_GET_GETCURRENTUSERINFO, errorCat
 
 export const getStaffHomeShowList = appRx.get(API_GET_GETSTAFFHOMESHOWLIST, errorCatcher, errorHandle, filter)
 export const gChartsData = appRx.get(API_GET_GETCHARTSDATA, errorCatcher, errorHandle, filter)
+export const clearCache = appRx.get(API_GET_CLEARCACHE, errorCatcher, errorHandle, filter)
 export const getAdminId = appRx.post(API_GET_ADMINID, errorCatcher, errorHandle, filter)

src/model/houseSelfCollect/index.js

@@ -54,8 +54,13 @@ import {
   API_POST_INSPECT_GETWEIGHTDELETE,
   API_POST_SUSPENDINSTANCE,
   API_POST_IMPORT,
+  API_POST_IMPORT_YK,
   API_GET_INSPECT_CONTRACTNO,
-  API_GET_SETTLEACCOUT
+  API_GET_SETTLEACCOUT,
+  API_POST_RETURN,
+  API_POST_SUBMIT,
+  API_POST_CHANE_NO,
+  API_POST_DELETE
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -165,5 +170,15 @@ export const workflowcontent = appRx.get(API_POST_WORKFLOW_TASK, errorCatcher, e
 export const suspendinstance = appRx.post(API_POST_SUSPENDINSTANCE, errorCatcher, errorHandle, filter)
 // 导入
 export const importWord = appRx.post(API_POST_IMPORT, errorCatcher, errorHandle, filter)
+// 导入移库
+export const importWordYk = appRx.post(API_POST_IMPORT_YK, errorCatcher, errorHandle, filter)
 // 查看结算单
 export const getsettleaccout = appRx.get(API_GET_SETTLEACCOUT, errorCatcher, errorHandle, filter)
+// 退回
+export const returnInfo = appRx.post(API_POST_RETURN, errorCatcher, errorHandle, filter)
+// 删除
+export const deleteInfo = appRx.post(API_POST_DELETE, errorCatcher, errorHandle, filter)
+// 新检斤保存
+export const newSubmit = appRx.post(API_POST_SUBMIT, errorCatcher, errorHandle, filter)
+// 换仓
+export const changeNo = appRx.post(API_POST_CHANE_NO, errorCatcher, errorHandle, filter)

src/model/material/index.js

@@ -196,7 +196,6 @@ export const getFileList = appRx.get(API_GET_FILE_LIST, errorCatcher, errorHandl
 export const materielPartInfoInsert = appRx.post(API_POST_MA_INSERT, errorCatcher, errorHandle, filter)
 export const materielPartInfoUpdate = appRx.post(API_POST_MA_SAVE, errorCatcher, errorHandle, filter)
 export const createOrUpdateParameterList = appRx.post(API_POST_MA_CREATE_UPDATE, errorCatcher, errorHandle, filter)
-export const getMaterielType = appRx.get(API_GET_MA_TYPE_INFO, errorCatcher, errorHandle, filter)
 export const selectMaterielPartInfoPage = appRx.get(API_GET_MA_PART_INFO, errorCatcher, errorHandle, filter)
 export const deleteSupplyMaterielInfo = appRx.post(API_POST_MA_PART_DELETE, errorCatcher, errorHandle, filter)
 export const auditSupplyMaterielInfo = appRx.post(API_POST_MA_PART_AUDIT, errorCatcher, errorHandle, filter)

src/model/outboundManagement/index.js

@@ -20,8 +20,15 @@ import {
     API_POST_COLLECTION_EDITCOLLECT,
     API_POST_COLLECTION_ADDREMARKS,
     API_POST_COLLECTION_MONEY,
-    API_GET_INSPECT_CONTRANCLISTWEIGHING
-
+    API_GET_INSPECT_CONTRANCLISTWEIGHING,
+    API_POST_NEW_SUBMIT,
+    API_POST_CHANE_NO,
+    API_POST_IMPORT_SALE,
+    API_POST_IMPORT_YK,
+    API_POST_GO_BACK,
+    API_GAT_INFO,
+    API_GET_TRANTASK,
+    API_GET_WEIGHT
 }   from '@/api/V2/outboundManagement'
 
   //质检列表
@@ -61,4 +68,18 @@ export const getcollection = appRx.get(API_GET_COLLECTION_LIST, errorCatcher, er
 //编辑实际应收
 export const editcollect = appRx.post(API_POST_COLLECTION_EDITCOLLECT, errorCatcher, errorHandle, filter)
 //添加备注
-export const remarksAdd = appRx.post(API_POST_COLLECTION_ADDREMARKS, errorCatcher, errorHandle, filter)
+export const remarksAdd = appRx.post(API_POST_COLLECTION_ADDREMARKS, errorCatcher, errorHandle, filter)
+//新检斤保存
+export const newSubmit = appRx.post(API_POST_NEW_SUBMIT, errorCatcher, errorHandle, filter)
+// 换仓
+export const changeNo = appRx.post(API_POST_CHANE_NO, errorCatcher, errorHandle, filter)
+// 退回
+export const goBack = appRx.post(API_POST_GO_BACK, errorCatcher, errorHandle, filter)
+// 导入销售出库
+export const importWordSale = appRx.post(API_POST_IMPORT_SALE, errorCatcher, errorHandle, filter)
+// 导入移库出库
+export const importWordYk = appRx.post(API_POST_IMPORT_YK, errorCatcher, errorHandle, filter)
+// 导入移库出库
+export const getInfo = appRx.get(API_GAT_INFO, errorCatcher, errorHandle, filter)
+// 是否创建运输任务
+export const gettask = appRx.get(API_GET_TRANTASK, errorCatcher, errorHandle, filter)

src/model/profitable/index.js

@@ -10,6 +10,32 @@ import {
   API_POST_EDITINFO,
   API_POST_WORKFLOW_API_HANDLE,
   API_POST_AUDITRECORD,
+  API_GET_WAREHOUSE,
+  API_GET_LOOK,
+  API_POST_SUBMIT,
+  API_POST_SHOUGUAN,
+  API_POST_SUBMITPAY,
+  API_GET_WAREHOUSE_NO,
+  API_GET_EXPENSEINFO,
+  API_SET_EXPENSEINFO,
+  API_GET_SELECTWAREHOUSINGORDER,
+  API_EDIT_EXPENSEINFO,
+  API_LOOK_EXPENSEINFO,
+  API_DEL_EXPENSEINFO,
+  API_DEL_ALLOCATIONINFO,
+  API_PAYMNET,
+  API_GET_CONTRACTEXPENSEINFO,
+  API_GET_CONTRACTDETAILS,
+  API_GET_INVENTORYINFO,
+  API_GET_WAREHOUSETAILS,
+  API_EXPENSECHAT,
+  API_EXPENSECHATLIST,
+  API_GET_CONTRACTCHART,
+  API_GET_WAREHOUSECHART,
+  API_DEL_ONE_ALLOCATIONINFO,
+  API_EXPENSECOUNT,
+  API_PAYEEINFO,
+  API_BUYPAYEEINFO
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -29,3 +55,55 @@ export const getLookInfo = appRx.get(API_GET_LOOKINFO, errorCatcher, errorHandle
 export const woekflowhandle = appRx.post(API_POST_WORKFLOW_API_HANDLE, errorCatcher, errorHandle, filter)
 // 审核记录
 export const getAuditRecord = appRx.get(API_POST_AUDITRECORD, errorCatcher, errorHandle, filter)
+// 仓库
+export const getwarehouse= appRx.get(API_GET_WAREHOUSE, errorCatcher, errorHandle, filter)
+// 费用管理提交
+export const setexpense = appRx.post(API_POST_SUBMIT, errorCatcher, errorHandle, filter)
+// 合同编号下拉
+export const getcontract = appRx.get(API_GET_WAREHOUSE_NO, errorCatcher, errorHandle, filter)
+// 费用管理提交
+export const expenseLook = appRx.post(API_GET_LOOK, errorCatcher, errorHandle, filter)
+// 费用管理付款确认付款
+export const expensepay= appRx.post(API_POST_SUBMITPAY, errorCatcher, errorHandle, filter)
+// 费用管理编辑 、 收款、付款
+export const expenseshougou= appRx.post(API_POST_SHOUGUAN, errorCatcher, errorHandle, filter)
+// 费用详情列表
+export const getexenseinfo= appRx.get(API_GET_EXPENSEINFO, errorCatcher, errorHandle, filter)
+// 费用管理请款收款
+export const addexenseinfo= appRx.post(API_SET_EXPENSEINFO, errorCatcher, errorHandle, filter)
+// 获取仓库的入库单
+export const getwarehousingorder= appRx.get(API_GET_SELECTWAREHOUSINGORDER, errorCatcher, errorHandle, filter)
+// 费用管理编辑、分配、完成、确认收款、确认分配
+export const editexenseinfo= appRx.post(API_EDIT_EXPENSEINFO, errorCatcher, errorHandle, filter)
+// 查看
+export const lookexenseinfo= appRx.get(API_LOOK_EXPENSEINFO, errorCatcher, errorHandle, filter)
+// 费用管理删除
+export const delexenseinfo= appRx.post(API_DEL_EXPENSEINFO, errorCatcher, errorHandle, filter)
+// 费用管理分配删除
+export const delallocationinfo= appRx.post(API_DEL_ALLOCATIONINFO, errorCatcher, errorHandle, filter)
+// 费用管理分配编辑单条删除
+export const deloneallocationinfo= appRx.post(API_DEL_ONE_ALLOCATIONINFO, errorCatcher, errorHandle, filter)
+// 费用管理付款
+export const expensepayment= appRx.post(API_PAYMNET, errorCatcher, errorHandle, filter)
+// 合同费用，库点费用
+export const getcontractexpenseinfo= appRx.get(API_GET_CONTRACTEXPENSEINFO, errorCatcher, errorHandle, filter)
+// 合同利润详情
+export const getcontractdetails= appRx.get(API_GET_CONTRACTDETAILS, errorCatcher, errorHandle, filter)
+// 合同库存、收购库存
+export const getinventoryinfo= appRx.get(API_GET_INVENTORYINFO, errorCatcher, errorHandle, filter)
+// 合同利润图表
+export const getcontractchart= appRx.get(API_GET_CONTRACTCHART, errorCatcher, errorHandle, filter)
+// 库点利润详情
+export const getwarehousedetails= appRx.get(API_GET_WAREHOUSETAILS, errorCatcher, errorHandle, filter)
+// 库点利润图表
+export const getwarehousechart= appRx.get(API_GET_WAREHOUSECHART, errorCatcher, errorHandle, filter)
+// 费用管理图表
+export const getexpensechat= appRx.get(API_EXPENSECHAT, errorCatcher, errorHandle, filter)
+// 费用管理收支表
+export const getexpensechatlist= appRx.get(API_EXPENSECHATLIST, errorCatcher, errorHandle, filter)
+// 当天提交的费用条数
+export const getexpensecount= appRx.get(API_EXPENSECOUNT, errorCatcher, errorHandle, filter)
+// 采购账户信息
+export const getpayeeinfo= appRx.get(API_PAYEEINFO, errorCatcher, errorHandle, filter)
+// 收购账户信息
+export const getbuypayeeinfo= appRx.get(API_BUYPAYEEINFO, errorCatcher, errorHandle, filter)

src/model/supply/index.js

@@ -292,8 +292,6 @@ export const sparepartOutStoreInfoCancelBill = appRx.post(API_POST_SUPPLYSPAREPA
 export const selectParameterStatus = appRx.get(API_GET_PURCHASEPARAMETERSTATUS_SELECTLIST, errorCatcher, errorHandle, filter)
 // 根据公司ID获取船舶数据
 export const getAppShips = appRx.get(API_GET_VESSEL_GETUSERVESSELLISTBYSTATUS, errorCatcher, errorHandle, filter)
-// 获取物料类型
-export const getMaterielType = appRx.get(API_GET_SUPPLYMATERIELTYPEINFO_SELECTLISTMATERIELTYPE, errorCatcher, errorHandle, filter)
 // 船载物料 -> 分页查询
 export const selectMaterielPartInfoPage = appRx.get(API_GET_SUPPLYMATERIELPARTINFO_SELECTPAGE, errorCatcher, errorHandle, filter)
 // 设备管理 -> 设备管理-删除

src/model/tasksport/index.js

@@ -25,7 +25,12 @@ import {
     API_POST_DEL_HAULAGE_STAGE,
     API_GET_STAFF,
     API_GET_TASKHISTORIES,
-    API_POST_WORKFLOW_TASK
+    API_POST_WORKFLOW_TASK,
+    API_EDIT_SOURCEOFGOODS,
+    API_GET_SOURCEGOOD,
+    API_SET_CORRECT,
+    API_GET_SOURCEOFGOODS,
+    API_GET_GOODSOURCEINFO
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -74,4 +79,14 @@ export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatch
 //查询审核记录
 export const gettaskhistories = appRx.get(API_GET_TASKHISTORIES, errorCatcher, errorHandle, filter)
 //获取发货人
-export const getstaff = appRx.get(API_GET_STAFF, errorCatcher, errorHandle, filter)
+export const getstaff = appRx.get(API_GET_STAFF, errorCatcher, errorHandle, filter)
+//货源提交编辑
+export const editSourceOfGoods = appRx.post(API_EDIT_SOURCEOFGOODS, errorCatcher, errorHandle, filter)
+//货源查看
+export const getSourceOfGoods = appRx.get(API_GET_SOURCEGOOD, errorCatcher, errorHandle, filter)
+// 退库货源列表
+export const getSourceOfGoodslist = appRx.get(API_GET_SOURCEOFGOODS, errorCatcher, errorHandle, filter)
+//矫正
+export const setcorrect = appRx.post(API_SET_CORRECT, errorCatcher, errorHandle, filter)
+//出库货源列表
+export const getSourceOfGoodsinfo = appRx.get(API_GET_GOODSOURCEINFO, errorCatcher, errorHandle, filter)

src/model/warehouse/index.js

@@ -43,7 +43,7 @@ import {
     API_GET_PRINT,
     API_POST_EXPORTOUT,
     API_GET_WAREHOUSE_BINNUMBER,
-
+    API_POST_EXPORTHISTORICALINVENTORY,
     API_GET_WAREHOUSE_BASEINFO_RESERVES,
     API_GET_TURNAROUND_LIST,
     API_POST_TURNAROUND_ADD,
@@ -53,7 +53,14 @@ import {
     API_POST_WAREHOUSE_INWEIGHT,
     API_GET_WAREHOUSE_ALL,
     API_SEND_BACK,
-    API_DELETE_WAREHOUSE
+    API_DELETE_WAREHOUSE,
+    API_GET_WAREHOUSENAME,
+    API_GET_WAREHOUSINGORDER,
+    API_EDIT_WAREHOUSINGORDER,
+    API_SET_PAYMONEY,
+    API_WORKFLOWHANDLE,
+    API_GET_EXPENSE
+    // API_GET_EXPENSEINFO
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -137,6 +144,8 @@ export const getReceiptTaskNo = appRx.get(API_GET_RECEIPTTASKNO,errorCatcher, er
 export const postExport = appRx.post(API_POST_EXPORT)
 //导出出库
 export const postExportOut = appRx.post(API_POST_EXPORTOUT)
+//导出历史库存记录
+export const exportHistoricalInventory = appRx.post(API_POST_EXPORTHISTORICALINVENTORY)
 //打印增量
 export const printAdd = appRx.get(API_GET_PRINT,errorCatcher, errorHandle, filter)
 //仓位号
@@ -161,4 +170,17 @@ export const  getWarehouseAll = appRx.get(API_GET_WAREHOUSE_ALL, errorHandle, fi
 export const sendback = appRx.post(API_SEND_BACK,errorCatcher, errorHandle, filter)
 //删除
 export const postdeletewarehouse = appRx.post(API_DELETE_WAREHOUSE,errorCatcher, errorHandle, filter)
-
+//查看自己负责的仓库
+export const getwarehousName = appRx.get(API_GET_WAREHOUSENAME,errorCatcher, errorHandle, filter)
+//入库单列表
+export const getwarehousingorder = appRx.get(API_GET_WAREHOUSINGORDER,errorCatcher, errorHandle, filter)
+//盘盈、盘亏/入库重量
+export const editwarehousingorder = appRx.post(API_EDIT_WAREHOUSINGORDER,errorCatcher, errorHandle, filter)
+//请款，收款
+export const paymoney = appRx.post(API_SET_PAYMONEY,errorCatcher, errorHandle, filter)
+//审核
+export const workflowhandle = appRx.post(API_WORKFLOWHANDLE,errorCatcher, errorHandle, filter)
+// //费用详情
+// export const getexenseinfo = appRx.get(API_GET_EXPENSEINFO,errorCatcher, errorHandle, filter)
+//查看可分配金额
+export const getExpense = appRx.get(API_GET_EXPENSE,errorCatcher, errorHandle, filter)

src/permission.js

@@ -18,6 +18,7 @@ router.beforeEach(async (to, _, next) => {
 
   // 用户刷新页面，localStorage还在，但vuex.store里的东西会reset
   const hasToken = getToken();
+  console.log(hasToken)
   if (hasToken) {
     if (whiteList.includes(to.path)) {
       next({
@@ -25,7 +26,9 @@ router.beforeEach(async (to, _, next) => {
       });
       NProgress.done();
     } else {
+      console.log(store.getters.token)
       if (!store.getters.token) {
+        console.log(to)
         // 首次以及用户手动刷新，token都会还原回空字符串
         const accessRoutes = await store.dispatch('permission/generateRoutes');
         router.addRoutes(accessRoutes);
@@ -66,6 +69,7 @@ router.beforeEach(async (to, _, next) => {
         }
         next();
       } else {
+
         if (!whiteList.includes(to.path)) {
           checkLoginUser();
         }

src/router/index.js

@@ -67,13 +67,13 @@ export const constantRoutes = [
     path: '/',
     component: Layout,
     redirect: { name: 'home' },
-    meta: { title: 'home', icon: '-index-copy' },
+    meta: { title: 'home', icon: '-index-copy',showClick:true },
     children: [
       {
         path: 'home',
         component: () => page('home'),
         name: 'home',
-        meta: { title: 'home', icon: '-index-copy', affix: true, auth: 'homePage' },
+        meta: { title: 'home', icon: '-index-copy', affix: true, auth: 'homePage',_title:'首页' },
         hidden: true
       }
     ]
@@ -96,7 +96,8 @@ export const constantRoutes = [
           title: 'work',
           noCache: true,
           affix: true,
-          auth: 'workTask'
+          auth: 'workTask',
+          _title:'任务'
         }
       },
       {
@@ -108,7 +109,8 @@ export const constantRoutes = [
           title: 'message',
           noCache: true,
           affix: true,
-          auth: 'workInformation'
+          auth: 'workInformation',
+          _title:'消息'
         }
       }
     ]
@@ -143,6 +145,25 @@ export function resetRouter() {
   router.matcher = newRouter.matcher // reset router
 }
 router.beforeEach(async (to, from, next) => {
+  console.log(to,from,111111111111111111,store.getters.openRoute)
+  var arr=store.getters.openRoute
+  if(to.meta._title){
+    var arr1=arr.find(function(item1,index,arr){
+        return item1.title==to.meta._title
+    });
+    if(!arr1){
+      console.log(to.meta._title)
+      arr.push({title:to.meta._title,showClick:false,path:to.path,query: to.query})
+    }
+    for (let i = 0; i < arr.length; i++) {
+      arr[i].showClick=false
+      if(arr[i].title==to.meta._title){
+        arr[i].showClick=true
+        arr[i].query=to.query
+      }
+    }
+  }
+  
   // const { roles, isTrainDialog, guideInfo } = store.getters
   const { roles } = store.getters
   if (roles && roles.length && to.path !== '/help') {

src/store/getters.js

@@ -26,7 +26,7 @@ const getters = {
   showMenu: state => state.commonStore.showMenu,
   showTheme: state => state.commonStore.showTheme,
   showSearch: state => state.commonStore.showSearch,
-
+  openRoute: state => state.user.openRoute,
   sidebar: state => state.app.sidebar,
   language: state => state.app.language,
   size: state => state.app.size,

src/store/modules/permission.js

@@ -127,7 +127,7 @@ const actions = {
       .catch((err) => {
         clearStorage()
         resetRouter()
-        window.location.href="https://www.eliangeyun.com"
+        // window.location.href="https://www.eliangeyun.com"
       })
         
       const roles = [];

src/store/modules/user.js

@@ -18,6 +18,7 @@ const state = {
   token: '',
   name: '',
   avatar: '',
+  openRoute:[],
   companyId: getCompanyId(),
   introduction: '',
   roles: [],
@@ -62,6 +63,10 @@ const mutations = {
   SET_ROLES: (state, roles) => {
     state.roles = roles
   },
+  SET_OPEN_ROUTE: (state, openRoute) => {
+    console.log(state, openRoute)
+    state.openRoute = openRoute
+  },
   SET_COMPANY: (state, companyId) => {
     state.companyId = companyId
   },

src/styles/media.scss

@@ -55,7 +55,7 @@
   .winseaview-main {
     width: calc(100% - 60px);
     left: 60px;
-    height: calc(100% - 40px);
+    height: calc(100% - 100px);
   }
 }
 
@@ -71,7 +71,7 @@
   left: 200px;
   padding: 0;
   width: calc(100% - 200px);
-  height: calc(100% - 40px);
+  height: calc(100% - 100px);
   box-sizing: border-box;
   .el-tabs__item {
     color: #999999;
@@ -167,7 +167,7 @@
   .winseaview-main {
     left: 0;
     width: 100%;
-    height: calc(100% - 40px);
+    height: calc(100% - 100px);
   }
   .winseaview-header {
     // margin-bottom: 15px;
@@ -185,7 +185,7 @@
     .winseaview-main {
       left: $width;
       width: 100%;
-      height: calc(100% - 40px);
+      height: calc(100% - 100px);
     }
     .winseaview-header {
       padding: 0;

src/utils/index.js

@@ -91,3 +91,34 @@ export function debounce (func, wait, immediate) {
   }
 }
 
+export function formatTime(time, fmt) {
+  if (!time) return '';
+  else {
+    const date = new Date(time);
+    const o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'H+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds(),
+      'q+': Math.floor((date.getMonth() + 3) / 3),
+      S: date.getMilliseconds(),
+    };
+    if (/(y+)/.test(fmt))
+      fmt = fmt.replace(
+        RegExp.$1,
+        (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+      );
+    for (const k in o) {
+      if (new RegExp('(' + k + ')').test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          RegExp.$1.length === 1
+            ? o[k]
+            : ('00' + o[k]).substr(('' + o[k]).length)
+        );
+      }
+    }
+    return fmt;
+  }
+}

src/utils/map/xzqCode.js

@@ -0,0 +1,217 @@
+/*
+ * @Author: daidai
+ * @Date: 2022-03-02 09:51:44
+ * @LastEditors: daidai
+ * @LastEditTime: 2022-03-02 09:51:45
+ * @FilePath: \web-pc\src\pages\big-screen\utils\map\xzqCode.js
+ */
+   //获取中国行政区 code
+//    AMap.plugin("AMap.DistrictSearch", function () {
+//     var districtSearch = new AMap.DistrictSearch({
+//       // 关键字对应的行政区级别，country表示国家
+//       level: "country",
+//       //  显示下级行政区级数，1表示返回下一级行政区
+//       subdistrict: 1,
+//     });
+//     let xzqCode = {};
+//     // 搜索所有省/直辖市信息
+//     districtSearch.search("中国", function (status, result) {
+//       // console.log(result);
+//       result.districtList[0].districtList.forEach((item) => {
+//         // console.log(item);
+//         xzqCode[item.name] = {
+//           adcode: item.adcode,
+//           level: item.level,
+//           name: item.name,
+//         };
+//       });
+//     });
+//     xzqCode["中国"] = {
+//       adcode: "100000",
+//       level: "country",
+//       name: "中华人民共和国",
+//     };
+//     setTimeout(() => {
+//     console.log(JSON.stringify(xzqCode),);
+
+//     }, 1000);
+//   });
+
+
+export default {
+    "中国": {
+        "adcode": "100000",
+        "level": "country",
+        "name": "中华人民共和国"
+    },
+    "新疆维吾尔自治区": {
+        "adcode": "650000",
+        "level": "province",
+        "name": "新疆维吾尔自治区"
+    },
+    "湖北省": {
+        "adcode": "420000",
+        "level": "province",
+        "name": "湖北省"
+    },
+    "辽宁省": {
+        "adcode": "210000",
+        "level": "province",
+        "name": "辽宁省"
+    },
+    "广东省": {
+        "adcode": "440000",
+        "level": "province",
+        "name": "广东省"
+    },
+    "内蒙古自治区": {
+        "adcode": "150000",
+        "level": "province",
+        "name": "内蒙古自治区"
+    },
+    "黑龙江省": {
+        "adcode": "230000",
+        "level": "province",
+        "name": "黑龙江省"
+    },
+    "河南省": {
+        "adcode": "410000",
+        "level": "province",
+        "name": "河南省"
+    },
+    "山东省": {
+        "adcode": "370000",
+        "level": "province",
+        "name": "山东省"
+    },
+    "陕西省": {
+        "adcode": "610000",
+        "level": "province",
+        "name": "陕西省"
+    },
+    "贵州省": {
+        "adcode": "520000",
+        "level": "province",
+        "name": "贵州省"
+    },
+    "上海市": {
+        "adcode": "310000",
+        "level": "province",
+        "name": "上海市"
+    },
+    "重庆市": {
+        "adcode": "500000",
+        "level": "province",
+        "name": "重庆市"
+    },
+    "西藏自治区": {
+        "adcode": "540000",
+        "level": "province",
+        "name": "西藏自治区"
+    },
+    "安徽省": {
+        "adcode": "340000",
+        "level": "province",
+        "name": "安徽省"
+    },
+    "福建省": {
+        "adcode": "350000",
+        "level": "province",
+        "name": "福建省"
+    },
+    "湖南省": {
+        "adcode": "430000",
+        "level": "province",
+        "name": "湖南省"
+    },
+    "海南省": {
+        "adcode": "460000",
+        "level": "province",
+        "name": "海南省"
+    },
+    "江苏省": {
+        "adcode": "320000",
+        "level": "province",
+        "name": "江苏省"
+    },
+    "青海省": {
+        "adcode": "630000",
+        "level": "province",
+        "name": "青海省"
+    },
+    "广西壮族自治区": {
+        "adcode": "450000",
+        "level": "province",
+        "name": "广西壮族自治区"
+    },
+    "宁夏回族自治区": {
+        "adcode": "640000",
+        "level": "province",
+        "name": "宁夏回族自治区"
+    },
+    "浙江省": {
+        "adcode": "330000",
+        "level": "province",
+        "name": "浙江省"
+    },
+    "河北省": {
+        "adcode": "130000",
+        "level": "province",
+        "name": "河北省"
+    },
+    "香港特别行政区": {
+        "adcode": "810000",
+        "level": "province",
+        "name": "香港特别行政区"
+    },
+    "台湾省": {
+        "adcode": "710000",
+        "level": "province",
+        "name": "台湾省"
+    },
+    "澳门特别行政区": {
+        "adcode": "820000",
+        "level": "province",
+        "name": "澳门特别行政区"
+    },
+    "甘肃省": {
+        "adcode": "620000",
+        "level": "province",
+        "name": "甘肃省"
+    },
+    "四川省": {
+        "adcode": "510000",
+        "level": "province",
+        "name": "四川省"
+    },
+    "天津市": {
+        "adcode": "120000",
+        "level": "province",
+        "name": "天津市"
+    },
+    "江西省": {
+        "adcode": "360000",
+        "level": "province",
+        "name": "江西省"
+    },
+    "云南省": {
+        "adcode": "530000",
+        "level": "province",
+        "name": "云南省"
+    },
+    "山西省": {
+        "adcode": "140000",
+        "level": "province",
+        "name": "山西省"
+    },
+    "北京市": {
+        "adcode": "110000",
+        "level": "province",
+        "name": "北京市"
+    },
+    "吉林省": {
+        "adcode": "220000",
+        "level": "province",
+        "name": "吉林省"
+    }
+}

src/utils/util.js

@@ -199,25 +199,41 @@ export const fullscreenEnable = () => {
  * 浏览器全屏
  */
 export const reqFullScreen = () => {
-  if (document.documentElement.requestFullScreen) {
-    document.documentElement.requestFullScreen();
-  } else if (document.documentElement.webkitRequestFullScreen) {
-    document.documentElement.webkitRequestFullScreen();
-  } else if (document.documentElement.mozRequestFullScreen) {
-    document.documentElement.mozRequestFullScreen();
+  let _documentDom = document.getElementById('index')
+  if (_documentDom.requestFullScreen) {
+    _documentDom.requestFullScreen();
+  } else if (_documentDom.webkitRequestFullScreen) {
+    _documentDom.webkitRequestFullScreen();
+  } else if (_documentDom.mozRequestFullScreen) {
+    _documentDom.mozRequestFullScreen();
   }
+  // if (document.documentElement.requestFullScreen) {
+  //   document.documentElement.requestFullScreen();
+  // } else if (document.documentElement.webkitRequestFullScreen) {
+  //   document.documentElement.webkitRequestFullScreen();
+  // } else if (document.documentElement.mozRequestFullScreen) {
+  //   document.documentElement.mozRequestFullScreen();
+  // }
 };
 /**
  * 浏览器退出全屏
  */
 export const exitFullScreen = () => {
-  if (document.documentElement.requestFullScreen) {
+  let _documentDom = document.getElementById('contentView')
+    if (_documentDom.requestFullScreen) {
     document.exitFullScreen();
-  } else if (document.documentElement.webkitRequestFullScreen) {
+  } else if (_documentDom.webkitRequestFullScreen) {
     document.webkitCancelFullScreen();
-  } else if (document.documentElement.mozRequestFullScreen) {
+  } else if (_documentDom.mozRequestFullScreen) {
     document.mozCancelFullScreen();
   }
+  // if (document.documentElement.requestFullScreen) {
+  //   document.exitFullScreen();
+  // } else if (document.documentElement.webkitRequestFullScreen) {
+  //   document.webkitCancelFullScreen();
+  // } else if (document.documentElement.mozRequestFullScreen) {
+  //   document.mozCancelFullScreen();
+  // }
 };
 /**
  * 递归寻找子类的父类

src/views/contractManagement/acquisitionContract.vue

@@ -0,0 +1,1023 @@
+<!--现货采购合同-->
+<!--2019年5月30日 20:25:16 by jlx-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="8">
+      <template slot="left">
+        <ws-button type="primary" @click="handleAdd()"
+          v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
+        <ws-button @click="exportlist()" v-hasPermission="
+            `contractManagement.buyContract.buyContractInfo.view`
+          ">导出</ws-button>
+      </template>
+      <template slot="right">
+        <span style="width: 142px; display: inline-block; color: #8890b1">状态：</span>
+        <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selecttaskType"
+          :value="searchType">
+          <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
+        </ws-select>
+        <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
+        </el-date-picker>
+        <el-input v-model="searchKeyWord" placeholder="可按照合同编号、买方名称、卖方名称进行查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></el-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
+      </template>
+    </BaseHeaderLayout>
+    <el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px"
+      height="calc(100% - 105px)">
+      <el-table-column type="index" label="序号">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="contractNo" label="合同编号" width="150">
+      </el-table-column>
+      <el-table-column prop="goodsName" label="货名" width="80">
+      </el-table-column>
+      <!-- <el-table-column prop="grade" label="品级" width="80">
+        <template slot-scope="scope">
+          <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+            scope.row.grade
+          }}</span>
+          <span v-if="scope.row.grade == '二等品'" class="second-class">{{
+            scope.row.grade
+          }}</span>
+          <span v-if="scope.row.grade == '三等品'" class="third-class">{{
+            scope.row.grade
+          }}</span>
+          <span v-if="scope.row.grade == '等外'" class="substandard">{{
+            scope.row.grade
+          }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
+      <el-table-column width='130' prop="unitContractPrice" label="合同单价（元）">
+      </el-table-column>
+      <!-- <el-table-column prop="packingMethod" label="包装方式"> </el-table-column> -->
+      <el-table-column prop="buyer" label="收购方"> </el-table-column>
+      <el-table-column prop="seller" label="合营方"> </el-table-column>
+      <el-table-column width='120' prop="completedQuantity" label="已完成（吨）">
+        <template slot-scope="scope">
+          <span style="color: #5473e8; font-weight: 600">{{
+            scope.row.completedQuantity
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width='150' prop="status" label="状态">
+        <template slot-scope="scope">
+          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
+            <!-- <span v-if="scope.row.approveStatus">{{
+              scope.row.approveStatus
+            }}</span> -->
+            <el-select v-if="scope.row.approveStatus" v-model="scope.row.approveStatus" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+            disabled
+            :value="scope.row.approveStatus">
+            <el-option label="待决策人审核" value="待决策人审核"
+              style="color: #8890b1" />
+          </el-select>
+          <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+
+            :value="scope.row.status">
+            <el-option label="待执行" value="待执行"
+              style="color: #8890b1" />
+              <el-option label="执行中" value="执行中"
+              style="color: #8890b1" />
+          </el-select>
+            <!-- <el-popover v-else placement="left" :width="285" trigger="click" visible-arrow="false"
+              @show="history(scope.row)">
+              <template>
+                <span slot="reference">
+                  <span v-if="scope.row.status == '待执行'" class="executory"></span>
+                  <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+                  <span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
+                </span>
+              </template>
+              <div>
+                <p style="margin-top: 0; padding-left: 10px">操作历史</p>
+                <div v-for="(item, index) in historyList" class="flex">
+                  <div class="vertical-text vertical-text-left">
+                    {{ item.updateDate }}
+                  </div>
+                  <div>
+                    <div class="vertical-circle"></div>
+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
+                  </div>
+                  <div class="vertical-text">
+                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                  </div>
+                </div>
+              </div>
+            </el-popover>
+            <img v-if="!scope.row.approveStatus" width="17" height="18"
+              style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
+              @click="editClick(scope.row)" alt="" /> -->
+          </div>
+          <div v-else>
+            <!-- {{scope.row.status}} -->
+            <el-select v-model="scope.row.status" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+            :value="scope.row.status"
+          >
+            <el-option v-for="item in statusList" :key="item.value" :label="item.value" :value="item.value"
+              style="color: #8890b1" />
+          </el-select>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column width='120' prop="signingDate" label="签订日期"> </el-table-column>
+      <el-table-column width='120' prop="contractExpenditure" label="合同支出"> </el-table-column>
+      <el-table-column width='120' prop="expenses" label="费用支出"> </el-table-column>
+      
+      <el-table-column width='130' prop="mildewGrain" label="已付款（元）">
+      </el-table-column>
+      <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
+      <el-table-column width='130' prop="goodsNames" label="已开发票 （元）">
+      </el-table-column>
+      <el-table-column prop="addressUrl" label="附件">
+        <template slot-scope="scope">
+          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+          <span v-if="scope.row.addressUrlArray != null">
+            {{
+              scope.row.addressUrlArray.length == 0
+                ? ''
+                : scope.row.addressUrlArray.length
+            }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="操作" width="160">
+        <template slot-scope="scope">
+           <!-- <img width="16" height="17" style="
+                vertical-align: text-top;
+                position: relative;
+                top: -1px;
+                margin: 0 6px;
+              "  src="../../../public/img/daichu.png"
+               v-hasPermission="
+              `contractManagement.nonContract.nonContractInfo.view`"
+             @click="handlecost(scope.row)" alt="" /> -->
+             
+          <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
+              `contractManagement.buyContract.buyContractInfo.view`
+            " alt="" />
+          <div v-if="
+              (scope.row.approveStatus != '待决策人审核' &&
+                !scope.row.approveStatus)
+            " style="display: inline-block">
+            <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
+              src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
+                `contractManagement.buyContract.buyContractInfo.edit`
+              " alt="" />
+          </div>
+          <img width="16" height="17" style="
+              vertical-align: text-top;
+              position: relative;
+              top: -1px;
+              margin: 0 6px;
+            " v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" src="../../../public/img/shanchu.png"
+            v-hasPermission="
+              `contractManagement.buyContract.buyContractInfo.delete`
+            " @click="handleDelete(scope.row)" alt="" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination  :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
+
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
+      <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
+  </div>
+</template>
+<script>
+  import {
+    getList,
+    export1,
+    editstatus,
+    billoperatehis,
+    deletecontract,
+    editInfo,
+    
+  } from '@/model/contarct/index'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
+    },
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
+      },
+    },
+    data() {
+      return {
+        id: '',
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        size: 10,
+        statusList:[{
+          value:'已完成',
+        },{value:'发运结束',}],
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        deliver_type: 1,
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 9999,
+        appendixIdsAdd: '',
+        searchType: 1,
+        searchTypeText: '未完成',
+        searchKeyWord: '',
+        contractType: 3,
+        goodsType: 1,
+        startDate: null,
+        endDate: null,
+        addressUrls: [],
+        accesscard: false,
+        // 提交类型
+        submitType: true,
+        deptCircularPage: {},
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
+        contractList: [],
+        deptBudgetList: {},
+        historyList: [],
+        appendixIdss: [],
+        fileList: [],
+        compId: localStorage.getItem('ws-pf_compId'),
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        accessoryTFs: false,
+        taskTypeList: [{
+            value: '未完成',
+            type: 1,
+          },
+          {
+            value: '已完成',
+            type: 2,
+          },
+          {
+            value: '全部合同',
+            type: '',
+          },
+        ],
+        pickerOptions: {
+          shortcuts: [{
+              text: '本周',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                var thisDay = start.getDay()
+                var thisDate = start.getDate()
+                if (thisDay != 0) {
+                  start.setDate(thisDate - thisDay)
+                }
+                picker.$emit('pick', [start, end])
+              },
+            },
+            {
+              text: '本月',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                start.setDate(1)
+                picker.$emit('pick', [start, end])
+              },
+            },
+            {
+              text: '本季度',
+              onClick(picker) {
+                var oDate = new Date()
+
+                var thisYear = oDate.getFullYear()
+                var thisMonth = oDate.getMonth() + 1
+
+                var n = Math.ceil(thisMonth / 3) // 季度
+
+                var Month = n * 3 - 1
+
+                var start = new Date(thisYear, Month - 2, 1)
+                var end = new Date()
+
+                picker.$emit('pick', [start, end])
+              },
+            },
+          ],
+        },
+        value1: '',
+        value2: '',
+      }
+    },
+    activated() {
+      //cg.viewBudget
+      //cg.viewSpareMoney
+      // this.getVesselData();
+      this.getList()
+      this.showType = this.isShow
+    },
+    methods: {
+      handlecost(row){
+         this.$router.push({
+          name: 'buyContractcost',
+          query: {
+            id: row.id,
+            contractNo: row.contractNo,
+            status:row.status,
+            seller:row.seller
+          },
+        })
+      },
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async (response) => {
+            this.deptBudgetList.addressUrl = response
+            this.deptBudgetList.id = this.id
+            this.deptBudgetList.flag = 1
+            editInfo(this.deptBudgetList)
+              .toPromise()
+              .then((response) => {
+                this.accessoryTFs = false
+                this.$message.success('上传成功')
+                this.getList()
+              })
+          })
+          .catch((res) => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
+      dateFormat(fmt, date) {
+        let ret
+        const opt = {
+          'Y+': date.getFullYear().toString(), // 年
+          'm+': (date.getMonth() + 1).toString(), // 月
+          'd+': date.getDate().toString(), // 日
+          'H+': date.getHours().toString(), // 时
+          // "M+": date.getMinutes().toString(),         // 分
+          // "S+": date.getSeconds().toString()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
+        }
+        for (let k in opt) {
+          ret = new RegExp('(' + k + ')').exec(fmt)
+          if (ret) {
+            fmt = fmt.replace(
+              ret[1],
+              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+            )
+          }
+        }
+        return fmt
+      },
+
+      handleClose() {
+        this.dialogViewSpareMoney = false
+      },
+      selectstatuschange(e,row){
+        var data={}
+        if(e=='发运结束'){
+          data={id: row.id,endFlag:1}
+        }else{
+          data={id: row.id}
+        }
+        this.$confirm(`是否将状态改为${e}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editstatus(data)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            row.status=row.currectstatus
+            return false
+          })
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      getList() {
+        getList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            contractType: this.contractType,
+            goodsType: this.goodsType,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchType: this.searchType,
+            searchKeyWord: this.searchKeyWord,
+            startDate: this.startDate,
+            endDate: this.endDate,
+            contrPage: this.contrPage,
+          })
+          .toPromise()
+          .then((response) => {
+            for (var i = 0; i < response.records.length; i++) {
+              if(response.records[i].status){
+                response.records[i].currectstatus=response.records[i].status
+              }
+              if (response.records[i].completedQuantity) {
+                response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
+              }
+
+              if (response.records[i].addressUrl != null) {
+                if (response.records[i].addressUrl) {
+                  response.records[i].addressUrlArray =
+                    response.records[i].addressUrl.split(',')
+                }
+              } else {
+                response.records[i].addressUrlArray = []
+              }
+            }
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+            this.contractList = response
+            for (var i = 0; i < response.records.length; i++) {
+              var arr = new Array()
+              this.addressUrls[i] = new Array()
+              if (this.contractList.records[i].addressUrl != null) {
+                arr = this.contractList.records[i].addressUrl.split(',')
+                this.addressUrls[i] = arr
+              }
+            }
+          })
+      },
+      // 上传附件
+      uploadSuccess(data, files, url) {
+        console.log(data, files, url)
+
+        // this.deptBudgetList.
+        // this.formData.append('files', files)
+        // this.feedbackObj.uploadNameAttachment = data.appendixName
+        // this.feedbackObj.pathUploadAttachment = data.appendixPath
+        // // this.newAppendixs = files
+        // this.onChangeFlag = true
+      },
+      editClick(row) {
+        var status = ''
+        if (row.status == '待执行' || row.status == '已完成') {
+          status = '执行中'
+        } else if (row.status == '执行中'||row.status == '发运结束') {
+          status = '已完成'
+        }
+        this.$confirm(`是否将状态改为${status}`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editstatus({
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+
+            return false
+          })
+      },
+      selecttaskType(e) {
+        for (var i = 0; i < this.taskTypeList.length; i++) {
+          if (this.taskTypeList[i].value == e) {
+            this.searchType = this.taskTypeList[i].type
+            this.find()
+          }
+        }
+      },
+      fujian(row) {
+        this.id = row.id
+        this.accessoryTFs = true
+        this.appendixIdss = row.addressUrl
+        console.log(this.appendixIdss)
+      },
+      handleExamine(row) {
+        console.log(row)
+        this.$router.push({
+          name: 'acquisitionContractExamine',
+          query: {
+            id: row.id,
+            status: row.status,
+          },
+        })
+      },
+      handleAdd() {
+        this.$router.push({
+          path: 'acquisitionContractAdd',
+        })
+      },
+      handleEdit(row) {
+        this.$router.push({
+          name: 'acquisitionContractEdit',
+          query: {
+            id: row.id,
+          },
+        })
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      history(row) {
+        console.log(row)
+        billoperatehis({
+            id: row.id,
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      find() {
+        if (this.value2) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.currentPage = 1
+        this.getList()
+      },
+      async exportlist() {
+        const {
+          data
+        } = await export1({
+          compId: localStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          goodsType: this.goodsType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        }, {}, {
+          responseType: 'blob',
+        }).toPromise()
+        downloadFile({
+          res: data,
+          fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+          type: 'xls',
+        })
+      },
+      // deletecontract(){},
+      //删除
+      handleDelete(row) {
+        var text = ''
+        if (row.deliverType == 1) {
+          text =
+            '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
+        } else {
+          text = '合同删除后不可恢复，是否继续删除？'
+        }
+        this.$confirm(text, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            deletecontract({
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '删除成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {})
+          })
+          .catch(() => {
+            return false
+          })
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .flex {
+    display: flex;
+  }
+
+  .el-range-editor.el-input__inner {
+    margin-left: 10px;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: -10px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    border: 1px solid #5473e8;
+    color: #5473e8;
+  }
+
+  // .warning {
+  //   width: 100%;
+  //   height: 2px;
+  //   background: red;
+  // }
+
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  // .top-grade {
+  //   background: linear-gradient(90deg, #5678e9, #7993f6);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .second-class {
+  //   background: linear-gradient(90deg, #50cdd9, #82e2ea);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .third-class {
+  //   background: linear-gradient(90deg, #ffa735, #ffbf70);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  // .substandard {
+  //   background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+  //   color: #fff;
+  //   padding: 3px;
+  //   border-radius: 2px;
+  // }
+
+  .wrap {
+    width: 400px;
+    position: absolute;
+    top: 131px;
+    left: 794px;
+    transform-origin: right center;
+    z-index: 2005;
+  }
+
+  .vertical-line {
+    height: 64px;
+    border-left: 2px solid #e9ecf7;
+    margin-left: 4px;
+    padding: 0 3px;
+    // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
+    // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
+    // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
+  }
+
+  .el-pagination {
+    padding: 10px 15px;
+    margin-bottom: 0;
+    text-align: center;
+  }
+
+  /deep/.el-pager li.active {
+    color: #5878e8;
+    cursor: default;
+  }
+
+  /deep/.el-pager li:hover {
+    color: #5878e8;
+    cursor: default;
+  }
+
+  .vertical-circle {
+    width: 10px;
+    height: 10px;
+    border: 2px solid #5878e8;
+    background-color: #ffffff;
+    -webkit-border-radius: 100px;
+  }
+
+  .vertical-circle:first-child {
+    color: red;
+  }
+
+  .vertical-text {
+    margin: 0 10px;
+    color: #8890b1;
+    font-size: 12px;
+    margin-top: -4px;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  /deep/.el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  .typeselect {
+    width: 500px;
+  }
+
+  .padding-xs {
+    padding: 15px;
+    text-align: right;
+  }
+
+  .clearfix:after {
+    content: '';
+    display: block;
+    clear: both;
+  }
+
+  .el-table {
+    font-size: 16px;
+  }
+
+  .taskType {
+    width: 100%;
+    background-color: #fff;
+    margin-top: 2px;
+    margin-bottom: 10px;
+    list-style: none;
+
+    // padding-bottom: 20px;
+    li {
+      float: left;
+      border: 1px solid #6ea0f3;
+      border-radius: 5px;
+      max-width: 190px;
+      padding: 0 5px;
+      text-align: center;
+      margin: 10px 20px;
+      cursor: pointer;
+      font-size: 14px;
+
+      p {
+        margin: 8px 0px;
+
+        span {
+          color: #e74c3c;
+        }
+      }
+    }
+
+    li:hover {
+      background-color: #e4eeff;
+      color: #1d6ced;
+    }
+  }
+
+  .el-date-editor--date {
+    margin: 0 10px;
+  }
+
+  .findValue {
+    margin: 0 10px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  // .button-container {
+  //   display: flex;
+  //   flex-wrap: nowrap;
+  //   justify-content: space-between;
+  //   align-items: center;
+  //   background-color: #fff;
+  //   width: 100%;
+  //   height: 50px;
+  //   padding: 0 10px;
+
+  //   &>div {
+  //     margin-left: 10px;
+  //     display: flex;
+  //     flex-wrap: nowrap;
+  //     flex-direction: row;
+
+  //     &>span {
+  //       line-height: 50px;
+  //     }
+  //   }
+
+  //   /deep/.auditFlow-box {
+  //     position: unset;
+  //     margin-left: 10px;
+
+  //     &/deep/.auditFlow-icon {
+  //       width: auto;
+  //       padding-right: 30px;
+  //     }
+
+  //     &/deep/.auditFlow-main {
+  //       position: absolute;
+  //     }
+  //   }
+  // }
+
+  // .box-app {
+  //   display: inline-block;
+  //   float: left;
+  //   margin-left: 30px;
+  //   line-height: 50px;
+  // }
+
+  /deep/.el-dialog {
+    .el-form-item {
+      margin-bottom: 0 !important;
+
+      .el-input--medium {
+        textarea {
+          min-height: 100px !important;
+        }
+      }
+    }
+  }
+
+  .collapse-bottom {
+    margin-bottom: 20px;
+  }
+
+  .input-main .textarea .el-textarea__inner {
+    width: 100%;
+    z-index: 1;
+  }
+
+  /*.crt-main .textarea /deep/ .el-form-item__label {*/
+  /*  height: 82px;*/
+  /*}*/
+  // 控制select为只读的时候显示样式
+
+  // .hide-sel {
+  //   .el-input__inner {
+  //     border: 0px;
+  //   }
+
+  //   .el-icon-arrow-up {
+  //     display: none;
+  //   }
+
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+
+  //   .el-date-editor {
+  //     i {
+  //       display: none;
+  //     }
+  //   }
+
+  //   .is-disabled {
+  //     .el-input__inner:hover {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //     }
+
+  //     color: #606266;
+
+  //     .el-input__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+
+  //     .el-textarea__inner {
+  //       background-color: #fff !important;
+  //       border: 0;
+  //       color: #606266;
+  //     }
+  //   }
+  // }
+
+  // 控制select为只读的时候显示样式
+  /deep/.ws-class-table-col {
+    height: auto;
+    padding: 0px 2px;
+
+    /deep/.el-input__inner {
+      padding: 0px 2px;
+    }
+  }
+
+  /deep/.is-disabled {
+    .el-input__prefix,
+    .el-input__suffix {
+      display: none;
+    }
+
+    .el-input__inner {
+      background-color: #fff;
+      border-color: #fff !important;
+      color: #000 !important;
+      font-size: 14px;
+      cursor: text;
+      padding: 0 !important;
+    }
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
+  /deep/.statusselect .el-input__inner {
+    color: #8890b1;
+    width:100%;
+  }
+</style>