1

config/dev.env.js

@@ -6,9 +6,9 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

package-lock.json

@@ -516,9 +516,9 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
       "dev": true
     },
     "axios": {
@@ -3547,6 +3547,12 @@
         "minimalistic-crypto-utils": "^1.0.0"
       }
     },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
@@ -4745,7 +4751,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4768,13 +4775,15 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4790,19 +4799,22 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4932,7 +4944,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4946,6 +4959,7 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4962,6 +4976,7 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4969,13 +4984,15 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4996,6 +5013,7 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5083,7 +5101,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5097,6 +5116,7 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5191,7 +5211,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5233,6 +5254,7 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5254,6 +5276,7 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5301,13 +5324,15 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5526,9 +5551,9 @@
       }
     },
     "globule": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz",
-      "integrity": "sha512-YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
+      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
       "dev": true,
       "requires": {
         "glob": "~7.1.1",
@@ -5578,13 +5603,33 @@
       "dev": true
     },
     "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "dev": true,
       "requires": {
-        "ajv": "^6.5.5",
+        "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        }
       }
     },
     "has": {
@@ -6160,9 +6205,9 @@
       "dev": true
     },
     "in-publish": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
+      "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
       "dev": true
     },
     "indent-string": {
@@ -7785,9 +7830,9 @@
       }
     },
     "node-sass": {
-      "version": "4.13.1",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz",
-      "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==",
+      "version": "4.14.1",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
+      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -7804,7 +7849,7 @@
         "node-gyp": "^3.8.0",
         "npmlog": "^4.0.0",
         "request": "^2.88.0",
-        "sass-graph": "^2.2.4",
+        "sass-graph": "2.2.5",
         "stdout-stream": "^1.4.0",
         "true-case-path": "^1.0.2"
       },
@@ -7845,9 +7890,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.15",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
           "dev": true
         },
         "strip-ansi": {
@@ -11309,9 +11354,9 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
-      "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
     "public-encrypt": {
@@ -11825,9 +11870,9 @@
       }
     },
     "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -11837,7 +11882,7 @@
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
         "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
+        "har-validator": "~5.1.3",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
@@ -11847,7 +11892,7 @@
         "performance-now": "^2.1.0",
         "qs": "~6.5.2",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
+        "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
       }
@@ -12035,112 +12080,167 @@
       "dev": true
     },
     "sass-graph": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
-      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
+      "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
       "dev": true,
       "requires": {
         "glob": "^7.0.0",
         "lodash": "^4.0.0",
         "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
+        "yargs": "^13.3.2"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
         "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         },
         "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
           }
         },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "locate-path": "^3.0.0"
           }
         },
-        "os-locale": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-          "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "lcid": "^1.0.0"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
           }
         },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
         "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
         "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "^4.1.0"
           }
         },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+          "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
           "dev": true
         },
         "yargs": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
+            "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^5.0.0"
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
           }
         },
         "yargs-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
