门店管理

report.20191203.093919.22196.0.001.json

+
+{
+  "header": {
+    "reportVersion": 1,
+    "event": "Allocation failed - JavaScript heap out of memory",
+    "trigger": "FatalError",
+    "filename": "report.20191203.093919.22196.0.001.json",
+    "dumpEventTime": "2019-12-03T09:39:19Z",
+    "dumpEventTimeStamp": "1575337159052",
+    "processId": 22196,
+    "cwd": "D:\\wamp64\\www\\dengxueyun\\newshopFont2\\newshopfront",
+    "commandLine": [
+      "node",
+      "D:\\wamp64\\www\\dengxueyun\\newshopFont2\\newshopfront\\node_modules\\.bin\\\\..\\@vue\\cli-service\\bin\\vue-cli-service.js",
+      "serve"
+    ],
+    "nodejsVersion": "v12.13.0",
+    "wordSize": 64,
+    "arch": "x64",
+    "platform": "win32",
+    "componentVersions": {
+      "node": "12.13.0",
+      "v8": "7.7.299.13-node.12",
+      "uv": "1.32.0",
+      "zlib": "1.2.11",
+      "brotli": "1.0.7",
+      "ares": "1.15.0",
+      "modules": "72",
+      "nghttp2": "1.39.2",
+      "napi": "5",
+      "llhttp": "1.1.4",
+      "http_parser": "2.8.0",
+      "openssl": "1.1.1d",
+      "cldr": "35.1",
+      "icu": "64.2",
+      "tz": "2019a",
+      "unicode": "12.1"
+    },
+    "release": {
+      "name": "node",
+      "lts": "Erbium",
+      "headersUrl": "https://nodejs.org/download/release/v12.13.0/node-v12.13.0-headers.tar.gz",
+      "sourceUrl": "https://nodejs.org/download/release/v12.13.0/node-v12.13.0.tar.gz",
+      "libUrl": "https://nodejs.org/download/release/v12.13.0/win-x64/node.lib"
+    },
+    "osName": "Windows_NT",
+    "osRelease": "6.3.9600",
+    "osVersion": "Windows Server 2012 R2 Datacenter",
+    "osMachine": "x86_64",
+    "cpus": [
+      {
+        "model": "Intel(R) Xeon(R) Platinum 8163 CPU @ 2.50GHz",
+        "speed": 2500,
+        "user": 159143921,
+        "nice": 0,
+        "sys": 61667250,
+        "idle": 2869646250,
+        "irq": 515187
+      },
+      {
+        "model": "Intel(R) Xeon(R) Platinum 8163 CPU @ 2.50GHz",
+        "speed": 2500,
+        "user": 145690671,
+        "nice": 0,
+        "sys": 58013750,
+        "idle": 2886752656,
+        "irq": 547968
+      },
+      {
+        "model": "Intel(R) Xeon(R) Platinum 8163 CPU @ 2.50GHz",
+        "speed": 2500,
+        "user": 136672390,
+        "nice": 0,
+        "sys": 68792468,
+        "idle": 2884992218,
+        "irq": 338593
+      },
+      {
+        "model": "Intel(R) Xeon(R) Platinum 8163 CPU @ 2.50GHz",
+        "speed": 2500,
+        "user": 167692468,
+        "nice": 0,
+        "sys": 51619390,
+        "idle": 2871145218,
+        "irq": 383937
+      }
+    ],
+    "networkInterfaces": [
+      {
+        "name": "以太网",
+        "internal": false,
+        "mac": "00:16:3e:06:bc:d8",
+        "address": "fe80::c421:db82:18c8:3de4",
+        "netmask": "ffff:ffff:ffff:ffff::",
+        "family": "IPv6",
+        "scopeid": 12
+      },
+      {
+        "name": "以太网",
+        "internal": false,
+        "mac": "00:16:3e:06:bc:d8",
+        "address": "192.168.188.207",
+        "netmask": "255.255.255.0",
+        "family": "IPv4"
+      },
+      {
+        "name": "Loopback Pseudo-Interface 1",
+        "internal": true,
+        "mac": "00:00:00:00:00:00",
+        "address": "::1",
+        "netmask": "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+        "family": "IPv6",
+        "scopeid": 0
+      },
+      {
+        "name": "Loopback Pseudo-Interface 1",
+        "internal": true,
+        "mac": "00:00:00:00:00:00",
+        "address": "127.0.0.1",
+        "netmask": "255.0.0.0",
+        "family": "IPv4"
+      }
+    ],
+    "host": "RomensLinux"
+  },
+  "javascriptStack": {
+    "message": "No stack.",
+    "stack": [
+      "Unavailable."
+    ]
+  },
+  "nativeStack": [
+    {
+      "pc": "0x00007ff68e231389",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68e2357cc",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68e234778",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68e32332b",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68eb26f4e",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68eb0ef91",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68e9dc85c",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68e9e4961",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68e9d9fc3",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68e9d8794",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68e9f9a65",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68e766239",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68ef52c6d",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68efb7d4c",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68eed27fc",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68eecbbac",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68ef6f758",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68eed27fc",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68eed27fc",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68eed27fc",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00007ff68eecbbac",
+      "symbol": ""
+    },
+    {
+      "pc": "0x00000158152160d9",
+      "symbol": ""
+    }
+  ],
+  "javascriptHeap": {
+    "totalMemory": 395223040,
+    "totalCommittedMemory": 395223040,
+    "usedMemory": 381519488,
+    "availableMemory": 1815907640,
+    "memoryLimit": 2197815296,
+    "heapSpaces": {
+      "read_only_space": {
+        "memorySize": 262144,
+        "committedMemory": 262144,
+        "capacity": 261872,
+        "used": 32296,
+        "available": 229576
+      },
+      "new_space": {
+        "memorySize": 1048576,
+        "committedMemory": 1048576,
+        "capacity": 1047488,
+        "used": 1047480,
+        "available": 8
+      },
+      "old_space": {
+        "memorySize": 259633152,
+        "committedMemory": 259633152,
+        "capacity": 259202096,
+        "used": 252172752,
+        "available": 7029344
+      },
+      "code_space": {
+        "memorySize": 5406720,
+        "committedMemory": 5406720,
+        "capacity": 4985888,
+        "used": 4588992,
+        "available": 396896
+      },
+      "map_space": {
+        "memorySize": 8130560,
+        "committedMemory": 8130560,
+        "capacity": 8121776,
+        "used": 3313040,
+        "available": 4808736
+      },
+      "large_object_space": {
+        "memorySize": 119336960,
+        "committedMemory": 119336960,
+        "capacity": 119067848,
+        "used": 119067848,
+        "available": 0
+      },
+      "code_large_object_space": {
+        "memorySize": 1204224,
+        "committedMemory": 1204224,
+        "capacity": 1100416,
+        "used": 1100416,
+        "available": 0
+      },
+      "new_large_object_space": {
+        "memorySize": 200704,
+        "committedMemory": 200704,
+        "capacity": 1047488,
+        "used": 196664,
+        "available": 850824
+      }
+    }
+  },
+  "resourceUsage": {
+    "userCpuSeconds": 265.828,
+    "kernelCpuSeconds": 34.046,
+    "cpuConsumptionPercent": 0.520244,
+    "maxRss": 903413760,
+    "pageFaults": {
+      "IORequired": 4807870,
+      "IONotRequired": 0
+    },
+    "fsActivity": {
+      "reads": 7649,
+      "writes": 14147
+    }
+  },
+  "libuv": [
+  ],
+  "environmentVariables": {
+    "": "C:=C:\\",
+    "": "D:=D:\\wamp64\\www\\dengxueyun\\newshopFont2\\newshopfront",
+    "ACLOCAL_PATH": "C:\\Program Files\\Git\\mingw64\\share\\aclocal;C:\\Program Files\\Git\\usr\\share\\aclocal",
+    "ALLUSERSPROFILE": "C:\\ProgramData",
+    "APPDATA": "C:\\Users\\dengxueyun\\AppData\\Roaming",
+    "BABEL_ENV": "development",
+    "CLIENTNAME": "DESKTOP-NL9LAK1",
+    "COMMONPROGRAMFILES": "C:\\Program Files\\Common Files",
+    "CommonProgramFiles(x86)": "C:\\Program Files (x86)\\Common Files",
+    "CommonProgramW6432": "C:\\Program Files\\Common Files",
+    "COMPUTERNAME": "RomensLinux",
+    "COMSPEC": "C:\\Windows\\system32\\cmd.exe",
+    "CONFIG_SITE": "C:/Program Files/Git/mingw64/etc/config.site",
+    "DISPLAY": "needs-to-be-defined",
+    "dp0": "D:\\wamp64\\www\\dengxueyun\\newshopFont2\\newshopfront\\node_modules\\.bin\\",
+    "EXEPATH": "C:\\Program Files\\Git",
+    "FP_NO_HOST_CHECK": "NO",
+    "HOME": "C:\\Users\\dengxueyun",
+    "HOMEDRIVE": "C:",
+    "HOMEPATH": "\\Users\\dengxueyun",
+    "HOSTNAME": "RomensLinux",
+    "INFOPATH": "C:\\Program Files\\Git\\usr\\local\\info;C:\\Program Files\\Git\\usr\\share\\info;C:\\Program Files\\Git\\usr\\info;C:\\Program Files\\Git\\share\\info",
+    "INIT_CWD": "D:\\wamp64\\www\\dengxueyun\\newshopFont2\\newshopfront",
+    "LANG": "zh_CN.UTF-8",
+    "LOCALAPPDATA": "C:\\Users\\dengxueyun\\AppData\\Local",
+    "LOGONSERVER": "\\\\RomensLinux",
+    "MANPATH": "C:\\Program Files\\Git\\mingw64\\local\\man;C:\\Program Files\\Git\\mingw64\\share\\man;C:\\Program Files\\Git\\usr\\local\\man;C:\\Program Files\\Git\\usr\\share\\man;C:\\Program Files\\Git\\usr\\man;C:\\Program Files\\Git\\share\\man",
+    "MINGW_CHOST": "x86_64-w64-mingw32",
+    "MINGW_PACKAGE_PREFIX": "mingw-w64-x86_64",
+    "MINGW_PREFIX": "C:/Program Files/Git/mingw64",
+    "MSYSTEM": "MINGW64",
+    "MSYSTEM_CARCH": "x86_64",
+    "MSYSTEM_CHOST": "x86_64-w64-mingw32",
+    "MSYSTEM_PREFIX": "C:/Program Files/Git/mingw64",
+    "NODE": "D:\\Program Files\\nodejs\\node.exe",
+    "NODE_ENV": "development",
+    "npm_config_access": "",
+    "npm_config_allow_same_version": "",
+    "npm_config_also": "",
+    "npm_config_always_auth": "",
+    "npm_config_argv": "{\"remain\":[],\"cooked\":[\"run\",\"serve\"],\"original\":[\"run\",\"serve\"]}",
+    "npm_config_audit": "true",
+    "npm_config_audit_level": "low",
+    "npm_config_auth_type": "legacy",
+    "npm_config_before": "",
+    "npm_config_bin_links": "true",
+    "npm_config_browser": "",
+    "npm_config_ca": "",
+    "npm_config_cache": "C:\\Users\\dengxueyun\\AppData\\Roaming\\npm-cache",
+    "npm_config_cache_lock_retries": "10",
+    "npm_config_cache_lock_stale": "60000",
+    "npm_config_cache_lock_wait": "10000",
+    "npm_config_cache_max": "Infinity",
+    "npm_config_cache_min": "10",
+    "npm_config_cafile": "",
+    "npm_config_cert": "",
+    "npm_config_cidr": "",
+    "npm_config_color": "true",
+    "npm_config_commit_hooks": "true",
+    "npm_config_depth": "Infinity",
+    "npm_config_description": "true",
+    "npm_config_dev": "",
+    "npm_config_dry_run": "",
+    "npm_config_editor": "notepad.exe",
+    "npm_config_engine_strict": "",
+    "npm_config_fetch_retries": "2",
+    "npm_config_fetch_retry_factor": "10",
+    "npm_config_fetch_retry_maxtimeout": "60000",
+    "npm_config_fetch_retry_mintimeout": "10000",
+    "npm_config_force": "",
+    "npm_config_format_package_lock": "true",
+    "npm_config_git": "git",
+    "npm_config_git_tag_version": "true",
+    "npm_config_global": "",
+    "npm_config_globalconfig": "C:\\Users\\dengxueyun\\AppData\\Roaming\\npm\\etc\\npmrc",
+    "npm_config_globalignorefile": "C:\\Users\\dengxueyun\\AppData\\Roaming\\npm\\etc\\npmignore",
+    "npm_config_global_style": "",
+    "npm_config_group": "",
+    "npm_config_ham_it_up": "",
+    "npm_config_heading": "npm",
+    "npm_config_https_proxy": "",
+    "npm_config_if_present": "",
+    "npm_config_ignore_prepublish": "",
+    "npm_config_ignore_scripts": "",
+    "npm_config_init_author_email": "",
+    "npm_config_init_author_name": "",
+    "npm_config_init_author_url": "",
+    "npm_config_init_license": "ISC",
+    "npm_config_init_module": "C:\\Users\\dengxueyun\\.npm-init.js",
+    "npm_config_init_version": "1.0.0",
+    "npm_config_json": "",
+    "npm_config_key": "",
+    "npm_config_legacy_bundling": "",
+    "npm_config_link": "",
+    "npm_config_local_address": "",
+    "npm_config_loglevel": "notice",
+    "npm_config_logs_max": "10",
+    "npm_config_long": "",
+    "npm_config_maxsockets": "50",
+    "npm_config_message": "%s",
+    "npm_config_metrics_registry": "https://registry.npmjs.org/",
+    "npm_config_node_gyp": "D:\\Program Files\\nodejs\\node_modules\\npm\\node_modules\\node-gyp\\bin\\node-gyp.js",
+    "npm_config_node_options": "",
+    "npm_config_node_version": "12.13.0",
+    "npm_config_noproxy": "",
+    "npm_config_offline": "",
+    "npm_config_onload_script": "",
+    "npm_config_only": "",
+    "npm_config_optional": "true",
+    "npm_config_otp": "",
+    "npm_config_package_lock": "true",
+    "npm_config_package_lock_only": "",
+    "npm_config_parseable": "",
+    "npm_config_prefer_offline": "",
+    "npm_config_prefer_online": "",
+    "npm_config_prefix": "C:\\Users\\dengxueyun\\AppData\\Roaming\\npm",
+    "npm_config_preid": "",
+    "npm_config_production": "",
+    "npm_config_progress": "true",
+    "npm_config_proxy": "",
+    "npm_config_read_only": "",
+    "npm_config_rebuild_bundle": "true",
+    "npm_config_registry": "https://registry.npmjs.org/",
+    "npm_config_rollback": "true",
+    "npm_config_save": "true",
+    "npm_config_save_bundle": "",
+    "npm_config_save_dev": "",
+    "npm_config_save_exact": "",
+    "npm_config_save_optional": "",
+    "npm_config_save_prefix": "^",
+    "npm_config_save_prod": "",
+    "npm_config_scope": "",
+    "npm_config_scripts_prepend_node_path": "warn-only",
+    "npm_config_script_shell": "",
+    "npm_config_searchexclude": "",
+    "npm_config_searchlimit": "20",
+    "npm_config_searchopts": "",
+    "npm_config_searchstaleness": "900",
+    "npm_config_send_metrics": "",
+    "npm_config_shell": "C:\\Windows\\system32\\cmd.exe",
+    "npm_config_shrinkwrap": "true",
+    "npm_config_sign_git_commit": "",
+    "npm_config_sign_git_tag": "",
+    "npm_config_sso_poll_frequency": "500",
+    "npm_config_sso_type": "oauth",
+    "npm_config_strict_ssl": "true",
+    "npm_config_tag": "latest",
+    "npm_config_tag_version_prefix": "v",
+    "npm_config_timing": "",
+    "npm_config_tmp": "C:\\Users\\DENGXU~1\\AppData\\Local\\Temp\\9",
+    "npm_config_umask": "0000",
+    "npm_config_unicode": "",
+    "npm_config_unsafe_perm": "true",
+    "npm_config_update_notifier": "true",
+    "npm_config_usage": "",
+    "npm_config_user": "",
+    "npm_config_userconfig": "C:\\Users\\dengxueyun\\.npmrc",
+    "npm_config_user_agent": "npm/6.12.0 node/v12.13.0 win32 x64",
+    "npm_config_version": "",
+    "npm_config_versions": "",
+    "npm_config_viewer": "browser",
+    "npm_execpath": "D:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js",
+    "npm_lifecycle_event": "serve",
+    "npm_lifecycle_script": "vue-cli-service serve",
+    "npm_node_execpath": "D:\\Program Files\\nodejs\\node.exe",
+    "npm_package_collective_type": "opencollective",
+    "npm_package_collective_url": "https://opencollective.com/ant-design-pro-vue",
+    "npm_package_dependencies_ant_design_vue": "1.4.2",
+    "npm_package_dependencies_axios": "^0.19.0",
+    "npm_package_dependencies_core_js": "^3.1.2",
+    "npm_package_dependencies_enquire_js": "^2.1.6",
+    "npm_package_dependencies_lodash_get": "^4.4.2",
+    "npm_package_dependencies_lodash_pick": "^4.4.0",
+    "npm_package_dependencies_md5": "^2.2.1",
+    "npm_package_dependencies_mockjs2": "1.0.8",
+    "npm_package_dependencies_moment": "^2.24.0",
+    "npm_package_dependencies_nprogress": "^0.2.0",
+    "npm_package_dependencies_viser_vue": "^2.4.6",
+    "npm_package_dependencies_vue": "^2.6.10",
+    "npm_package_dependencies_vuex": "^3.1.1",
+    "npm_package_dependencies_vue_clipboard2": "^0.2.1",
+    "npm_package_dependencies_vue_cropper": "0.4.9",
+    "npm_package_dependencies_vue_ls": "^3.2.1",
+    "npm_package_dependencies_vue_quill_editor": "^3.0.6",
+    "npm_package_dependencies_vue_router": "^3.1.2",
+    "npm_package_dependencies_vue_svg_component_runtime": "^1.0.1",
+    "npm_package_dependencies_wangeditor": "^3.1.1",
+    "npm_package_dependencies__antv_data_set": "^0.10.2",
+    "npm_package_description": "English | [简体中文](./README.zh-CN.md)",
+    "npm_package_devDependencies_babel_eslint": "^10.0.1",
+    "npm_package_devDependencies_babel_plugin_import": "^1.12.2",
+    "npm_package_devDependencies_babel_plugin_transform_remove_console": "^6.9.4",
+    "npm_package_devDependencies_eslint": "^5.16.0",
+    "npm_package_devDependencies_eslint_plugin_html": "^5.0.0",
+    "npm_package_devDependencies_eslint_plugin_vue": "^5.2.3",
+    "npm_package_devDependencies_less": "^3.0.4",
+    "npm_package_devDependencies_less_loader": "^5.0.0",
+    "npm_package_devDependencies_opencollective": "^1.0.3",
+    "npm_package_devDependencies_opencollective_postinstall": "^2.0.2",
+    "npm_package_devDependencies_vue_svg_icon_loader": "^2.1.1",
+    "npm_package_devDependencies_vue_template_compiler": "^2.6.10",
+    "npm_package_devDependencies_webpack_theme_color_replacer": "^1.2.17",
+    "npm_package_devDependencies__ant_design_colors": "^3.2.1",
+    "npm_package_devDependencies__vue_cli_plugin_babel": "^4.0.4",
+    "npm_package_devDependencies__vue_cli_plugin_eslint": "^4.0.4",
+    "npm_package_devDependencies__vue_cli_plugin_router": "^4.0.4",
+    "npm_package_devDependencies__vue_cli_plugin_unit_jest": "^4.0.4",
+    "npm_package_devDependencies__vue_cli_plugin_vuex": "^4.0.4",
+    "npm_package_devDependencies__vue_cli_service": "^4.0.4",
+    "npm_package_devDependencies__vue_eslint_config_standard": "^4.0.0",
+    "npm_package_devDependencies__vue_test_utils": "^1.0.0-beta.29",
+    "npm_package_gitHead": "2f692c8237309e1ef2c8fbdf278596c5c99c1024",
+    "npm_package_name": "vue-antd-pro",
+    "npm_package_private": "true",
+    "npm_package_readmeFilename": "README.md",
+    "npm_package_scripts_build": "vue-cli-service build",
+    "npm_package_scripts_build_preview": "vue-cli-service build --mode preview",
+    "npm_package_scripts_lint": "vue-cli-service lint",
+    "npm_package_scripts_lint_nofix": "vue-cli-service lint --no-fix",
+    "npm_package_scripts_postinstall": "opencollective-postinstall",
+    "npm_package_scripts_serve": "vue-cli-service serve",
+    "npm_package_scripts_test_unit": "vue-cli-service test:unit",
+    "npm_package_version": "2.1.0",
+    "NUMBER_OF_PROCESSORS": "4",
+    "ORIGINAL_PATH": "C:\\Program Files\\Git\\mingw64\\bin;C:\\Program Files\\Git\\usr\\bin;C:\\Users\\dengxueyun\\bin;C:\\Users\\zhanghongxia\\AppData\\Roaming\\npm;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0;D:\\Program Files\\nodejs;D:\\wamp64\\bin\\php\\php7.3.5;C:\\ProgramData\\ComposerSetup\\bin;C:\\Program Files\\Git\\cmd;C:\\Users\\dengxueyun\\AppData\\Local\\Programs\\Microsoft VS Code\\bin",
+    "ORIGINAL_TEMP": "C:/Users/DENGXU~1/AppData/Local/Temp/9",
+    "ORIGINAL_TMP": "C:/Users/DENGXU~1/AppData/Local/Temp/9",
+    "OS": "Windows_NT",
+    "PATH": "D:\\Program Files\\nodejs\\node_modules\\npm\\node_modules\\npm-lifecycle\\node-gyp-bin;D:\\wamp64\\www\\dengxueyun\\newshopFont2\\newshopfront\\node_modules\\.bin;C:\\Users\\dengxueyun\\bin;C:\\Program Files\\Git\\mingw64\\bin;C:\\Program Files\\Git\\usr\\local\\bin;C:\\Program Files\\Git\\usr\\bin;C:\\Program Files\\Git\\usr\\bin;C:\\Program Files\\Git\\mingw64\\bin;C:\\Program Files\\Git\\usr\\bin;C:\\Users\\dengxueyun\\bin;C:\\Users\\zhanghongxia\\AppData\\Roaming\\npm;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0;D:\\Program Files\\nodejs;D:\\wamp64\\bin\\php\\php7.3.5;C:\\ProgramData\\ComposerSetup\\bin;C:\\Program Files\\Git\\cmd;C:\\Users\\dengxueyun\\AppData\\Local\\Programs\\Microsoft VS Code\\bin;C:\\Program Files\\Git\\usr\\bin\\vendor_perl;C:\\Program Files\\Git\\usr\\bin\\core_perl",
+    "Path": "D:\\Program Files\\nodejs\\node_modules\\npm\\node_modules\\npm-lifecycle\\node-gyp-bin;D:\\wamp64\\www\\dengxueyun\\newshopFont2\\newshopfront\\node_modules\\.bin;C:\\Users\\dengxueyun\\bin;C:\\Program Files\\Git\\mingw64\\bin;C:\\Program Files\\Git\\usr\\local\\bin;C:\\Program Files\\Git\\usr\\bin;C:\\Program Files\\Git\\usr\\bin;C:\\Program Files\\Git\\mingw64\\bin;C:\\Program Files\\Git\\usr\\bin;C:\\Users\\dengxueyun\\bin;C:\\Users\\zhanghongxia\\AppData\\Roaming\\npm;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0;D:\\Program Files\\nodejs;D:\\wamp64\\bin\\php\\php7.3.5;C:\\ProgramData\\ComposerSetup\\bin;C:\\Program Files\\Git\\cmd;C:\\Users\\dengxueyun\\AppData\\Local\\Programs\\Microsoft VS Code\\bin;C:\\Program Files\\Git\\usr\\bin\\vendor_perl;C:\\Program Files\\Git\\usr\\bin\\core_perl",
+    "PATHEXT": ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JSE;.WSF;.WSH;.MSC",
+    "PKG_CONFIG_PATH": "C:\\Program Files\\Git\\mingw64\\lib\\pkgconfig;C:\\Program Files\\Git\\mingw64\\share\\pkgconfig",
+    "PLINK_PROTOCOL": "ssh",
+    "PROCESSOR_ARCHITECTURE": "AMD64",
+    "PROCESSOR_IDENTIFIER": "Intel64 Family 6 Model 85 Stepping 4, GenuineIntel",
+    "PROCESSOR_LEVEL": "6",
+    "PROCESSOR_REVISION": "5504",
+    "ProgramData": "C:\\ProgramData",
+    "PROGRAMFILES": "C:\\Program Files",
+    "ProgramFiles(x86)": "C:\\Program Files (x86)",
+    "ProgramW6432": "C:\\Program Files",
+    "PROMPT": "$P$G",
+    "PSModulePath": "C:\\Program Files\\WindowsPowerShell\\Modules;C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\Modules",
+    "PUBLIC": "C:\\Users\\Public",
+    "PWD": "D:/wamp64/www/dengxueyun/newshopFont2/newshopfront",
+    "SESSIONNAME": "RDP-Tcp#72",
+    "SHELL": "C:\\Program Files\\Git\\usr\\bin\\bash.exe",
+    "SHLVL": "2",
+    "SSH_ASKPASS": "C:/Program Files/Git/mingw64/libexec/git-core/git-gui--askpass",
+    "SYSTEMDRIVE": "C:",
+    "SYSTEMROOT": "C:\\Windows",
+    "TEMP": "C:\\Users\\DENGXU~1\\AppData\\Local\\Temp\\9",
+    "TERM": "xterm",
+    "TMP": "C:\\Users\\DENGXU~1\\AppData\\Local\\Temp\\9",
+    "TMPDIR": "C:\\Users\\DENGXU~1\\AppData\\Local\\Temp\\9",
+    "USERDOMAIN": "ROMENSLINUX",
+    "USERDOMAIN_ROAMINGPROFILE": "ROMENSLINUX",
+    "USERNAME": "dengxueyun",
+    "USERPROFILE": "C:\\Users\\dengxueyun",
+    "VUE_APP_API_BASE_URL": "/api",
+    "VUE_APP_PREVIEW": "true",
+    "VUE_CLI_ENTRY_FILES": "[\"D:\\\\wamp64\\\\www\\\\dengxueyun\\\\newshopFont2\\\\newshopfront\\\\src\\\\main.js\"]",
+    "WEBPACK_DEV_SERVER": "true",
+    "WINDIR": "C:\\Windows",
+    "_": "D:/Program Files/nodejs/node.exe",
+    "_prog": "node"
+  },
+  "sharedObjects": [
+    "D:\\Program Files\\nodejs\\node.exe",
+    "C:\\Windows\\SYSTEM32\\ntdll.dll",
+    "C:\\Windows\\system32\\KERNEL32.DLL",
+    "C:\\Windows\\system32\\KERNELBASE.dll",
+    "C:\\Windows\\SYSTEM32\\dbghelp.dll",
+    "C:\\Windows\\system32\\WS2_32.dll",
+    "C:\\Windows\\system32\\ADVAPI32.dll",
+    "C:\\Windows\\system32\\USER32.dll",
+    "C:\\Windows\\SYSTEM32\\IPHLPAPI.DLL",
+    "C:\\Windows\\system32\\PSAPI.DLL",
+    "C:\\Windows\\SYSTEM32\\USERENV.dll",
+    "C:\\Windows\\system32\\CRYPT32.dll",
+    "C:\\Windows\\SYSTEM32\\bcrypt.dll",
+    "C:\\Windows\\SYSTEM32\\WINMM.dll",
+    "C:\\Windows\\system32\\msvcrt.dll",
+    "C:\\Windows\\system32\\NSI.dll",
+    "C:\\Windows\\system32\\RPCRT4.dll",
+    "C:\\Windows\\SYSTEM32\\sechost.dll",
+    "C:\\Windows\\system32\\GDI32.dll",
+    "C:\\Windows\\SYSTEM32\\WINNSI.DLL",
+    "C:\\Windows\\SYSTEM32\\profapi.dll",
+    "C:\\Windows\\system32\\MSASN1.dll",
+    "C:\\Windows\\SYSTEM32\\WINMMBASE.dll",
+    "C:\\Windows\\system32\\SspiCli.dll",
+    "C:\\Windows\\SYSTEM32\\cfgmgr32.dll",
+    "C:\\Windows\\SYSTEM32\\DEVOBJ.dll",
+    "C:\\Windows\\system32\\IMM32.DLL",
+    "C:\\Windows\\system32\\MSCTF.dll",
+    "C:\\Windows\\SYSTEM32\\powrprof.dll",
+    "C:\\Windows\\system32\\uxtheme.dll",
+    "C:\\Windows\\SYSTEM32\\combase.dll",
+    "C:\\Windows\\system32\\mswsock.dll",
+    "C:\\Windows\\system32\\bcryptprimitives.dll",
+    "C:\\Windows\\system32\\napinsp.dll",
+    "C:\\Windows\\system32\\NLAapi.dll",
+    "C:\\Windows\\SYSTEM32\\DNSAPI.dll",
+    "C:\\Windows\\System32\\winrnr.dll",
+    "C:\\Windows\\SYSTEM32\\dhcpcsvc6.DLL",
+    "C:\\Windows\\SYSTEM32\\dhcpcsvc.DLL",
+    "C:\\Windows\\SYSTEM32\\CRYPTBASE.DLL"
+  ]
+}
\ No newline at end of file

