Merge branch 'xiaoqin' into mergeBranch

package-lock.json

@@ -31,7 +31,6 @@
         "@babel/core": "^7.12.16",
         "@babel/eslint-parser": "^7.12.16",
         "@vue/cli-plugin-babel": "^5.0.0",
-        "@vue/cli-plugin-eslint": "^5.0.0",
         "@vue/cli-service": "^5.0.0",
         "@vue/eslint-config-airbnb": "^6.0.0",
         "eslint": "^7.32.0",
@@ -2944,23 +2943,6 @@
         "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
       }
     },
-    "node_modules/@vue/cli-plugin-eslint": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.1.tgz",
-      "integrity": "sha512-ZGxIAT4b9ppMbePJrsZA6e5882n7JIQgji8LLyYSMuf0+GTsEjUDz01nRmAD7PW+Gpf8+B5oA2tU+S3E5l6/WA==",
-      "dev": true,
-      "dependencies": {
-        "@vue/cli-shared-utils": "^5.0.1",
-        "eslint-webpack-plugin": "^3.1.0",
-        "globby": "^11.0.2",
-        "webpack": "^5.54.0",
-        "yorkie": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0",
-        "eslint": ">=7.5.0"
-      }
-    },
     "node_modules/@vue/cli-plugin-router": {
       "version": "5.0.1",
       "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.1.tgz",
@@ -5145,12 +5127,6 @@
         "node": ">=6.0"
       }
     },
-    "node_modules/ci-info": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmmirror.com/ci-info/-/ci-info-1.6.0.tgz",
-      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-      "dev": true
-    },
     "node_modules/clean-css": {
       "version": "5.2.4",
       "resolved": "https://registry.npmmirror.com/clean-css/-/clean-css-5.2.4.tgz",
@@ -7218,40 +7194,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/eslint-webpack-plugin": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmmirror.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz",
-      "integrity": "sha512-xSucskTN9tOkfW7so4EaiFIkulWLXwCB/15H917lR6pTv0Zot6/fetFucmENRb7J5whVSFKIvwnrnsa78SG2yg==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "^7.28.2",
-        "jest-worker": "^27.3.1",
-        "micromatch": "^4.0.4",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
     "node_modules/eslint/node_modules/@babel/code-frame": {
       "version": "7.12.11",
       "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -8640,18 +8582,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/is-ci": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmmirror.com/is-ci/-/is-ci-1.2.1.tgz",
-      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^1.5.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
     "node_modules/is-core-module": {
       "version": "2.8.1",
       "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.8.1.tgz",
@@ -12356,15 +12286,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/strip-indent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/strip-indent/-/strip-indent-2.0.0.tgz",
-      "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -14864,118 +14785,6 @@
       "engines": {
         "node": ">=10"
       }
-    },
-    "node_modules/yorkie": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/yorkie/-/yorkie-2.0.0.tgz",
-      "integrity": "sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "execa": "^0.8.0",
-        "is-ci": "^1.0.10",
-        "normalize-path": "^1.0.0",
-        "strip-indent": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/yorkie/node_modules/cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^4.0.1",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "node_modules/yorkie/node_modules/execa": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmmirror.com/execa/-/execa-0.8.0.tgz",
-      "integrity": "sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/yorkie/node_modules/get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/yorkie/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "node_modules/yorkie/node_modules/normalize-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-1.0.0.tgz",
-      "integrity": "sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yorkie/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yorkie/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yorkie/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmmirror.com/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/yorkie/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-      "dev": true
     }
   },
   "dependencies": {
@@ -17240,19 +17049,6 @@
         "webpack": "^5.54.0"
       }
     },
-    "@vue/cli-plugin-eslint": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.1.tgz",
-      "integrity": "sha512-ZGxIAT4b9ppMbePJrsZA6e5882n7JIQgji8LLyYSMuf0+GTsEjUDz01nRmAD7PW+Gpf8+B5oA2tU+S3E5l6/WA==",
-      "dev": true,
-      "requires": {
-        "@vue/cli-shared-utils": "^5.0.1",
-        "eslint-webpack-plugin": "^3.1.0",
-        "globby": "^11.0.2",
-        "webpack": "^5.54.0",
-        "yorkie": "^2.0.0"
-      }
-    },
     "@vue/cli-plugin-router": {
       "version": "5.0.1",
       "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.1.tgz",
@@ -19103,12 +18899,6 @@
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true
     },
-    "ci-info": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmmirror.com/ci-info/-/ci-info-1.6.0.tgz",
-      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-      "dev": true
-    },
     "clean-css": {
       "version": "5.2.4",
       "resolved": "https://registry.npmmirror.com/clean-css/-/clean-css-5.2.4.tgz",
@@ -20843,32 +20633,6 @@
       "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true
     },