-            "camelcase": "^3.0.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
@@ -13689,21 +13789,13 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       }
     },
     "traverse": {

package.json

@@ -102,7 +102,7 @@
     "html-webpack-plugin": "2.30.1",
     "lint-staged": "7.2.0",
     "node-notifier": "5.1.2",
-    "node-sass": "^4.13.1",
+    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "3.2.0",
     "ora": "1.3.0",
     "portfinder": "1.0.13",

src/xt_pages/data/components/addInspection.vue

@@ -65,7 +65,7 @@
             <el-form>
                 <el-table :data="tableData" border  style="100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row ref="tab">
                     <el-table-column align="center" prop="name" label="分类" width="120">
-                        <template slot-scope="scope">{{getId(scope.row.cost_classify)}}</template>
+                        <template slot-scope="scope">{{getId(scope.row.statistical_classification)}}</template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="组套明细" width="120">
                         <template slot-scope="scope">{{scope.row.project_name}}</template>
@@ -253,7 +253,6 @@ export default {
          console.log("33333",this.tableData)
       
          
-       
             const params = {
               id:this.form.project_detail,
               number:parseInt(this.form.number)

src/xt_pages/data/specialDictionary.vue

@@ -21,7 +21,7 @@
           <!--<manufacturer></manufacturer>-->
           <manufacturer></manufacturer>
         </el-tab-pane>
-        <el-tab-pane label="供应商" name="6">
+        <el-tab-pane label="经销商" name="6">
           <!--<supplier></supplier>-->
           <dealer></dealer>
         </el-tab-pane>

src/xt_pages/dialysis/PatientBox.vue

@@ -240,6 +240,7 @@ export default {
     },
     patientStateVal:Number
   },
+ 
   methods: {
     stateColor: function(schedual) {
       var state = this.computeState(schedual);

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -640,7 +640,10 @@
                             record.prescription &&
                             record.prescription.dialyzer_perfusion_apparatus
                               ? record.prescription.dialyzer_perfusion_apparatus
-                              : "/"
+                              : ""
+                          }}
+                          {{
+                            record.prescription && record.prescription.dialysis_dialyszers?record.prescription.dialysis_dialyszers:"/"
                           }}
                         </div>
                       </div>
@@ -650,7 +653,7 @@
                           class="under_line"
                           style="width: 70px;text-align: center"
                         >
-                          /
+                          {{record.prescription && record.prescription.dialysis_irrigation?record.prescription.dialysis_irrigation:"/"}}
                         </div>
                       </div>
                       <div class="inline_block" style="flex:1;">

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1697,6 +1697,7 @@
 
 
           //获取最后一次血管通路
+        //   console.log("最后一次血管通路",this.predialysis)
         //  if(this.predialysis!=null){
         //     if(this.lastAssessment!=null){
         //       var blood_id = 0

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -334,13 +334,14 @@
                   <div class="inline_block" style="flex:1;">
                     透析(滤)器：
                     <div class="under_line" style="width: 100px;text-align: center">
-                      {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
+                      {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
+                      {{prescription.dialysis_dialyszers?prescription.dialysis_dialyszers:"/"}}
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">
                     灌流器：
                     <div class="under_line" style="width: 70px;text-align: center">
-                      /
+                     {{prescription.dialysis_irrigation?prescription.dialysis_irrigation:'/'}}
                     </div>
                   </div>
                   <div class="inline_block" style="flex:1;">

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -83,7 +83,7 @@
                     <template slot-scope="scope">{{getMedicalTreatment(scope.row.social_type)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="医生" width="80">
-                    <template slot-scope="scope">{{getDoctor(scope.row.admin_user_id) }}</template>
+                    <template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="挂号费" width="70">
                     <template slot-scope="scope">{{ scope.row.register_cost }}</template>
@@ -182,7 +182,7 @@
                       <div>{{ getRegister(form.register_type) }}</div>
                     </el-form-item>
                     <el-form-item label="医生："  prop="doctor" :validate-event="is_Name" >
-                      <div>{{ getDoctor(form.admin_user_id) }}</div>
+                      <div>{{ getDoctor(form.doctor) }}</div>
                     </el-form-item>
                     <el-form-item label="科室："  prop="department" :validate-event="is_Name">
                       <div>{{ getDepartMent(form.departments) }}</div>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -54,15 +54,7 @@
               <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
-              <!-- <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择" filterable>
-                <el-option
-                  v-for="(item,index) in form.manufacturers"
-                  :key="index"
-                  :label="item.manufacturer_name"
-                  :value="item.id">
-                </el-option>
-              </el-select> -->
-
+             
                <el-select v-model="form.manufacturer" style="width:100%;" filterable placeholder="请选择">
                   <el-option
                     v-for="(item,index) in form.manufacturers"
@@ -131,23 +123,26 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <!--<el-form-item label="代理商 : " prop="name" style="visibility: hidden;">-->
-            <!--<el-input style="width:160px;" v-model="form.agent" placeholder="" maxlength="30"></el-input>-->
-            <!--</el-form-item>-->
-
-
+          
             <el-form-item label="状态 : " prop="good_status">
-              <!--<el-radio-group v-model="form.good_status">-->
-              <!--<el-radio :label="1">停用</el-radio>-->
-              <!--<el-radio :label="2">收费</el-radio>-->
-              <!--</el-radio-group>-->
-
               <el-checkbox-group v-model="good_status">
                 <el-checkbox label="停用">停用</el-checkbox>
                 <el-checkbox label="收费">收费</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
 
+           <el-form-item label="经销商 : " prop="manufacturer" style="width:100%">
+             
+               <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in dealer"
+                    :key="index"
+                    :label="item.dealer_name"
+                    :value="item.id">
+                  </el-option>
+              </el-select>
+           </el-form-item>
+
 
             <el-form-item label="备注 : " prop="name" style="width:100%;">
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
@@ -227,9 +222,7 @@
           <el-form-item label="代理商:" prop="agent">
             <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
           </el-form-item>
-          <!--<el-form-item label="耗材编码:" prop="name">-->
-          <!--<el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>-->
-          <!--</el-form-item>-->
+         
           <el-form-item label="耗材编号:" prop="good_number">
             <el-input v-model="form.good_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
           </el-form-item>
@@ -250,7 +243,8 @@
 
 <script>
   import { getDictionaryDataConfig,getDataConfig } from '@/utils/data'
-  import { getManufacturerList } from "@/api/stock";
+  import { getManufacturerList,GetAllConfig } from "@/api/stock";
+
   export default {
     name: 'goodInfoDailog',
     data() {
@@ -332,7 +326,8 @@
             { required: true, message: '请输入库存警戒', trigger: 'blur' }
           ]
 
-        }
+        },
+        dealer:[]
       }
     },
     props: {
@@ -480,6 +475,17 @@
            console.log("列表2222222",manufacturerList)
            this.manufacturerList = manufacturerList
         })
+      },
+      GetAllConfig(){
+        GetAllConfig().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.dealer = response.data.data.dealer;
+          console.log("经销傻姑娘",this.dealer)
+        }
+       });
       }
     },
     watch: {
@@ -494,6 +500,8 @@
     },
     created(){
       this.getlist()
+      //获取所有经销商
+      this.GetAllConfig()
     }
   }
 