src/api/store.js

@@ -45,7 +45,6 @@ export function modifyEvaluateDetails (parameter) {
 }
 // 新建门店评价
 export function addEvaluate (parameter) {
-  console.log('新建',parameter)
   return axios({
     url: homeUrl+'branch/branch-scores/add-branch-score',
     method: 'post',
@@ -54,12 +53,19 @@ export function addEvaluate (parameter) {
 }
 // 删除门店评价
 export function deleteEvaluate (id) {
-  console.log(id)
   return axios({
     url: homeUrl+'branch/branch-scores/score-info-del?guid='+id,
     method: 'delete'
   })
 }
+// 下载模板
+export function downloadFile (parameter) {
+  return axios({
+    url: homeUrl+'common/down-templates/template-file',
+    method: 'get',
+    params: parameter
+  })
+}
 // 门店管理
 // 获取门店列表
 export function getStoreList (parameter) {
@@ -111,6 +117,22 @@ export function uploadStorePicture (parameter) {
     data: parameter
   })
 }
+// 门店管理新增
+export function addStoreManage (parameter) {
+  return axios({
+    url: homeUrl+'branch/branches/add-branch',
+    method: 'post',
+    data: parameter
+  })
+}
+// 门店管理编辑
+export function modifyStoreManage (parameter) {
+  return axios({
+    url: homeUrl+'branch/branches/revise-branch',
+    method: 'put',
+    data: parameter
+  })
+}
 // 获取门店服务类目管理
 export function getScategorymg(parameter) {
   console.log(parameter)

src/views/storedc/details/storeManage_details.vue

@@ -9,9 +9,10 @@
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
                         <a-input
-                        disabled
+                        placeholder="请输入门店名称"
                         v-decorator="[
-                            'NAME'
+                            'NAME',
+                            {rules: [{ required: true,message:'请输入门店名称'}]}
                         ]"
                         name="NAME" />
                     </a-form-item>
@@ -20,7 +21,8 @@
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
                         <a-input
-                        disabled
+                        :disabled="isCanEnter"
+                        placeholder="请输入门店编号"
                         v-decorator="[
                             'CODE'
                         ]"
@@ -56,13 +58,13 @@
                         label="地址"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
-                            <a-select style="width:30%" placeholder="请选择省份" v-decorator="['RECIVER_PROVINCE',{normalize:checkAddress}]">
+                            <a-select style="width:30%" placeholder="请选择省份" @select="handleProvinceChange" v-decorator="['RECIVER_PROVINCE',{rules: [{ required: true,message: '请选择地址'}],normalize:checkAddress}]">
                                 <a-select-option v-for="item in provinceData" :key="item.GUID">{{item.NAME}}</a-select-option>
                             </a-select>
-                            <a-select style="width:30%" placeholder="请选择省城市" v-decorator="['RECIVER_CITY']">
+                            <a-select style="width:30%" placeholder="请选择城市" @select="handleCityChange" v-decorator="['RECIVER_CITY',{rules: [{required: true,message: '请选择地址'}]}]">
                                 <a-select-option v-for="item in cityData" :key="item.GUID">{{item.NAME}}</a-select-option>
                             </a-select>
-                            <a-select style="width:30%" placeholder="请选择区域" v-decorator="['RECIVER_REGION']">
+                            <a-select style="width:30%" placeholder="请选择区域" @select="handleRegionChange" v-decorator="['RECIVER_REGION',{rules: [{required: true,message: '请选择地址'}]}]">
                                 <a-select-option v-for="item in regionData" :key="item.GUID">{{item.NAME}}</a-select-option>
                             </a-select>
                     </a-form-item>
@@ -71,7 +73,7 @@
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
                         <a-input
-                        disabled
+                        placeholder="请输入详细地址"
                         v-decorator="[
                             'ADDRESS'
                         ]"