-    "eslint-webpack-plugin": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmmirror.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz",
-      "integrity": "sha512-xSucskTN9tOkfW7so4EaiFIkulWLXwCB/15H917lR6pTv0Zot6/fetFucmENRb7J5whVSFKIvwnrnsa78SG2yg==",
-      "dev": true,
-      "requires": {
-        "@types/eslint": "^7.28.2",
-        "jest-worker": "^27.3.1",
-        "micromatch": "^4.0.4",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^3.1.1"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.8",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
     "espree": {
       "version": "7.3.1",
       "resolved": "https://registry.npmmirror.com/espree/-/espree-7.3.1.tgz",
@@ -21883,15 +21647,6 @@
       "resolved": "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.4.tgz",
       "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
     },
-    "is-ci": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmmirror.com/is-ci/-/is-ci-1.2.1.tgz",
-      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-      "dev": true,
-      "requires": {
-        "ci-info": "^1.5.0"
-      }
-    },
     "is-core-module": {
       "version": "2.8.1",
       "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.8.1.tgz",
@@ -24816,12 +24571,6 @@
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true
     },
-    "strip-indent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/strip-indent/-/strip-indent-2.0.0.tgz",
-      "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==",
-      "dev": true
-    },
     "strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -26794,98 +26543,6 @@
       "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz",
       "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true
-    },
-    "yorkie": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/yorkie/-/yorkie-2.0.0.tgz",
-      "integrity": "sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==",
-      "dev": true,
-      "requires": {
-        "execa": "^0.8.0",
-        "is-ci": "^1.0.10",
-        "normalize-path": "^1.0.0",
-        "strip-indent": "^2.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmmirror.com/execa/-/execa-0.8.0.tgz",
-          "integrity": "sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "normalize-path": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-1.0.0.tgz",
-          "integrity": "sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-          "dev": true
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmmirror.com/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-          "dev": true
-        }
-      }
     }
   }
 }

package.json

@@ -31,7 +31,6 @@
     "@babel/core": "^7.12.16",
     "@babel/eslint-parser": "^7.12.16",
     "@vue/cli-plugin-babel": "^5.0.0",
-    "@vue/cli-plugin-eslint": "^5.0.0",
     "@vue/cli-service": "^5.0.0",
     "@vue/eslint-config-airbnb": "^6.0.0",
     "eslint": "^7.32.0",

src/SManagement/orderclue/components/add.vue

@@ -17,7 +17,7 @@
           <el-cascader
             class="width-240"
             v-model="param.content.province"
-            :options="arealist"
+            :options="_arealist"
             @change="cascaderChange"
             ref="cascader">
           </el-cascader>
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils';
 export default {
   name: 'add',
   data() {
@@ -74,7 +75,6 @@ export default {
           { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }
         ],
       },
-      arealist:[],
       areaSelectResult:''
     };
   },
@@ -83,40 +83,34 @@ export default {
       type:Function
     }
   },