src/xt_pages/stock/stockInOrder.vue

@@ -1130,7 +1130,7 @@ export default {
       const ids = [];
       ids.push(this.WarehouseInfo.warehouse.id);
       const idStr = ids.join(",");
-
+     
       const params = {
         ids: idStr
       };

src/xt_pages/stock/stockOutOrder.vue

@@ -207,8 +207,8 @@
         </div>
 
         <div class="filter-container" style="margin-top: 10px">
-         <!-- <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
-         <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button> -->
+         <el-button size="small" icon="el-icon-edit" @click="editRecord(warehousingOutInfo.info.id)" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
+         <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
         </div>
 
 
@@ -369,7 +369,148 @@
 
 
   <!-- 编辑 -->
-  
+   <el-dialog
+      title="编辑出库单"
+      :visible.sync="editDialogVisible"
+      width="80%">
+      <span>
+
+        <div style="margin-bottom:10px">
+          <label class="title"><span class="name">出库时间</span> : </label>
+          <el-date-picker size="small" v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false"
+                          style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"></el-date-picker>
+          <label class="title" style="margin-left:10px;"><span class="name">经 销 商</span> : </label>
+          <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+            <el-option
+              v-for="(option, index) in dealer"
+              :key="index"
+              :label="option.dealer_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
+          <label class="title" style="margin-left:10px;"><span class="name">厂商</span> : </label>
+
+          <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
+            <el-option
+              v-for="(option, index) in manufacturer"
+              :key="index"
+              :label="option.manufacturer_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
+        </div>
+
+
+      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
+                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+
+          <el-table-column min-width="35" align="center">
+
+            <template slot="header" slot-scope="scope">
+              <span>耗材类型<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
+                          :value="typeName(scope.row.good_type_id)"
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
+                          :value="specificationName(scope.row.good_id)"
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+              </el-form-item>
+
+            </template>
+          </el-table-column>
+
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
+                            style="padding-top: 17px">
+                <el-input type="number" v-model="scope.row.price"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>出库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
+                            style="padding-top: 17px">
+                <el-input type="number" v-model="scope.row.count"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{calculate(scope.row.price*scope.row.count)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" min-width="30">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="新增" placement="top">
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEditOne(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="handleDeleteOne(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="editDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </span>
+  </el-dialog>
+   
+
+   <stock-in-dialog
+        ref="dialog"
+        :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle"
+      >
+   </stock-in-dialog>
+
   
   </div>
 </template>
@@ -384,13 +525,17 @@ import {
   getWarehouseOutList,
   getWarehouseOutInfo,
   getWarehouseOutUser,
-  GetOutStockTotalCount
+  GetOutStockTotalCount,
+  deleteWarehouseOutInfo,
+  GetAllGoodInfoByID,
+  editWarehouseoutInfo,
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
+import StockInDialog from './Dialog/stockInDialog'
 
 export default {
   name: "salesReturnOrder",
-  components: { BreadCrumb },
+  components: { StockInDialog, BreadCrumb},
   created() {
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
@@ -416,8 +561,16 @@ export default {
     this.GetWarehouseOut();
    
     this.fetchAllAdminUsers();
+    
   },
   data() {
+     var checkGoodId = (rule, value, callback) => {
+      setTimeout(() => {
+        if (value == "" || value == 0) {
+          return callback(new Error("规格名称不能为空"));
+        }
+      }, 2000);
+    };
     return {
       searchKey: "",
       crumbs: [
@@ -453,7 +606,39 @@ export default {
       userList:[],
       type_name:'',
       specification_name:"",
-      stockCount:[]
+      stockCount:[],
+      editDialogVisible:false,
+      warehouse_out_time: '',
+      form: {
+          manufacturer: 0,
+          dealer: 0
+        },
+       warehouseInfoList: [],
+       tableRules: {
+        price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
+        warehousing_count: [
+          { required: true, message: "数量不能为空", trigge: "blur" }
+        ],
+
+        good_id: [{ validator: checkGoodId, trigger: "blur" }]
+      },
+
+      recordInfo: {
+        recordData: [],
+        stock_in_code: "",
+        current_index: ""
+      },
+      propForm: {
+        goods:[],
+        goodType: [],
+        goodInfo: [],
+        goodUnit: [],
+        title: '入库',
+        manufacturer: 0,
+        dealer: 0
+      },
+      isVisibility: false,
+      good_type_id:""
     };
   },
   methods: {
@@ -593,6 +778,8 @@ export default {
           this.dealer = response.data.data.dealer;
           this.goodInfo = response.data.data.goodInfo
           this.goodType = response.data.data.goodType
+          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
         }
       });
     },
@@ -727,6 +914,7 @@ export default {
         const params = {
           'id': id
         }
+        console.log("#3333333",id)
       getWarehouseOutInfo(params).then(response => {
           if (response.data.state == 0) {
 
@@ -738,6 +926,8 @@ export default {
             }
 
             this.warehousingOutInfo.info = response.data.data.info
+
+            console.log("出库222222222",this.warehousingOutInfo)           
             // this.handleSpanTempArr()
           }
         })
@@ -817,11 +1007,38 @@ export default {
         })
       },
 
-      editRecord(){
      
-      },
-      deleteRecord(){
+     deleteRecord: function() {
+        const ids = []
+        ids.push(this.warehousingOutInfo.info.id)
+        const idStr = ids.join(',')
 
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库单?', '删除出库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteWarehouseOut(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              this.$router.back(-1)
+            }
+          })
+        }).catch(() => {
+        })
       },
 
       GetTotalCount(time){
@@ -851,7 +1068,259 @@ export default {
      unique(arr) {
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.patient_id) && res.set(arr.patient_id, 1));
-     }
+     },
+
+    editRecord(id){
+      this.warehouseOut= []
+      this.recordInfo.recordData = []
+      this.GetConfigInfo()
+      this.GetOrderDetailTwo(id)
+      this.good_type_id = id
+    },
+
+     GetOrderDetailTwo(order_id) {
+        const params = {
+          'id': order_id
+        }
+        console.log("触发了222222",order_id)
+        getWarehouseOutInfo(params).then(response => {
+         if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              response.data.data.list[i].price = response.data.data.list[i].price.toString()
+              response.data.data.list[i].count = response.data.data.list[i].count.toString()
+              this.recordInfo.recordData.push(response.data.data.list[i])
+            }
+            this.warehouseOut = response.data.data.info
+            this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
+            this.form.manufacturer = this.warehouseOut.manufacturer
+            this.form.dealer = this.warehouseOut.dealer
+            this.editDialogVisible = true
+          }
+
+          if (this.recordInfo.recordData.length == 0) {
+            const tempObj = {}
+            tempObj['id'] = 0
+            tempObj['good_type_id'] = 0
+            tempObj['good_id'] = 0
+            tempObj['count'] = ''
+            tempObj['price'] = ''
+            tempObj['remark'] = ''
+            this.recordInfo.recordData.push(tempObj)
+            this.editDialogVisible = true
+          }
+        })
+      },
+     getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+     },
+     changeManufacturer(val) {
+        this.propForm.manufacturer = val
+      },
+       changeDealer(val) {
+        this.propForm.dealer = val
+     },
+      typeName: function(good_type_id) {
+        let name = "";
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == good_type_id) {
+            name = this.goodType[i].type_name;
+          }
+        }
+        return name;
+      },
+     specificationName: function(good_info_id) {
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name;
+          }
+        }
+        return name;
+     }, 
+     handleEditOne(){
+        const tempObj = {}
+        tempObj['id'] = 0
+        tempObj['good_type_id'] = 0
+        tempObj['good_id'] = 0
+        tempObj['count'] = ''
+        tempObj['price'] = ''
+        tempObj['remark'] = ''
+        this.recordInfo.recordData.push(tempObj)
+     },
+     handleDeleteOne: function(index, row) {
+        if (row.id == 0) {
+          this.recordInfo.recordData.splice(index, 1)
+        } else {
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该出库耗材信息记录?', '删除出库耗材信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteWarehouseOutInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('删除成功')
+
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
+      },
+      showDialog(index, row) {
+        this.currentIndex = index;
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+
+        const params = {
+          manufacturer_id: this.form.manufacturer,
+          dealer_id: this.form.dealer
+        };
+        this.propForm.goods = []
+
+        GetAllGoodInfoByID(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.goodInfo.length <= 0) {
+              this.$message.error("该厂商或经销商没有物品信息");
+              return;
+            }
+            this.$refs.dialog.show();
+            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+              this.propForm.goodType.push(
+                response.data.data.goodInfo[i].type
+              );
+            }
+            const obj = {};
+            this.propForm.goodType = this.propForm.goodType.reduce(
+              (cur, next) => {
+                obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+                return cur;
+              },
+              []
+            ); // 设置cur默认类型为数组，并且初始值为空的数组
+          }
+
+          for (let i = 0; i < this.propForm.goodType.length; i++) {
+            let goodInfo = [];
+            let goodObj = {};
+
+            for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+              var respObj = response.data.data.goodInfo[a];
+              respObj["isSelected"] = false;
+              if (respObj.type.id == this.propForm.goodType[i].id) {
+                goodInfo.push(respObj);
+              }
+            }
+            const obj = {};
+            goodInfo = goodInfo.reduce((cur, next) => {
+              obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+              return cur;
+            }, []); // 设置cur默认类型为数组，并且初始值为空的数组
+
+            this.$set(goodObj, this.propForm.goodType[i].id, goodInfo);
+            this.propForm.goods.push(goodObj);
+          }
+          loading.close();
+        });
+      },
+     
+      comfirm: function(val) {
+        this.$refs.dialog.hide();
+        this.propForm.goodType = [];
+        this.propForm.goods = [];
+
+        if (val.selectedGoodInfo.length > 0) {
+          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
+            if (i == 0) {
+              this.recordInfo.recordData[this.currentIndex].good_type_id =
+                val.selectedGoodInfo[i].good_type_id;
+              this.recordInfo.recordData[this.currentIndex].good_id =
+                val.selectedGoodInfo[i].id;
+              this.recordInfo.recordData[
+                this.currentIndex
+                ].price = val.selectedGoodInfo[i].buy_price.toString();
+            } else {
+              const tempForm = {};
+              tempForm["id"] = 0;
+              tempForm["good_type_id"] = val.selectedGoodInfo[i].good_type_id;
+              tempForm["good_id"] = val.selectedGoodInfo[i].id;
+              tempForm["count"] = "";
+              tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
+              tempForm["remark"] = "";
+              this.recordInfo.recordData.splice(
+                this.currentIndex + 1,
+                0,
+                tempForm
+              );
+            }
+          }
+        }
+        this.currentIndex = -1;
+      },
+      cancle: function() {
+        this.$refs.dialog.hide()
+        this.propForm.goods = [];
+
+        this.propForm.goodType = [];
+      },
+
+      submit() {
+        this.$refs['tableForm'].validate((valid) => {
+          if (valid) {
+            const array = this.recordInfo.recordData
+            console.log("$arr3333333333",array)
+            for (let i = 0; i < array.length; i++) {
+              if (array[i].good_type_id == 0) {
+                this.$message.error('商品类型不能为空')
+                return
+              }
+              if (array[i].good_id == 0) {
+                this.$message.error('规格名称不能为空')
+                return
+              }
+            }
+
+            const params = {
+              'stockOut': this.recordInfo.recordData
+            }
+            editWarehouseoutInfo(params, this.warehouse_out_time,this.good_type_id, 1, this.form.manufacturer, this.form.dealer).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('保存成功')
+                this.editDialogVisible = false
+                this.warehousingOutInfo.info = []
+                this.warehousingOutInfo.warehousingOutData = []
+                this.GetOrderDetailOne(this.good_type_id)
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      }, 
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -238,7 +238,8 @@
             this.handleSpanTempArr()
           }
         })