@@ -84,13 +86,21 @@
                         <div id="components-button-demo-button-group">
                             <a-col :span="12">
                                 <a-input-group compact>
-                                    <a-input style="width:50%" v-decorator="['LAT']" />
+                                    <a-input
+                                        style="width:50%" 
+                                        v-decorator="['LAT']"
+                                        placeholder="请输入坐标" 
+                                    />
                                     <a-button type="primary" style="width:20%">LAT</a-button>
                                 </a-input-group>
                             </a-col>
                             <a-col :span="12">
                                 <a-input-group compact>
-                                    <a-input style="width:50%" v-decorator="['LNG']" />
+                                    <a-input 
+                                        style="width:50%" 
+                                        v-decorator="['LNG']" 
+                                        placeholder="请输入坐标" 
+                                    />
                                     <a-button type="primary" style="width:20%">LNG</a-button>
                                 </a-input-group>
                             </a-col>
@@ -100,14 +110,13 @@
                         label="是否积分兑换门店"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
-                        <a-checkbox v-decorator="['IS_POINTS_SHOP',{valuePropName:'checked',normalize:checkCheckbox}]"></a-checkbox>
+                        <a-checkbox v-decorator="['IS_POINTS_SHOP',{initialValue:true,valuePropName:'checked',normalize:checkCheckbox}]"></a-checkbox>
                     </a-form-item>
                     <a-form-item
                         label="描述"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
                         <a-textarea
-                        disabled
                         v-decorator="[
                             'DESCRIPTION'
                         ]"
@@ -124,9 +133,10 @@
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
                         <a-input
-                        disabled
+                        placeholder="请输入门店简称"
                         v-decorator="[
-                            'BRANCH_NAME'
+                            'BRANCH_NAME',
+                            {rules:[{required:true,message: '请输入门店简称'}]}
                         ]"
                         name="BRANCH_NAME" />
                     </a-form-item>
@@ -161,7 +171,7 @@
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
                         <a-input
-                        disabled
+                        placeholder="请输入电话/手机号"
                         v-decorator="[
                             'PHONE'
                         ]"
@@ -172,7 +182,7 @@
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
                         <a-input
-                        disabled
+                        placeholder="请输入联系人姓名"
                         v-decorator="[
                             'CONTACT_NAME'
                         ]"
@@ -198,6 +208,7 @@
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
                         <a-input
+                        placeholder="请输入门店评分"
                         v-decorator="[
                             'SCORE'
                         ]"
@@ -207,40 +218,39 @@
                         label="是否医保"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
-                        <a-checkbox v-decorator="['IS_CARE',{valuePropName:'checked',normalize:checkCheckbox}]"></a-checkbox>
+                        <a-checkbox v-decorator="['IS_CARE',{initialValue:true,valuePropName:'checked',normalize:checkCheckbox}]"></a-checkbox>
                     </a-form-item>
                     <a-form-item
                         label="是否O2O门店"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
-                        <a-checkbox v-decorator="['IS_O2O',{valuePropName:'checked',normalize:checkCheckbox}]"></a-checkbox>
+                        <a-checkbox v-decorator="['IS_O2O',{initialValue:true,valuePropName:'checked',normalize:checkCheckbox}]"></a-checkbox>
                     </a-form-item>
                     <a-form-item
                         label="是否支持冷链配送"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
-                        <a-checkbox v-decorator="['IS_DELIVERY_CODECHAIN_GOODS',{valuePropName:'checked',normalize:checkCheckbox}]"></a-checkbox>
+                        <a-checkbox v-decorator="['IS_DELIVERY_CODECHAIN_GOODS',{initialValue:true,valuePropName:'checked',normalize:checkCheckbox}]"></a-checkbox>
                     </a-form-item>
                     <a-form-item
                         label="是否营业"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
-                        <a-checkbox v-decorator="['IS_SHELVE',{valuePropName:'checked',normalize:checkCheckbox}]"></a-checkbox>
+                        <a-checkbox v-decorator="['IS_SHELVE',{initialValue:true,valuePropName:'checked',normalize:checkCheckbox}]"></a-checkbox>
                     </a-form-item>
                     <a-form-item
                         label="营业时间"
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
-                            <!-- <a-range-picker v-decorator="['WORK_TIME',{normalize:checkDate}]" show-time /> -->
                             <a-col :span="3"></a-col>
                             <a-col :span="8">
                                 <span>开始营业时间</span>
-                                <a-time-picker v-decorator="['WORK_TIME_START',{normalize:checkDate}]" format="h:mm" />
+                                <a-time-picker @change="(val,dateStrings)=>changeTime(val,dateStrings,'worktime_start')" v-decorator="['WORK_TIME_START',{normalize:checkDate}]" />
                             </a-col>
                             <a-col :span="2"></a-col>
                             <a-col :span="8">
                                 <span>结束营业时间</span>
-                                <a-time-picker v-decorator="['WORK_TIME_END',{normalize:checkDate}]" format="h:mm" />
+                                <a-time-picker hideDisabledOptions @change="(val,dateStrings)=>changeTime(val,dateStrings,'worktime_end')" :disabledHours="getDisabledHours" :disabledMinutes="getDisabledMinutes" :disabledSeconds="getDisabledSeconds" v-decorator="['WORK_TIME_END',{normalize:checkDate}]" />
                             </a-col>
                             <a-col :span="3"></a-col>
                     </a-form-item>
@@ -251,12 +261,12 @@
                             <a-col :span="3"></a-col>
                             <a-col :span="8">
                                 <span>开始配送时间</span>
-                                <a-time-picker v-decorator="['DELIVERY_TIME_START',{normalize:checkDate}]" format="h:mm" />
+                                <a-time-picker @change="(val,dateStrings)=>changeTime(val,dateStrings,'develiytime_start')" v-decorator="['DELIVERY_TIME_START',{normalize:checkDate}]" />
                             </a-col>
                             <a-col :span="2"></a-col>
                             <a-col :span="8">
                                 <span>结束配送时间</span>
-                                <a-time-picker v-decorator="['DELIVERY_TIME_END',{normalize:checkDate}]" format="h:mm" />
+                                <a-time-picker hideDisabledOptions @change="(val,dateStrings)=>changeTime(val,dateStrings,'develiytime_end')" :disabledHours="getDisabledHoursDeveliy" :disabledMinutes="getDisabledMinutesDeveliy" :disabledSeconds="getDisabledSecondsDeveliy" v-decorator="['DELIVERY_TIME_END',{normalize:checkDate}]" />
                             </a-col>
                             <a-col :span="3"></a-col>
                     </a-form-item>
@@ -265,7 +275,7 @@
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
                         <a-checkbox-group v-decorator="['TRANSPORT_TYPE',{normalize:checkCheckArr}]">
-                            <a-checkbox :span="4" v-for="(item,index) in details_develiyGroup" :key="index" :value="item.GUID">{{item.NAME}}</a-checkbox>
+                            <a-checkbox :span="4" v-for="(item,index) in details_develiyGroup" defaultValue="0" :key="index" :value="item.GUID">{{item.NAME}}</a-checkbox>
                         </a-checkbox-group>
                     </a-form-item>
                     <a-form-item
@@ -273,7 +283,6 @@
                         :labelCol="labelCol"
                         :wrapperCol="wrapperCol">
                         <a-textarea
-                        disabled
                         v-decorator="[
                             'RETURN_ADDRESS'
                         ]"
@@ -288,8 +297,10 @@
             :wrapperCol="{ span: 24 }"
             style="text-align: center"
         >
-            <!-- <a-button v-if='goId==1' @click.stop.prevent="handleSubmit" htmlType="submit" type="primary">提交</a-button> -->
-            <!-- <a-button v-else @click.stop.prevent="handleSubmit1()" htmlType="submit" type="primary">提交</a-button> -->
+            <!-- 新建 -->
+            <a-button v-if='isCanEnter==false' @click.stop.prevent="handleSubmit" htmlType="submit" type="primary">提交</a-button>
+            <!-- 编辑 -->
+            <a-button v-else @click.stop.prevent="handleSubmit1" htmlType="submit" type="primary">提交</a-button>
             <a-button @click="goBack" style="margin-left: 8px">返回</a-button>
         </a-form-item>
     </a-form>
@@ -298,7 +309,7 @@
 
 <script>
     import moment from 'moment'
-    import { getStoreDetails,loadAddress,getStoreServiceList,getStoreDeveliy,uploadStorePicture } from '@/api/store'
+    import { getStoreDetails,loadAddress,getStoreServiceList,getStoreDeveliy,uploadStorePicture,addStoreManage,modifyStoreManage } from '@/api/store'
 
 
     export default {
@@ -316,32 +327,125 @@
                 size: 'default',
                 details_serviceGroup:[],//服务类目
                 details_develiyGroup:[],//配送类型
-                targetOption:null,
+                targetOption:null,//cascer用的选择省市区
                 // 下拉选择
                 addressProvince:null,
                 addressCity:null,
                 addressRegion:null,
-                provinceData:[],
-                cityData:[],
-                regionData:[],
+                provinceData:[],//省份
+                cityData:[],//城市
+                regionData:[],//区域
+                //放大图片
                 previewVisible: false,
                 previewImage: '',
                 fileList: [
-                ],
+                ],//营业执照
                 BranchfileList:[
-                ],
+                ],//门店图片
                 // removeIds:[],
-                activeKey:['1']
+                activeKey:['1'],//控制下拉面板 
+                isCanEnter:false,//是否禁止输入
+                licencePath:'',//营业执照路径
+                branchPath:'',//门店照片路径
+                worktime_start:null,//开始营业时间
+                worktime_end:null,//结束营业时间
+                develiytime_start:null,//开始配送时间
+                develiytime_end:null,//结束配送时间
             }
         },
         beforeCreate(){
             this.form = this.$form.createForm(this)
         },
         mounted(){
-            this.loadMessage();
             this.loadProvince();
+            this.loadDeveliy();
+            this.loadService();
+            var goId=this.$route.query.goid;
+            if(goId==0){
+                this.loadMessage();
+                this.isCanEnter=true;
+            }
         },
         methods: {
+            // 新建提交
+            handleSubmit () {
+                const { form: { validateFields } } = this;
+                validateFields({ force: true }, (err, values) => {
+                    if (!err) {
+                        const storeManageParams = { ...values };
+                        for(let item in storeManageParams){
+                            if(storeManageParams[item]===true){
+                                storeManageParams[item]='1'
+                            }else if(storeManageParams[item]===false){
+                                storeManageParams[item]='0'
+                            }
+                        }
+                        if(storeManageParams.WORK_TIME_START){
+                            storeManageParams.WORK_TIME_START=storeManageParams.WORK_TIME_START.format('HH:mm');
+                        }
+                        if(storeManageParams.WORK_TIME_END){
+                            storeManageParams.WORK_TIME_END=storeManageParams.WORK_TIME_END.format('HH:mm');
+                        }
+                        if(storeManageParams.DELIVERY_TIME_START){
+                            storeManageParams.DELIVERY_TIME_START=storeManageParams.DELIVERY_TIME_START.format('HH:mm');
+                        }
+                        if(storeManageParams.DELIVERY_TIME_END){
+                            storeManageParams.DELIVERY_TIME_END=storeManageParams.DELIVERY_TIME_END.format('HH:mm');
+                        }
+                        storeManageParams.LICENCE_IMAGE_PATH=this.licencePath;
+                        storeManageParams.BRANCH_IMAGE_PATH=this.branchPath;
+                        if(storeManageParams.TRANSPORT_TYPE){
+                            storeManageParams.TRANSPORT_TYPE=storeManageParams.TRANSPORT_TYPE.join(',')
+                        }
+                        addStoreManage(storeManageParams).then(res => {
+                            this.goBack();
+                        }).catch(err => {
+
+                        })
+                    }
+                })
+            },
+            handleSubmit1(){
+                const { form: { validateFields } } = this;
+                
+                const id=this.$route.query.GUID;
+                validateFields({ force: true }, (err, values) => {
+                    if (!err) {
+                        const storeManageParams = Object.assign({ ...values },{GUID:id});
+                        for(let item in storeManageParams){
+                            if(storeManageParams[item]===true){
+                                storeManageParams[item]='1'
+                            }else if(storeManageParams[item]===false){
+                                storeManageParams[item]='0'
+                            }
+                        }
+                        if(storeManageParams.WORK_TIME_START){
+                            storeManageParams.WORK_TIME_START=storeManageParams.WORK_TIME_START.format('HH:mm');
+                        }
+                        if(storeManageParams.WORK_TIME_END){
+                            storeManageParams.WORK_TIME_END=storeManageParams.WORK_TIME_END.format('HH:mm');
+                        }
+                        if(storeManageParams.DELIVERY_TIME_START){
+                            storeManageParams.DELIVERY_TIME_START=storeManageParams.DELIVERY_TIME_START.format('HH:mm');
+                        }
+                        if(storeManageParams.DELIVERY_TIME_END){
+                            storeManageParams.DELIVERY_TIME_END=storeManageParams.DELIVERY_TIME_END.format('HH:mm');
+                        }
+                        storeManageParams.LICENCE_IMAGE_PATH=this.licencePath;
+                        storeManageParams.BRANCH_IMAGE_PATH=this.branchPath;
+                        if(storeManageParams.TRANSPORT_TYPE){
+                            storeManageParams.TRANSPORT_TYPE=storeManageParams.TRANSPORT_TYPE.join(',')
+                        }
+                        console.log(storeManageParams)
+                        modifyStoreManage(storeManageParams).then(res => {
+                            this.goBack();
+                        }).catch(err => {
+
+                        })
+                    }
+                })
+            },
+            // 图片上传
             customRequest(files) {
                 var that=this;
                 const { file } = files;
@@ -361,7 +465,6 @@
                 const formData = new FormData();
                 formData.append('uploadFile',file)
                 uploadStorePicture(formData).then(res => {
-                    // that.setState(() => ({ BranchfileList: [{ ...file },{ url,status:"done"}] }))
                     if(files.action==1){
                         this.fileList.push({
                             uid:'-1',
@@ -369,6 +472,7 @@
                             status:'done',
                             url:imgData
                         })
+                        this.licencePath=res.imgUrl[0]
                     }else{
                         this.BranchfileList.push({
                             uid:'-1',
@@ -376,10 +480,14 @@
                             status:'done',
                             url:imgData
                         })
+                        this.branchPath=res.imgUrl[0]
                     }
                 })
             },
+            // 服务类目处理
             checkService(value){
+                if(value){
+                    if(value.length>0){
                         if(value[0].SERVICE_TYPE_GUID){
                             let serviceArr=[];
                             value.forEach(item => {
@@ -389,22 +497,186 @@
                         }else{
                             return value
                         }
+                    }else{
+                        return value
+                    }
+                }else{
+                    return value
+                }
             },
+            // 日期处理
             checkDate(value){
-                // if(value || value!=null || value!=""){
-                    return moment(value,"h:mm")
-                // }
+                if(value && value!=null && value!="" && value!='undefined'){
+                    return moment(value,"HH:mm")
+                }
             },
+            changeTime(val,dateStrings,type){
+                if(type==='worktime_start'){
+                    this.worktime_start=dateStrings
+                }else if(type==='worktime_end'){
+                    this.worktime_end=dateStrings
+                }else if(type==='develiytime_start'){
+                    this.develiytime_start=dateStrings
+                }else{
+                    this.develiytime_end=dateStrings
+                }
+            },
+            // 营业时间处理
+            getDisabledHours(){
+                let hours=[]
+                if(this.worktime_start && this.worktime_start!=""){
+                    let time=this.worktime_start
+                    let timeArr=time.split(':')
+                    for(let i=0;i<parseInt(timeArr[0]);i++){
+                        hours.push(i)
+                    }
+                }else{
+                    for(let i=0;i<24;i++){
+                        hours.push(i)
+                    }
+
+                }
+                    return hours
+            },
+            getDisabledMinutes(selectedHour){
+                    let minutes=[]
+                if(this.worktime_start && this.worktime_start!=""){
+                    let time=this.worktime_start
+                    let timeArr=time.split(':')
+                    if(selectedHour==parseInt(timeArr[0])){
+                        for(let i=0;i<parseInt(timeArr[1]);i++){
+                            minutes.push(i)
+                        }
+                    }
+                }else{
+                    for(let i=0;i<60;i++){
+                        minutes.push(i)
+                    }
+
+                }
+                    return minutes
+            },
+            getDisabledSeconds(selectedHour,selectedMinute){
+                    let second=[]
+                    if(this.worktime_start && this.worktime_start!=""){
+                        let time=this.worktime_start
+                        let timeArr=time.split(':')
+                        if(selectedHour==parseInt(timeArr[0])&&selectedMinute==parseInt(timeArr[1])){
+                            for(let i=0;i<parseInt(timeArr[2]);i++){
+                                second.push(i)
+                            }
+                        }
+                    }else{
+                        for(let i=0;i<60;i++){
+                            second.push(i)
+                        }
+                    }
+                    return second
+            },
+            // 配送时间处理
+            getDisabledHoursDeveliy(){
+                let hoursDeveliy=[]
+                if(this.develiytime_start && this.develiytime_start!=""){
+                    let time=this.develiytime_start
+                    let timeArr=time.split(':')
+                    for(let i=0;i<parseInt(timeArr[0]);i++){
+                        hoursDeveliy.push(i)
+                    }
+                }else{
+                    for(let i=0;i<24;i++){
+                            hoursDeveliy.push(i)
+                        }
+                }
+                    return hoursDeveliy
+            },
+            getDisabledMinutesDeveliy(selectedHour){
+                let minutesDeveliy=[]
+                if(this.develiytime_start && this.develiytime_start!=""){
+                    let time=this.develiytime_start
+                    let timeArr=time.split(':')
+                    if(selectedHour==parseInt(timeArr[0])){
+                        for(let i=0;i<parseInt(timeArr[1]);i++){
+                            minutesDeveliy.push(i)
+                        }
+                    }
+                }else{
+                    for(let i=0;i<60;i++){
+                        minutesDeveliy.push(i)
+                    }
+                }
+                    return minutesDeveliy
+            },
+            getDisabledSecondsDeveliy(selectedHour,selectedMinute){
+                let secondDeveliy=[]
+                if(this.develiytime_start && this.develiytime_start!=""){
+                    let time=this.develiytime_start
+                    let timeArr=time.split(':')
+                    if(selectedHour==parseInt(timeArr[0])&&selectedMinute==parseInt(timeArr[1])){
+                        for(let i=0;i<parseInt(timeArr[2]);i++){
+                            secondDeveliy.push(i)
+                        }
+                    }
+                }else{
+                    for(let i=0;i<60;i++){
+                        secondDeveliy.push(i)
+                    }
+                }
+                    return secondDeveliy
+            },
+            // checkboxGroup处理
             checkCheckArr(value){
+                if(value){
                     if(typeof(value)=='string'){
                         return value.split(',')
                     }else{
                         return value
                     }
+                }
             },
+            // 返回上一页
             goBack(){
                 this.$router.push({ path: "/storedc/storeManage" })
             },
+            // 省市区选择
+            handleProvinceChange(value){
+                let giveParent={
+                    PARENT_GUID: value
+                }
+                loadAddress(giveParent).then(res => {
+                    this.cityData=res.data
+                    this.form.setFieldsValue({
+                        'RECIVER_CITY':this.cityData[0].GUID
+                    })
+                    let giveParent={
+                        PARENT_GUID: this.cityData[0].GUID
+                    }
+                    loadAddress(giveParent).then(res => {
+                        this.regionData=res.data
+                        this.form.setFieldsValue({
+                            'RECIVER_REGION':this.regionData[0].GUID
+                        })
+                    }).catch( err=> {
+
+                    })
+                }).catch( err=> {
+
+                })
+            },
+            handleCityChange(value){
+                let giveParent={
+                    PARENT_GUID: value
+                }
+                loadAddress(giveParent).then(res => {
+                    this.regionData=res.data
+                    this.form.setFieldsValue({
+                        'RECIVER_REGION':this.regionData[0].GUID
+                    })
+                }).catch( err=> {
+
+                })
+            },
+            handleRegionChange(value){},
+            // 省市区处理
             checkAddress(value){
                 // this.addressData.push(value,this.addressCity,this.addressRegion)
                 this.provinceData.forEach(item => {
@@ -497,18 +769,24 @@
                 }
                 return isJPG && isLt2M
             },
-            // 获取信息
-            loadMessage(){
+            // 获取服务类目列表
+            loadService(){
                 getStoreServiceList().then(res => {
-                    this.details_serviceGroup=res.data;
+                    this.details_serviceGroup=res;
                 }).catch(err => {
 
                 })
+            },
+            // 获取配送类型列表
+            loadDeveliy(){
                 getStoreDeveliy().then(res => {
-                    this.details_develiyGroup=res.data;
+                    this.details_develiyGroup=res;
                 }).catch(err => {
 
                 })
+            },
+            // 获取信息
+            loadMessage(){
                 var id=this.$route.query.GUID;
                 getStoreDetails(id).then(res => {
                     this.$nextTick(() => {
@@ -519,18 +797,23 @@
                         res.WORK_TIME_END=this.timeGet(res.WORK_TIME)[1]
                         res.DELIVERY_TIME_START=this.timeGet(res.DELIVERY_TIME)[0]
                         res.DELIVERY_TIME_END=this.timeGet(res.DELIVERY_TIME)[1]
+                        if(res.LICENCE_IMAGE_PATH){
                             this.fileList.push({
                                 uid:'-1',
                                 name:'test.png',
                                 status:'done',
                                 url:res.LICENCE_IMAGE_PATH,
                             })
+                        }
+                        if(res.BRANCH_IMAGE_PATH){
                             this.BranchfileList.push({
                                 uid:'-1',
                                 name:'test.png',
                                 status:'done',
                                 url:res.BRANCH_IMAGE_PATH,
                             })
+                        }
+                        console.log(res)
                         this.form.setFieldsValue(res)
                     })
                 }).catch(err => {

src/views/storedc/storeEvaluateManage.vue

@@ -28,7 +28,7 @@
               <a-button-group>
                 <a-button @click="goEdit(1)" type='primary' icon='plus'>添加分值</a-button>
                 <a-button style="margin-left: 8px" type='primary' icon='file-add'>导入打分</a-button>
-                <a-button style="margin-left: 8px" type='primary' icon='download'>下载导入模板</a-button>
+                <a-button @click="downloadFile" style="margin-left: 8px" type='primary' icon='download'>下载导入模板</a-button>
               </a-button-group>
             </div>
             <s-table
@@ -288,7 +288,7 @@
 <script>
 import moment from 'moment'
 import { STable } from '@/components'
-import { getEvaluateList,getEvaluateDetails,modifyEvaluateDetails,addEvaluate,deleteEvaluate } from '@/api/store'
+import { getEvaluateList,getEvaluateDetails,modifyEvaluateDetails,addEvaluate,deleteEvaluate,downloadFile } from '@/api/store'
 
 export default {
   name: 'TableList',
@@ -299,11 +299,11 @@ export default {
     return {
       mdl: {},
       labelCol: {
-        xs: { span: 8 },
-        sm: { span: 8 }
+          xs: { span: 24 },
+          sm: { span: 7 }
       },
       wrapperCol: {
-        xs: { span: 12 },
+          xs: { span: 24 },
           sm: { span: 12 }
       },
       destroyOnClose:true,
@@ -370,6 +370,17 @@ export default {
       // this.$refs.table.refresh();
   },
   methods: {
+    // 下载模板门店服务评价打分模板（shop_branch_score_import.xls）
+    downloadFile(){
+      let downloadData={
+        'ENG_NAME':'shop_branch_score_import.xls',
+        'CN_NAME' :'门店服务评价打分模板'
+      }
+      downloadFile(downloadData).then(res => {
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     remove ( key ) {
       console.log(key)
       deleteEvaluate(key).then(res => {

src/views/storedc/storeManage.vue

@@ -79,6 +79,7 @@
       </div>
       <div class="table-operator">
         <a-button-group>
+          <a-button type='primary' icon='plus' @click="handleEdit(1)">新建门店</a-button>
           <a-button type='primary' icon='edit'>修改门店信息</a-button>
           <a-button style="margin-left: 8px" type='primary' icon='download'>导出门店</a-button>
         </a-button-group>
@@ -117,11 +118,11 @@ export default {
       mdl: {},
       addressTest:null,
       labelCol: {
-        xs: { span: 8 },
-        sm: { span: 8 }
+          xs: { span: 24 },
+          sm: { span: 7 }
       },
       wrapperCol: {
-        xs: { span: 12 },
+          xs: { span: 24 },
           sm: { span: 12 }
       },
       allowClear:true,
@@ -191,6 +192,7 @@ export default {
   },
   mounted(){
     this.loadProvince()
+    this.$refs.table.refresh();
   },
   methods: {
     // queryParame处理省市区传旨
@@ -269,8 +271,12 @@ export default {
     },
     handleOk(value){
     },
-    handleEdit(record) {
-      this.$router.push({path:'/storedc/storeManage_details',query:{GUID:record.GUID}})
+    handleEdit(value) {
+      if(value==1){
+        this.$router.push({path:'/storedc/storeManage_details',query:{goid:1}})
+      }else{
+        this.$router.push({path:'/storedc/storeManage_details',query:{goid:0,GUID:value.GUID}})
+      }
     },
     toggleAdvanced () {
       this.advanced = !this.advanced

src/views/userstaff/details/userGroup_edit.vue

@@ -3,8 +3,8 @@
     <a-form :form="form">
       <a-form-item
         label="组名称"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol">
         <a-input
           v-decorator="[
             'NAME',
@@ -15,8 +15,8 @@
       </a-form-item>
       <a-form-item
         label="优惠百分比"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }">
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol">
         <a-input
           placeholder="请输入优惠百分比"
           v-decorator="[
@@ -26,8 +26,8 @@
       </a-form-item>
       <a-form-item
         label="优惠范围"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
         :required="false"
       >
         <a-radio-group v-decorator="['IS_SETRANGE',{initialValue:'0',normalize:checkRadio}]">
@@ -56,8 +56,8 @@
       </a-form-item>
       <a-form-item
         label="是否为默认组"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
         :required="false"
       >
         <a-radio-group v-decorator="['IS_DEFAULT',{initialValue:'1',normalize:checkRadio}]">
@@ -67,8 +67,8 @@
       </a-form-item>
       <a-form-item
         label="积分比率"
-        :labelCol="{lg: {span: 7}, sm: {span: 7}}"
-        :wrapperCol="{lg: {span: 10}, sm: {span: 17} }"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
         :required="false"
       >
         <a-input-number v-decorator="['MONEY_POINT_SRATE']" :min="0" :max="100" />
@@ -96,6 +96,14 @@ export default {
   name: 'BaseForm',
   data () {
     return {
+        labelCol: {
+            xs: { span: 24 },
+            sm: { span: 7 }
+        },
+        wrapperCol: {
+            xs: { span: 24 },
+            sm: { span: 12 }
+        },
         dataSource: [
           {
             key: '0',