+  inject:['arealist'],
   computed:{
+    _arealist() {
+      return this.arealist()
+    }
   },
   watch:{
   },
   created() {
-    this.query_arealist()
   },
   methods: {
-    async query_arealist() {
-      const res = await this.$api.requested({
-        "classname": "system.tools",
-        "method": "query_arealist",
-        "content": {
-        }
-      })
-      this.arealist = this.tool.createMenu(res.data)
-    },
     handleClose() {
       this.dialogVisible = false
     },
     addOrdercule() {
-      if(this.areaSelectResult && this.areaSelectResult.length > 1) {
-        this.param.content.province = this.areaSelectResult[0]
-        this.param.content.city = this.areaSelectResult[1]
-        this.param.content.county = this.areaSelectResult[2]
-      } else if (this.areaSelectResult.length == 1) {
-        this.param.content.province = this.areaSelectResult[0]
-      }
       this.$refs.ruleForm.validate( async val => {
           if( !val ) return this.$notify({
             title:'提示',
             message:'请按照要求填写信息',
             type:'warning'
           })
+          if(this.areaSelectResult && this.areaSelectResult.length > 1) {
+            this.param.content.province = this.areaSelectResult[0]
+            this.param.content.city = this.areaSelectResult[1]
+            this.param.content.county = this.areaSelectResult[2]
+          } else if (this.areaSelectResult.length == 1) {
+            this.param.content.province = this.areaSelectResult[0]
+          }
           let res = await this.$api.requested(this.param)
           this.tool.showMessage(res,() => {
             this.$refs.ruleForm.resetFields()

src/SManagement/orderclue/components/edit.vue

@@ -80,7 +80,6 @@ export default {
           { min: 1, max: 25, message: '长度在 1 到 25 个字符', trigger: 'blur' }
         ],
       },
-      arealist:[],
       areaSelectResult:[]
     };
   },
@@ -96,6 +95,9 @@ export default {
     },
     data: {
       type: Object
+    },
+    arealist: {
+      type: Array
     }
   },
   computed:{
@@ -123,18 +125,8 @@ export default {
     }
   },
   created() {
-    this.query_arealist()
   },
   methods: {
-    async query_arealist() {
-      const res = await this.$api.requested({
-        "classname": "system.tools",
-        "method": "query_arealist",
-        "content": {
-        }
-      })
-      this.arealist = this.tool.createMenu(res.data)
-    },
     handleClose() {
       this.dialogVisible = false
     },

src/SManagement/orderclue/components/list.vue

@@ -59,9 +59,9 @@ import search from '@/components/search/index'
 import table1 from '@/components/table/index'
 import { log } from '@antv/g2plot/lib/utils'
 import Header from '@/SManagement/archives_upload/components/Header'
-import add from '@/SManagement/orderclue/components/add'
 import move from '@/SManagement/orderclue/components/move'
 import exportBtn from '@/SManagement/orderclue/components/export'
+import add from '@/SManagement/orderclue/components/add'
 
 export default {
   name: 'list',
@@ -97,7 +97,7 @@ export default {
       }
     };
   },
-  components: { search, Header, add, exportBtn, table1, move },
+  components: { search, Header , exportBtn, table1, move , add },
   computed: {
   },
   watch: {

src/SManagement/orderclue/components/move.vue

@@ -31,7 +31,6 @@ export default {
           "sa_agent_hrid": ''
         }
       },
-      teamList:[]
     };
   },
   props: {
@@ -43,6 +42,9 @@ export default {
     },
     updataList: {
       type:Function
+    },
+    teamList: {
+      type:Array
     }
   },
   computed: {
@@ -51,23 +53,8 @@ export default {
 
   },
   created() {
-    this.getTeamList()
   },
   methods: {
-    async getTeamList () {
-      let res = await this.$api.requested({
-        "classname": "sale.team.team",
-        "method": "query_teamList",
-        "content": {
-          "pageNumber": 1,
-          "pageSize": 99999,
-          "where": {
-              "condition": ""
-          }
-        }
-      })
-      this.teamList = res.data
-    },
     handleClose () {
       this.dialogVisible = false
     },

src/SManagement/orderclue/index.vue

@@ -6,7 +6,8 @@
       </template>
       <template v-slot:edit="scope">
           <edit :data="scope.data" 
-                @updataList="updataList" 
+                @updataList="updataList"
+                :arealist="arealist" 
                 v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' && tool.checkAuth($route.name,'update')"></edit>
       </template>
       <template v-slot:goUp="scope">
@@ -17,6 +18,7 @@
       <template v-slot:move="scope">
         <move :data="[scope.data.data.sat_orderclueid]" 
               @updataList="updataList" 
+              :teamList="teamList"
               v-if="scope.data.data.status == '待跟进' || scope.data.data.status == '跟进中' && tool.checkAuth($route.name,'handleMove')"></move>
       </template>
     </list>
@@ -31,17 +33,29 @@ import edit from '@/SManagement/orderclue/components/edit'
 import follow from '@/SManagement/orderclue/components/follow'
 import move from '@/SManagement/orderclue/components/move'
 import exportBtn from '@/SManagement/orderclue/components/export'
+
 export default {
   name: 'index',
   data() {
     return {
+      teamList:[],
+      arealist:[]
     };
   },
-  components:{ Header , list , add , exportBtn , edit , follow , move },
+  provide() {
+    return {
+      arealist:() => this.arealist
+    }
+  },
+  components:{ Header , list , add , exportBtn , edit , follow , move , add },
   computed:{
   },
   watch:{
   },
+  created() {
+    this.getTeamList()
+    this.query_arealist()
+  },
   methods: {
     detail(data) {
       this.$router.push({
@@ -55,6 +69,30 @@ export default {
       this.$refs.list.param.content.pageNumber = 1
       this.$refs.list.getList()
     },
+    async getTeamList () {
+      let res = await this.$api.requested({
+        "classname": "sale.team.team",
+        "method": "query_teamList",
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 99999,
+          "where": {
+              "condition": ""
+          }
+        }
+      })
+      this.teamList = res.data
+    },
+    async query_arealist() {
+      const res = await this.$api.requested({
+        "classname": "system.tools",
+        "method": "query_arealist",
+        "content": {
+        }
+      })
+      this.arealist2 = this.tool.createMenu(res.data)
+      this.arealist = this.tool.createMenu(res.data)
+    }
   },
 };
 </script>

src/SManagement/submitedit_details/components/SubmiteditAction.vue

@@ -53,9 +53,10 @@ export default {
       textarea2: '',
       //上传模板
       upload_panl: 0,
+      disabled:window.sessionStorage.getItem('history') != 1
     };
   },
-  props: ['detailData', 'disabled', 'editData'],
+  props: ['detailData', 'editData'],
   components: {
     FileItem,
     upload
@@ -103,7 +104,6 @@ export default {
         }
       }
       let res = await this.$api.requested(param)
-      this.tool.showMessage(res)
     },
     async save () {
       //新增
@@ -133,7 +133,7 @@ export default {
                 "sat_submiteditid": "0"
               }
             }
-            let res = await this.$api.requested({
+            this.$api.requested({
               "classname": "saletool.submitedit.submitedit",
               "method": "sub_submitdetailed",
               "content": {
@@ -141,9 +141,14 @@ export default {
                 "sat_submiteditmodelid": res.data.sat_submiteditmodelid,
                 "sat_submiteditid": res.data.sat_submiteditid
               }
-            })
-            this.tool.showMessage(res, () => {
-              this.$parent.getDetailData()
+            }).then( res => {
+              if(res.code == 1) {
+                this.$parent.getDetailData()
+                if(this.$route.query.type != 'more') {
+                  this.disabled = false
+                  window.sessionStorage.setItem('history',1)
+                }
+              }
             })
           })
         })
@@ -161,24 +166,25 @@ export default {
               "sat_submiteditid": this.upload_panl.sat_submiteditid
             }
           }
-          let res = await this.$api.requested(param2).then(res => {
-            this.tool.showMessage(res,() => {
-              this.upload_panl.status = '发布'
-              this.upload_panl.attinfos = null
-              this.param = {
-                "classname": "saletool.submitedit.submitedit",
-                "method": "insertorupdate",
-                "content": {
-                  "sat_submiteditmodelid": "",
-                  "content": "",
-                  "sat_submiteditid": "0"
-                }
-              },
-                this.isFileInfoPanlShow = false
-              this.$parent.getDetailData()
-            })
-
-          })
+          let res = await this.$api.requested(param2)
+          if(res.code != 1) return console.log('错误');
+          this.upload_panl.status = '发布'
+          this.upload_panl.attinfos = null
+          this.param = {
+            "classname": "saletool.submitedit.submitedit",
+            "method": "insertorupdate",
+            "content": {
+              "sat_submiteditmodelid": "",
+              "content": "",
+              "sat_submiteditid": "0"
+            }
+          }
+          if(this.$route.query.type != 'more') {
+            this.disabled = false
+            window.sessionStorage.setItem('history',1)
+          }
+          this.isFileInfoPanlShow = false
+          this.$parent.getDetailData()
         })
       }
 

src/SManagement/submitedit_details/index.vue

@@ -6,7 +6,7 @@
                     ref="submitAction" 
                     :detailData="detailData" 
                     :editData="editData" 
-                    :disabled="$route.query.history != 1"
+                    :disabled.sync="disabled"
                     v-if="tool.checkAuth($route.name,'insert')"></submit-action>
       <img src="@/assets/refresh.png" alt="" style="cursor:pointer" @click="$router.go(0)">
     </div>
@@ -62,7 +62,8 @@ export default {
       //编辑数据
       editData:[],
       currentIndex: 1,
-      pageSize:6
+      pageSize:6,
+      disabled:this.$route.query.history != 1
     };
   },
   components: {

src/SManagement/submitedit_one/components/list.vue

@@ -44,11 +44,11 @@ export default {
   methods: {
     itemClick (id,history) {
       window.sessionStorage.setItem('currentPath',this.$route.path)
+      window.sessionStorage.setItem('history',history)
       this.$router.push({
         path: '/submiteditmag_detail',
         query: {
           id:id,
-          history:history,
           type:this.type
         }
       })

src/components/table/index.vue

@@ -5,7 +5,7 @@
         type="selection"
         width="55" @handleSelectionChange="handleSelectionChange" v-if="checkbox" :selectable="isCheck">
       </el-table-column>
-      <el-table-column show-overflow-tooltip v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width">
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>

src/views/mediaStock/modules/list.vue

@@ -87,12 +87,6 @@ export default {
         e.ischeck = false
       })
       this.list = res.data
-      this.list.forEach(item => {
-        console.log(item.document,item.url);
-        
-      })
-      console.log(this.list);
-      
       this.total = res.total
       this.currentPage = res.pageNumber
       this.sort = res.sort