-      }, deleteRecord: function() {
+      },
+       deleteRecord: function() {
         const ids = []
         ids.push(this.warehousingOutInfo.info.id)
         const idStr = ids.join(',')
@@ -269,8 +270,9 @@
           })
         }).catch(() => {
         })
-      }, editRecord: function() {
-        this.$emit('edit-record')
+      },
+       editRecord: function() {
+         this.$emit('edit-record')
       },
       jump(row){
         this.$router.push({

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -72,7 +72,7 @@
           <el-table-column min-width="35" align="center">
 
             <template slot="header" slot-scope="scope">
-              <span>商品类型<span style="color: red">*</span></span>
+              <span>耗材类型<span style="color: red">*</span></span>
             </template>
 
             <template slot-scope="scope">
@@ -333,7 +333,7 @@
           const params = {
             id: row.id
           }
-          this.$confirm('确认删除该出库商品信息记录?', '删除出库商品信息记录', {
+          this.$confirm('确认删除该出库耗材信息记录?', '删除出库耗材信息记录', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'

src/xt_pages/workforce/appointment.vue

@@ -126,6 +126,10 @@
 
        <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
             <el-form :model="form"  ref="form" label-width="90px" :rules="rules">
+                <el-form-item label="周次:">
+                   <el-radio v-model="form.lastweek" label="1">上周排班信息</el-radio>
+                   <el-radio v-model="form.lastweek" label="2">本周排班信息</el-radio>
+                </el-form-item>
                 <el-form-item label="复制到 : " required  prop="copyWeek">
                     <el-select v-model="form.copyWeek" placeholder="请选择">
                         <el-option
@@ -192,6 +196,7 @@
         end_time:"",
         export_type:0,
         form:{
+          lastweek:"1",
           copyWeek:"",
         },
         newVisible:false,
@@ -580,8 +585,7 @@
         return isShow
       },
        handleSuccess({ results, header }) {
-        console.log("results333333333333333333",results)
-        console.log("hearder2222222222222",header)
+       
         let headers = []
         for (let key in results[0]) {
           headers.push(key)
@@ -2625,6 +2629,27 @@
           return (new Date(time)).getTime() / 1000
         },
         submitAction(formName){
+           
+             var start_time = ""
+             var end_time = ""
+             console.log("this222",this.form.lastweek)
+             //上周
+             if(this.form.lastweek == "1"){
+                let weekOfday = parseInt(moment().format('d')) 
+                start_time =  this.getTimestamp(moment().subtract(weekOfday + 6, 'days').format('YYYY-MM-DD')) -28800
+                end_time =  this.getTimestamp(moment().subtract(weekOfday, 'days').format('YYYY-MM-DD')) -28800
+                console.log("start",start_time)
+                console.log("end",end_time)
+             }
+            
+            //本周
+             if(this.form.lastweek == "2"){
+                start_time = this.getTimestamp(this.weekDayArr[0])
+                end_time = this.getTimestamp(this.weekDayArr[6])
+                console.log("start",start_time)
+                console.log("end",end_time)
+             }
+
             var label = ""
             for(let i=0;i<this.timeOptions.length;i++){
                if(this.form.copyWeek == this.timeOptions[i].value){
@@ -2634,15 +2659,15 @@
            var start = label.split('~')
            var copy_startime = this.getTimestamp(start[0])
            var copy_endtime = this.getTimestamp(start[1])
-
+         
             const params = {
-              start_time:this.getTimestamp(this.weekDayArr[0]),
-              end_time:this.getTimestamp(this.weekDayArr[6]),
+              start_time:start_time,
+              end_time:end_time,
               copy_startime:copy_startime,
               copy_endtime:copy_endtime,
             }
            console.log("parasm",params)
-
+           
            this.$refs[formName].validate(valid=>{
               if(valid){
                 copyPatientSchedule(params).then(response=>{
@@ -2686,7 +2711,7 @@
      let newNum = 0
      for(let i = 0; i < this.weekList.length; i++){
          if(this.weekNum + i + 1 <= 53){
-             let num = this.weekNum + i + 1
+             let num = this.weekNum + i 
             let str = this.weekList[i][0] + '~' + this.weekList[i][6] + '(' + num + ')'
              this.typeOptions.push({value:i,label:str})
             let stt = this.weekList[i][0] +"~"+this.weekList[i][6]

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -81,9 +81,10 @@
       </el-table-column>
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
-          <span > {{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
+          <span v-if="org_id!=9987" > {{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
           {{scope.row.prescription.dialysis_dialyszers}}
-          <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
+         <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
+          <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
         </template>
       </el-table-column>
       <el-table-column label="抗凝剂" min-width="100" align="center">
@@ -205,7 +206,8 @@ export default {
         Sunday: []
       },
       scheduleData: [],
-      modeOptions: null
+      modeOptions: null,
+       org_id:0
     };
   },
   watch: {
@@ -419,6 +421,7 @@ export default {
       this.week_type = 7;
     }
     this.getNextScheduleWeekDay();
+    this.org_id = this.$store.getters.xt_user.org.id
   }
 };
 </script>

src/xt_pages/workforce/components/scheduleUploadExcel/index.vue

@@ -10,7 +10,7 @@
     <el-button type="primary" @click="handleUpload()">确 定</el-button>
   </span>
     </el-dialog>
-     <input id="excel-upload-input" ref="excel-upload-input" type="file"  accept=".xlsx,.xls,.xltx," @change="handleClick">
+     <input id="excel-upload-input" ref="excel-upload-input" type="file"  accept=".xlsx,.xls,.xltx," @change="handleClick" >
     <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
     </el-button>
   </div>
@@ -74,16 +74,17 @@
         document.getElementById('excel-upload-input').click()
       },
       handleClick(e) {
-        
+       
         const files = e.target.files
         const rawFile = files[0] // only use files[0]
         console.log("rawfiel",rawFile)
         if (!rawFile) 
         return
         this.upload(rawFile)
+
       },
       upload(rawFile) {
-        console.log("触发了吗")
+        
         this.$refs['excel-upload-input'].value = null // fix can't select the same excel
         console.log("3333",this.beforeUpload)
         if (!this.beforeUpload) {
@@ -104,6 +105,7 @@
           reader.onload = e => {
            
             const data = e.target.result
+            console.log("data22222",data)
             const fixedData = this.fixdata(data)
             const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
             const firstSheetName = workbook.SheetNames[0]
@@ -145,10 +147,13 @@
           headers.push(hdr)
         }
         return headers
+
+    
+
       },
       isExcel(file) {
-        console.log("file",file)
-        return /\.(xlsx|xls|csv)$/.test(file.name)
+        
+        return /\.(xlsx|xls|csv)$/.test(file.name)       
       }
     }
   }

src/xt_pages/workforce/components/tableWeeks.vue

@@ -81,9 +81,10 @@
       </el-table-column>
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
-          {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+          <span v-if="org_id!=9987">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
           {{scope.row.prescription.dialysis_dialyszers}}
-          <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
+          <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
+          <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
         </template>
       </el-table-column>
 
@@ -206,7 +207,8 @@ export default {
         Sunday: []
       },
       scheduleData: [],
-      modeOptions: null
+      modeOptions: null,
+      org_id:0
     };
   },
   watch: {
@@ -455,6 +457,7 @@ export default {
     // };
     this.getScheduleWeekDay();
     console.log("org2222222",this.$store.getters.xt_user.org.id)
+    this.org_id = this.$store.getters.xt_user.org.id
   }
 };
 </script>

src/xt_pages/workforce/next_remind_print.vue

@@ -59,9 +59,10 @@
                   {{modeOptions[main_collection.mode_id].name}}
                 </td>
                 <td :width="td_1_width">
-                  {{main_collection.prescription.dialyzer_perfusion_apparatus}}
+                  <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
                   {{main_collection.prescription.dialysis_dialyszers}} 
-                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">/ {{main_collection.prescription.dialysis_irrigation}}</span>
+                  <span v-if="main_collection.prescription.dialysis_dialyszers!='' && main_collection.prescription.dialysis_irrigation!=''">/</span>
+                  <span v-if="main_collection.prescription.dialysis_irrigation!=''"> {{main_collection.prescription.dialysis_irrigation}}</span>
 
                 </td>
                 <td :width="td_1_width">
@@ -116,12 +117,14 @@
         currentDate:'',
         start_time:moment().week(moment().week() + 1).startOf('week').unix(),
         end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+        org_id:0,
       }
     },
     components: {
       BreadCrumb
     },
     created() {
+     this.org_id = this.$store.getters.xt_user.org.id
      this.currentDate = this.getCurrentDate()
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit

src/xt_pages/workforce/remind_print.vue

@@ -59,9 +59,10 @@
                   {{modeOptions[main_collection.mode_id].name}}
                 </td>
                 <td :width="td_1_width">
-                  {{main_collection.prescription.dialyzer_perfusion_apparatus}}
+                  <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
                   {{main_collection.prescription.dialysis_dialyszers}} 
-                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">/ {{main_collection.prescription.dialysis_irrigation}}</span>
+                  <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
+                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">{{main_collection.prescription.dialysis_irrigation}}</span>
 
                 </td>
                 <td :width="td_1_width">
@@ -113,13 +114,15 @@
         td_4_width: '45%',
         modeOptions: null,
         anticoagulants_confit:null,
-        currentDate:''
+        currentDate:'',
+        org_id:0
       }
     },
     components: {
       BreadCrumb
     },
     created() {
+     this.org_id = this.$store.getters.xt_user.org.id
      this.currentDate = this.getCurrentDate()
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit