Skip to content

P
pica.cloud.web-education-admin
提交 ace2c371 编写于 作者: changdi.hao's avatar changdi.hao
浏览文件
操作

Merge branch 'release' into 'master' 

Release

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!408
上级 468ba648 b965bf91
隐藏空白字符变更
内嵌 并排
正在显示 包含 10577 行增加 和 1073 行删除
package-lock.json
浏览文件 @ ace2c371
......@@ -935,6 +935,19 @@
"babel-helper-regex": "^6.24.1",
"babel-runtime": "^6.22.0",
"regexpu-core": "^2.0.0"
},
"dependencies": {
"regexpu-core": {
"version": "2.0.0",
"resolved": "http://192.168.110.93:4873/regexpu-core/-/regexpu-core-2.0.0.tgz",
"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
"dev": true,
"requires": {
"regenerate": "^1.2.1",
"regjsgen": "^0.2.0",
"regjsparser": "^0.1.4"
}
}
}
},
"babel-plugin-transform-exponentiation-operator": {
......@@ -1904,19 +1917,21 @@
"dev": true,
"requires": {
"cross-spawn": "^6.0.5"
}
},
"cross-spawn": {
"version": "6.0.5",
"resolved": "http://192.168.110.93:4873/cross-spawn/-/cross-spawn-6.0.5.tgz",
"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
"dev": true,
"requires": {
"nice-try": "^1.0.4",
"path-key": "^2.0.1",
"semver": "^5.5.0",
"shebang-command": "^1.2.0",
"which": "^1.2.9"
},
"dependencies": {
"cross-spawn": {
"version": "6.0.5",
"resolved": "http://192.168.110.93:4873/cross-spawn/-/cross-spawn-6.0.5.tgz",
"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
"dev": true,
"requires": {
"nice-try": "^1.0.4",
"path-key": "^2.0.1",
"semver": "^5.5.0",
"shebang-command": "^1.2.0",
"which": "^1.2.9"
}
}
}
},
"cryptiles": {
......@@ -1973,32 +1988,19 @@
"postcss-modules-scope": "^1.0.0",
"postcss-modules-values": "^1.1.0",
"source-list-map": "^0.1.4"
}
},
"css-select": {
"version": "4.1.3",
"resolved": "http://192.168.110.93:4873/css-select/-/css-select-4.1.3.tgz",
"integrity": "sha1-pwRA9wMX8maRGK10/xBeZYSccGc=",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^5.0.0",
"domhandler": "^4.2.0",
"domutils": "^2.6.0",
"nth-check": "^2.0.0"
}
},
"css-selector-tokenizer": {
"version": "0.6.0",
"resolved": "http://192.168.110.93:4873/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz",
"integrity": "sha1-ZEX1gseTDSQdzFAHpD1vy48HMVI=",
"dev": true,
"requires": {
"cssesc": "^0.1.0",
"fastparse": "^1.1.1",
"regexpu-core": "^1.0.0"
},
"dependencies": {
"css-selector-tokenizer": {
"version": "0.6.0",
"resolved": "http://192.168.110.93:4873/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz",
"integrity": "sha1-ZEX1gseTDSQdzFAHpD1vy48HMVI=",
"dev": true,
"requires": {
"cssesc": "^0.1.0",
"fastparse": "^1.1.1",
"regexpu-core": "^1.0.0"
}
},
"regexpu-core": {
"version": "1.0.0",
"resolved": "http://192.168.110.93:4873/regexpu-core/-/regexpu-core-1.0.0.tgz",
......@@ -2012,6 +2014,19 @@
}
}
},
"css-select": {
"version": "4.1.3",
"resolved": "http://192.168.110.93:4873/css-select/-/css-select-4.1.3.tgz",
"integrity": "sha1-pwRA9wMX8maRGK10/xBeZYSccGc=",
"dev": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^5.0.0",
"domhandler": "^4.2.0",
"domutils": "^2.6.0",
"nth-check": "^2.0.0"
}
},
"css-what": {
"version": "5.0.1",
"resolved": "http://192.168.110.93:4873/css-what/-/css-what-5.0.1.tgz",
......@@ -2103,6 +2118,11 @@
"assert-plus": "^1.0.0"
}
},
"dayjs": {
"version": "1.10.7",
"resolved": "http://192.168.110.93:4873/dayjs/-/dayjs-1.10.7.tgz",
"integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg="
},
"de-indent": {
"version": "1.0.2",
"resolved": "http://192.168.110.93:4873/de-indent/-/de-indent-1.0.2.tgz",
......@@ -2626,10 +2646,6 @@
"loader-utils": "~0.2.5"
}
},
"file-saver": {
"version": "git+ssh://git@github.com/eligrey/FileSaver.js.git#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
"from": "file-saver@github:eligrey/FileSaver.js#1.3.8"
},
"file-uri-to-path": {
"version": "1.0.0",
"resolved": "http://192.168.110.93:4873/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
......@@ -2772,25 +2788,29 @@
"dependencies": {
"abbrev": {
"version": "1.1.1",
"bundled": true,
"resolved": false,
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true,
"optional": true
},
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"resolved": false,
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
"bundled": true,
"resolved": false,
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.5",
"bundled": true,
"resolved": false,
"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"dev": true,
"optional": true,
"requires": {
......@@ -2800,13 +2820,15 @@
},
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"resolved": false,
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"resolved": false,
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"optional": true,
"requires": {
......@@ -2816,37 +2838,43 @@
},
"chownr": {
"version": "1.1.4",
"bundled": true,
"resolved": false,
"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
"dev": true,
"optional": true
},
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"resolved": false,
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"resolved": false,
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"resolved": false,
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
"bundled": true,
"resolved": false,
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true,
"optional": true
},
"debug": {
"version": "3.2.6",
"bundled": true,
"resolved": false,
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"optional": true,
"requires": {
......@@ -2855,25 +2883,29 @@
},
"deep-extend": {
"version": "0.6.0",
"bundled": true,
"resolved": false,
"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
"dev": true,
"optional": true
},
"delegates": {
"version": "1.0.0",
"bundled": true,
"resolved": false,
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"dev": true,
"optional": true
},
"detect-libc": {
"version": "1.0.3",
"bundled": true,
"resolved": false,
"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
"dev": true,
"optional": true
},
"fs-minipass": {
"version": "1.2.7",
"bundled": true,
"resolved": false,
"integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
"dev": true,
"optional": true,
"requires": {
......@@ -2882,13 +2914,15 @@
},
"fs.realpath": {
"version": "1.0.0",
"bundled": true,
"resolved": false,
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true,
"optional": true
},
"gauge": {
"version": "2.7.4",
"bundled": true,
"resolved": false,
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"dev": true,
"optional": true,
"requires": {
......@@ -2904,7 +2938,8 @@
},
"glob": {
"version": "7.1.6",
"bundled": true,
"resolved": false,
"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
"dev": true,
"optional": true,
"requires": {
......@@ -2918,13 +2953,15 @@
},
"has-unicode": {
"version": "2.0.1",
"bundled": true,
"resolved": false,
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"dev": true,
"optional": true
},
"iconv-lite": {
"version": "0.4.24",
"bundled": true,
"resolved": false,
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"optional": true,
"requires": {
......@@ -2933,7 +2970,8 @@
},
"ignore-walk": {
"version": "3.0.3",
"bundled": true,
"resolved": false,
"integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
"dev": true,
"optional": true,
"requires": {
......@@ -2942,7 +2980,8 @@
},
"inflight": {
"version": "1.0.6",
"bundled": true,
"resolved": false,
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"optional": true,
"requires": {
......@@ -2952,19 +2991,22 @@
},
"inherits": {
"version": "2.0.4",
"bundled": true,
"resolved": false,
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
"bundled": true,
"resolved": false,
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"dev": true,
"optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
"resolved": false,
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"optional": true,
"requires": {
......@@ -2973,13 +3015,15 @@
},
"isarray": {
"version": "1.0.0",
"bundled": true,
"resolved": false,
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true,
"optional": true
},
"minimatch": {
"version": "3.0.4",
"bundled": true,
"resolved": false,
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"optional": true,
"requires": {
......@@ -2988,13 +3032,15 @@
},
"minimist": {
"version": "1.2.5",
"bundled": true,
"resolved": false,
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
"dev": true,
"optional": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"resolved": false,
"integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
"dev": true,
"optional": true,
"requires": {
......@@ -3004,7 +3050,8 @@
},
"minizlib": {
"version": "1.3.3",
"bundled": true,
"resolved": false,
"integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
"dev": true,
"optional": true,
"requires": {
......@@ -3013,7 +3060,8 @@
},
"mkdirp": {
"version": "0.5.3",
"bundled": true,
"resolved": false,
"integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
"dev": true,
"optional": true,
"requires": {
......@@ -3022,13 +3070,15 @@
},
"ms": {
"version": "2.1.2",
"bundled": true,
"resolved": false,
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true,
"optional": true
},
"needle": {
"version": "2.3.3",
"bundled": true,
"resolved": false,
"integrity": "sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==",
"dev": true,
"optional": true,
"requires": {
......@@ -3039,7 +3089,8 @@
},
"node-pre-gyp": {
"version": "0.14.0",
"bundled": true,
"resolved": false,
"integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==",
"dev": true,
"optional": true,
"requires": {
......@@ -3057,7 +3108,8 @@
},
"nopt": {
"version": "4.0.3",
"bundled": true,
"resolved": false,
"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
"dev": true,
"optional": true,
"requires": {
......@@ -3067,7 +3119,8 @@
},
"npm-bundled": {
"version": "1.1.1",
"bundled": true,
"resolved": false,
"integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
"dev": true,
"optional": true,
"requires": {
......@@ -3076,13 +3129,15 @@
},
"npm-normalize-package-bin": {
"version": "1.0.1",
"bundled": true,
"resolved": false,
"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.8",
"bundled": true,
"resolved": false,
"integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
"dev": true,
"optional": true,
"requires": {
......@@ -3093,7 +3148,8 @@
},
"npmlog": {
"version": "4.1.2",
"bundled": true,
"resolved": false,
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"dev": true,
"optional": true,
"requires": {
......@@ -3105,19 +3161,22 @@
},
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"resolved": false,
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
"bundled": true,
"resolved": false,
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true,
"optional": true
},
"once": {
"version": "1.4.0",
"bundled": true,
"resolved": false,
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"optional": true,
"requires": {
......@@ -3126,19 +3185,22 @@
},
"os-homedir": {
"version": "1.0.2",
"bundled": true,
"resolved": false,
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
"dev": true,
"optional": true
},
"os-tmpdir": {
"version": "1.0.2",
"bundled": true,
"resolved": false,
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true,
"optional": true
},
"osenv": {
"version": "0.1.5",
"bundled": true,
"resolved": false,
"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
"dev": true,
"optional": true,
"requires": {
......@@ -3148,19 +3210,22 @@
},
"path-is-absolute": {
"version": "1.0.1",
"bundled": true,
"resolved": false,
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true,
"optional": true
},
"process-nextick-args": {
"version": "2.0.1",
"bundled": true,
"resolved": false,
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
"dev": true,
"optional": true
},
"rc": {
"version": "1.2.8",
"bundled": true,
"resolved": false,
"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
"dev": true,
"optional": true,
"requires": {
......@@ -3172,7 +3237,8 @@
},
"readable-stream": {
"version": "2.3.7",
"bundled": true,
"resolved": false,
"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"dev": true,
"optional": true,
"requires": {
......@@ -3187,7 +3253,8 @@
},
"rimraf": {
"version": "2.7.1",
"bundled": true,
"resolved": false,
"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
"dev": true,
"optional": true,
"requires": {
......@@ -3196,43 +3263,50 @@
},
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"resolved": false,
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
"bundled": true,
"resolved": false,
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"dev": true,
"optional": true
},
"sax": {
"version": "1.2.4",
"bundled": true,
"resolved": false,
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
"dev": true,
"optional": true
},
"semver": {
"version": "5.7.1",
"bundled": true,
"resolved": false,
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
"bundled": true,
"resolved": false,
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
"dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
"bundled": true,
"resolved": false,
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true,
"optional": true
},
"string-width": {
"version": "1.0.2",
"bundled": true,
"resolved": false,
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"optional": true,
"requires": {
......@@ -3243,7 +3317,8 @@
},
"string_decoder": {
"version": "1.1.1",
"bundled": true,
"resolved": false,
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"optional": true,
"requires": {
......@@ -3252,7 +3327,8 @@
},
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"resolved": false,
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"optional": true,
"requires": {
......@@ -3261,13 +3337,15 @@
},
"strip-json-comments": {
"version": "2.0.1",
"bundled": true,
"resolved": false,
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
"dev": true,
"optional": true
},
"tar": {
"version": "4.4.13",
"bundled": true,
"resolved": false,
"integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
"dev": true,
"optional": true,
"requires": {
......@@ -3282,13 +3360,15 @@
},
"util-deprecate": {
"version": "1.0.2",
"bundled": true,
"resolved": false,
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"dev": true,
"optional": true
},
"wide-align": {
"version": "1.1.3",
"bundled": true,
"resolved": false,
"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"dev": true,
"optional": true,
"requires": {
......@@ -3297,13 +3377,15 @@
},
"wrappy": {
"version": "1.0.2",
"bundled": true,
"resolved": false,
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true,
"optional": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
"resolved": false,
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
"dev": true,
"optional": true
}
......@@ -4229,7 +4311,7 @@
"integrity": "sha512-J9X76xnncMw+wIqb15HeWfPMqPwYxSpPY8yWPJ7rAZN/ZDzFkjCSZObryCyUe8zbrVRNiuCnIeQteCzMn7GnWw==",
"requires": {
"canvg": "1.5.3",
"file-saver": "file-saver@github:eligrey/FileSaver.js#1.3.8",
"file-saver": "github:eligrey/FileSaver.js#1.3.8",
"html2canvas": "1.0.0-alpha.12",
"omggif": "1.0.7",
"promise-polyfill": "8.1.0",
......@@ -4249,6 +4331,10 @@
"base64-arraybuffer": "^0.1.5"
}
},
"file-saver": {
"version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
"from": "github:eligrey/FileSaver.js#1.3.8"
},
"html2canvas": {
"version": "1.0.0-alpha.12",
"resolved": "http://192.168.110.93:4873/html2canvas/-/html2canvas-1.0.0-alpha.12.tgz",
......@@ -6931,17 +7017,6 @@
"safe-regex": "^1.1.0"
}
},
"regexpu-core": {
"version": "2.0.0",
"resolved": "http://192.168.110.93:4873/regexpu-core/-/regexpu-core-2.0.0.tgz",
"integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
"dev": true,
"requires": {
"regenerate": "^1.2.1",
"regjsgen": "^0.2.0",
"regjsparser": "^0.1.4"
}
},
"regjsgen": {
"version": "0.2.0",
"resolved": "http://192.168.110.93:4873/regjsgen/-/regjsgen-0.2.0.tgz",
......@@ -7843,6 +7918,11 @@
"readable-stream": "^2.0.1"
}
},
"storejs": {
"version": "2.0.1",
"resolved": "http://192.168.110.93:4873/storejs/-/storejs-2.0.1.tgz",
"integrity": "sha1-NCT0yI/5eeOWJBPOYOpD/WYKllc="
},
"stream-browserify": {
"version": "2.0.2",
"resolved": "http://192.168.110.93:4873/stream-browserify/-/stream-browserify-2.0.2.tgz",
......
package.json
浏览文件 @ ace2c371
......@@ -19,6 +19,7 @@
"@babel/polyfill": "^7.2.5",
"axios": "0.16.2",
"better-scroll": "^0.1.15",
"dayjs": "^1.10.7",
"echarts": "^4.2.0-rc.2",
"element-ui": "^2.11.1",
"fastclick": "^1.0.6",
......@@ -26,7 +27,7 @@
"iscroll": "^5.2.0",
"js-cookie": "^2.2.0",
"js-md5": "^0.7.3",
"jsencrypt": "^3.0.0-rc.1",
"jsencrypt": "^3.2.1",
"jspdf": "^1.5.3",
"node-sass": "^4.9.2",
"pdfh5": "^1.3.9",
......@@ -34,6 +35,7 @@
"qrcodejs2": "^0.0.2",
"showdown": "^1.6.4",
"sortablejs": "^1.13.0",
"storejs": "^2.0.1",
"video.js": "^7.8.2",
"vue": "^2.1.0",
"vue-infinite-scroll": "^2.0.2",
......
src/router/router.js
浏览文件 @ ace2c371
......@@ -82,6 +82,8 @@ const plazaList = r => require.ensure([], () => r(require('../views/plaza/plaza-
const activityMember = r => require.ensure([], () => r(require('../views/activitymanagement/activity-member.vue')), 'activity-member')
const videoManage = r => require.ensure([], () => r(require('../views/shortvideo/video-manage.vue')), 'video-manage')
const qualificationList = r => require.ensure([], () => r(require('../views/qualification/list.vue')), 'qualification')
const qualificationDetail = r => require.ensure([], () => r(require('../views/qualification/detail.vue')), 'qualification')
export default [{
path: '/',
......@@ -347,7 +349,14 @@ export default [{
path: 'video-manage',
component: videoManage,
},
{
path: 'qualification-list',
component:qualificationList
},
{
path: 'qualification-detail',
component:qualificationDetail
},
// {
// path: '/followup',
// name: 'followUp',
......
src/style/global.scss
浏览文件 @ ace2c371
@import './common.scss';
// color
.c0D9078{
color:#0D9078;
}
//定位
.relative{
position: relative;
......@@ -18,9 +22,19 @@
display: flex;
justify-content: flex-end;
}
.flex1{
flex: 1;
}
.textLeft{
float: left;
}
.cp{
cursor: pointer;
}
.flex-c{
display: flex;
align-items: center;
}
.center{
text-align: center;
}
......@@ -125,11 +139,11 @@
padding-left: 5px !important;
font-size: 14px !important;
color: #333;
}
}
.el-checkbox__input.is-checked+.el-checkbox__label {
color: #449284;
}
.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
color: #449284;
}
......@@ -204,7 +218,7 @@
margin: 0;
padding: 25px 5px 30px;
border-top: 0px solid #E4E7ED;
}
}
}
.el-dialog__footer {
padding-top: 20px;
......@@ -227,7 +241,7 @@
margin: 0;
padding: 25px 5px 30px;
border-top: 1px solid #E4E7ED;
}
}
}
}
.el-cascader .el-input .el-input__inner:focus, .el-cascader .el-input.is-focus .el-input__inner {
......
src/utils-o/operation.js
浏览文件 @ ace2c371
......@@ -641,4 +641,4 @@ export function setSelectedKeys(checkedKeys, halfCheckedKeys) {
selected.push(obj);
}
return selected;
}
\ No newline at end of file
}
src/utils/education/educationApi.js
浏览文件 @ ace2c371
......@@ -46,4 +46,15 @@ export const uploadPersonExcel = (data, projectId) => {
description: '上传excel文件',
})
// })
}
export const uploadShieldExcel = (data, projectId) => {
return fetch({
headers: {
token: localStorage.getItem('storageToken'),
},
url: getBaseUrl('aggregate/black/setPeopleBlackStatus/batch/' + projectId),
method: 'post',
data: data,
description: '上传excel文件',
})
}
\ No newline at end of file
src/utils/goods/index.js
浏览文件 @ ace2c371
......@@ -133,3 +133,14 @@ export const getTypeCodeList = () => {
});
};
export const getBusinessCategory = () => {
return fetch({
headers,
url: getBaseUrl(`store/category/businessCategory/0`),
method: "get",
description: "查询业务类型",
});
};
src/utils/mixins.js
浏览文件 @ ace2c371
import fetch from '@/utils/fetch'
import { getBaseUrl, getReportUrl, getWorkApi, getCmsUrl } from '@/utils/index'
import { CryptoJS } from '@/plugins/aes'
import 'jsencrypt'
import JSEncrypt from 'jsencrypt'
import { getPubKey } from '@/utils/account/accountApi';
......@@ -19,7 +19,7 @@ module.exports = {
// this.token = this.getUrlKey('token') || (query && query.token) || null
},
mounted: function() {
},
methods: {
......@@ -56,7 +56,7 @@ module.exports = {
cb && cb(params);
}
}else{
this.$message({
this.$message({
message: (res && res.message) || '接口出错',
type: 'warning'
});
......@@ -85,7 +85,7 @@ module.exports = {
return encrypted.toString();
},
// RSA encrypt
RsaEncrypt(aesKey, pubKey){
RsaEncrypt(aesKey, pubKey){
let _encrypt = new JSEncrypt();
let boss_public_key = pubKey;
_encrypt.setPublicKey(boss_public_key);
......@@ -159,7 +159,7 @@ module.exports = {
setEntry: 'headers',
}
let url = 'contents/searchKeyword/searchContent'
let csourceData = await this.GET(url, para).then(res => {
// _this.searchText = ''
if (res.code == '000000') {
......@@ -182,7 +182,7 @@ module.exports = {
})
return csourceData
},
setEventByModuleCode(itemData){
let modeCode = itemData.appModuleInfo.code || '';
let paramList = itemData.appModuleInfo.paramList ? itemData.appModuleInfo.paramList : ''
......@@ -253,7 +253,7 @@ module.exports = {
params: para
})
},
// 通用DELETE请求
DELETE(api, para, callback,str) {
// para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
......
src/utils/qiniu-util.js
浏览文件 @ ace2c371
......@@ -51,10 +51,12 @@ let errorCode = new Map([
[701,'在断点续上传过程中，后续上传接收地址不正确或ctx信息已过期。']
]);
let qiniuErrorCheck = function (code) {
let qiniuErrorCheck = function (code,self) {
errorCode.forEach(function (value, key, map) {
if (code === key){
self.$message.error(value);
console.error(key+':'+value)
}
})
}
......@@ -243,7 +245,7 @@ export const qiniuUpload = (self, file, filePath, previewId, progressId) => {
console.log("七牛上传失败,详细信息请参考:https://developer.qiniu.com/kodo/api/3928/error-responses");
//输出简略错误信息
if (err.isRequestError){
qiniuErrorCheck(err.code)
qiniuErrorCheck(err.code,self)
}else {
console.error(err);
}
......@@ -428,7 +430,7 @@ export const doUpload = (self, file, filePath, previewId, progressId, fileType)
console.log("七牛上传失败,详细信息请参考:https://developer.qiniu.com/kodo/api/3928/error-responses");
//输出简略错误信息
if (err.isRequestError){
qiniuErrorCheck(err.code)
qiniuErrorCheck(err.code,self)
}else {
console.error(err);
}
......
src/utils/qualification/index.js 0 → 100644
浏览文件 @ ace2c371
import fetch from '../fetch';
import { getBaseUrl, getSaasDomain, getSaasApiDomain } from '@/utils/index'
let headers = {
'Content-Type': 'application/json;charset=UTF-8',
token: localStorage.getItem('storageToken'),
};
export const getCertifyList = (params) => {
return fetch({
headers,
url: getBaseUrl(`store/certify/list`),
method: 'post',
data:params,
description: '审核记录列表(批发和供应商)',
})
};
export const getCertifyHistory = (params) => {
return fetch({
headers,
url: getBaseUrl(`certify/certifyHistory`),
method: 'get',
data:params,
description: '查看审核历史',
})
};
export const getCertifyDetail = () => {
return fetch({
headers,
url: getBaseUrl(`store/certify/certifyDetail`),
method: 'get',
description: '获取认证申请的审核详情',
})
};
export const getRefuseTemplate = (type) => {
return fetch({
headers,
url: getBaseUrl(`store/cert/constant/refuse/template?type=${type}`),
method: 'get',
description: '获取错误模板',
})
};
export const postCertifyAudit = (params) => {
return fetch({
headers,
url: getBaseUrl(`store/certify/audit`),
method: 'post',
data:params,
description: '审核',
})
};
src/utils/shop/index.js
浏览文件 @ ace2c371
......@@ -155,3 +155,41 @@ export const getStoreAdressRepot = (storeId) => {
description: "获取店铺退货地址信息",
});
};
export const OCRStore = (params) => {
return fetch({
headers,
url: getBaseUrl(`store/ocr/license`),
method: 'post',
data: params,
description: 'ocr店铺',
})
};
export const idCardOcr = (params) => {
return fetch({
headers,
url: getBaseUrl(`store/ocr/idCard`),
method: 'post',
data: params,
description: '身份证ocr',
})
};
export const orgOptionList = () => {
return fetch({
headers,
url: getBaseUrl(`store/cert/constant/org/type`),
method: 'get',
description: '企业类型列表',
})
};
export const orgScopeOptionList = () => {
return fetch({
headers,
url: getBaseUrl(`store/cert/constant/biz/scope`),
method: 'get',
description: '经营范围',
})
};
src/views/education/item-shield.vue
浏览文件 @ ace2c371
......@@ -49,6 +49,7 @@
</el-col>
<el-col :span="6" style="padding:0;text-align:right;padding-right:10px;">
<el-button type="primary" size="small" @click="searchList()">搜索</el-button>
<el-button type="primary" size="small" @click="importOrder()" v-if="shieldType == 1">批量导入</el-button>
</el-col>
</el-form>
</el-row>
......@@ -103,12 +104,60 @@
</span>
</el-dialog>
</div>
<!-- 导入屏蔽人员名单 -->
<el-dialog
class="exportlogistics-dialog"
title="批量导入"
:visible="isShowImport"
@close="isShowImport = false"
width="600px"
>
<el-form label-width="120px">
<el-form-item label="导入文档：">
<el-upload
class="upload-excel"
action="#"
accept=".xlsx"
multiple
:limit="1"
:show-file-list="true"
:before-upload="uploadfile"
>
<div class="upload-container">
<el-input
class="file-name"
v-model="fileData.fileName"
size="mini"
readonly
></el-input
>
<el-button type="primary" size="mini">选择文件</el-button>
</div>
</el-upload>
</el-form-item>
<el-form-item label="模板：">
<a class="import-url" :href="logisticsUrl" style="color: #449284">
批量导入模板.xlxs</a>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="cancelImport">取消</el-button>
<el-button
size="small"
:loading="isLoading"
type="primary"
@click="confirmImport"
>确认</el-button
>
</div>
</el-dialog>
</div>
</template>
<script>
import BreadCrumb from "../../components/breadcrumb.vue";
import { mapGetters } from "vuex";
import { openLoading, closeLoading } from "../../utils/utils";
import { uploadShieldExcel } from "@/utils/education/educationApi";
import * as commonUtil from "../../utils/utils";
import * as operationData from "../../utils/operation";
let vm = null;
......@@ -118,6 +167,14 @@ export default {
},
data() {
return {
isShowImport: false,
isLoading: false,
logisticsUrl: 'https://files.yunqueyi.com/template/portal_template.xlsx',
fileData: {
ext: '',
file: "",
fileName: "",
},
curmbFirst: "教培项目",
curmbSecond: "屏蔽",
projectId: "",
......@@ -232,6 +289,69 @@ export default {
// }
// },
methods: {
// 批量导入
importOrder() {
this.isShowImport = true;
},
uploadfile(file) {
console.log(file, '导入file');
let _this = this;
let arr = file.name.split(".");
let ext = "." + arr[1];
let name = file.name;
let reader = new FileReader();
reader.onload = function (e) {
_this.fileData.fileName = name;
_this.fileData.file = e.target.result.substr(
e.target.result.indexOf("base64,") + 7
);
_this.fileData.ext = ext;
console.log("fileJson", _this.fileData);
};
reader.readAsDataURL(file);
},
// 确认导入
confirmImport() {
this.isLoading = true;
let parmas = {
base64: this.fileData,
type: ''
}
uploadShieldExcel(parmas, this.projectId).then(res => {
if (res.code == '000000') {
if (res.data == '') {
this.isLoading = false;
this.isShowImport = false;
this.$message({
message: '导入成功',
type: 'success'
});
} else {
let a = document.createElement('a');
let href = res.data;
a.setAttribute('href',href);
a.click();
this.isLoading = false;
this.$message.error('导入失败');
}
} else {
this.isLoading = false;
this.$message.error(res.message);
}
}).catch(error => {
this.isLoading = false;
this.$message.error(error.message);
})
},
// 取消导入
cancelImport() {
this.fileData = {
file: "",
fileName: "",
};
this.isShowImport = false;
},
handleChange(value) {
let areaId = "000";
for (let i = 0; i < value.length; i++) {
......
src/views/goods/create-good.vue
浏览文件 @ ace2c371
......@@ -11,9 +11,9 @@
</el-col>
</el-row>
<el-form
ref="formData"
:model="formData"
:rules="rules"
ref="formData3"
:model="formData3"
:rules="rules3"
label-width="150px"
label-suffix="："
class="basic-form"
......@@ -25,7 +25,7 @@
<el-col :span="13">
<el-input
size="small"
v-model="formData.goodsName"
v-model="formData3.goodsName"
placeholder="请输入商品名称"
show-word-limit
maxlength="60"
......@@ -40,12 +40,12 @@
type="textarea"
rows="4"
size="small"
v-model="formData.goodsDescription"
v-model="formData3.goodsDescription"
placeholder="请输入商品介绍"
maxlength="1000"
maxlength="40"
show-word-limit
></el-input>
<!-- <span class="word-num">{{(formData.goodsDescription).replace(/\s+/g,"").length}}/1000</span> -->
<span class="word-tip">此文案可摘取药品说明书【功能主治】or【适应症】</span>
</el-col>
</el-form-item>
......@@ -56,6 +56,9 @@
:show-file-list="isShowFileList"
action="#"
:before-upload="beforeUploadPic"
multiple
:on-exceed="imgExceed"
:limit="6"
>
<div class="file-pics" v-if="fileGoodsList.length > 0" :key="index" v-for="(item,index) in fileGoodsList">
<img :src="item.url" @mouseover.stop="headIndex=index" class="bg-img"/>
......@@ -68,23 +71,67 @@
<i class="el-icon-delete"></i>
</div>
</div>
<img class="bg-img" src="../../assets/image/small.png" v-if="fileGoodsList.length <10"/>
<div class="limit-text">
<img class="bg-img" src="../../assets/image/small.png" v-if="fileGoodsList.length < 6"/>
<div class="limit-text" v-if="fileGoodsList.length < 6">
<!-- <p>限制大小: 200kb</p> -->
<p>建议尺寸：750*420</p>
<p>建议尺寸：750*750</p>
<p>支持jpeg, png格式</p>
</div>
</el-upload>
<p class="upload-message" v-if="!isgoodsImages">请上传商品头图</p>
<!-- <p class="upload-message" v-if="uploadImgMessage1">请上传商品头图</p> -->
</el-form-item>
<el-form-item label="商品介绍视频" class="label-video">
<el-upload
accept=".mp4"
:on-remove="handleRemoveVideo"
:file-list="videoList"
:before-upload="beforeVideoUpload"
:show-file-list="false"
:disabled="videoList.length == 1"
:limit="1"
action="#"
class="bg-uploader"
>
<video id="introVideoLecture" :src="videoModel.videoFullPath" controls preload style="width: 100%;" v-if="videoList.length == 1">
视频
</video>
<img class="bg-img" src="../../assets/image/video.png" v-if="videoList.length <1"/>
<div class="limit-text" v-if="videoList.length <1">
<p>建议大小：20M以内</p>
<p>仅支持MP4格式</p>
<P>视频名称必须包含3个下划线：举例（YQ_01_02_03.mp4)</P>
</div>
</el-upload>
<el-progress :text-inside="true" :stroke-width="16" :percentage="uploadProgress" status="success" class="video-progress"
v-show="uploadProgress>0&&uploadProgress<100">
</el-progress>
<el-button class="dl-video" icon="el-icon-delete" circle @click="deleteVideo" v-if="videoList.length == 1"></el-button>
</el-form-item>
<el-form-item label="业务类型" prop="businessCategoryId">
<el-select
v-model="formData3.businessCategoryId"
placeholder="请选择业务类型"
size="small"
>
<el-option
v-for="item in businessCategoryList"
:key="item.id"
:label="item.categoryName"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="商品类型" prop="goodsType">
<el-select
v-model="formData.goodsType"
v-model="formData3.goodsType"
placeholder="请选择商品类型"
size="small"
:disabled="isEdit"
@change="getGoodsTypes(formData.goodsType,2)">
@change="getGoodsTypes(formData3.goodsType,2)">
<el-option
v-for="(item,index) in oneLever"
:key="item.categoryName+'-'+index"
......@@ -93,14 +140,16 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否支持售后" prop="expressLimitFlag" v-if="storeType < 3">
<el-radio-group v-model="formData.expressLimitFlag" :disabled="!hasRepoFlag">
<el-radio-group v-model="formData3.expressLimitFlag" :disabled="!hasRepoFlag">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
<p class="backTip" v-if="!hasRepoFlag" @click="goShopDeatil">若需设置商品支持售后，需先至店铺页<span class="ad-back">设置售后地址</span></p>
</el-form-item>
</div>
</el-form>
......@@ -118,7 +167,7 @@
<el-form-item label="条形码" prop="barCode">
<el-col :span="18">
<el-input
:disabled="barAndGoodsFlag"
:disabled="barAndGoodsFlag || idMedicEdit"
size="small"
v-model="formData1.barCode"
placeholder="请输入条形码"
......@@ -133,6 +182,7 @@
<el-input
size="small"
v-model="formData1.approvalNumber"
:disabled="idMedicEdit"
placeholder="请输入批准文号"
style="width:50%;"
></el-input>
......@@ -142,7 +192,7 @@
<el-form-item label="通用名称" prop="medicCommonName">
<el-col :span="13">
<el-input
:disabled="goodDisabled || barAndGoodsFlag"
:disabled="goodDisabled || barAndGoodsFlag || idMedicEdit"
size="small"
v-model="formData1.medicCommonName"
placeholder="请输入通用名称"
......@@ -160,7 +210,7 @@
size="small"
v-model="formData1.medicGoodsName"
placeholder="请输入商品名称"
:disabled="idMedicEdit"
maxlength="60"
show-word-limit
></el-input>
......@@ -174,6 +224,7 @@
size="small"
v-model="formData1.size"
placeholder="请输入规格"
:disabled="idMedicEdit"
style="width:70%;"
></el-input>
......@@ -183,8 +234,8 @@
<div class="inline">
<el-form-item label="是否是处方药" prop="otc1">
<el-col :span="24">
<el-radio size="mini" v-model="formData1.otc1" label="1">处方药</el-radio>
<el-radio v-model="formData1.otc1" label="0">非处方药</el-radio>
<el-radio size="mini" v-model="formData1.otc1" label="1" :disabled="idMedicEdit">处方药</el-radio>
<el-radio v-model="formData1.otc1" label="0" :disabled="idMedicEdit">非处方药</el-radio>
</el-col>
</el-form-item>
<el-form-item label="剂型" prop="dosageId">
......@@ -192,6 +243,7 @@
v-model="formData1.dosageId"
placeholder="请选择药品剂型"
size="small"
:disabled="idMedicEdit"
clearable>
<el-option
v-for="(item,index) in doseAll"
......@@ -209,6 +261,7 @@
v-model="formData1.usage"
placeholder="请输入用法用量"
style="width:70%;"
:disabled="idMedicEdit"
></el-input>
<span class="word-num">例如:每次一袋 每天1-2次</span>
......@@ -284,6 +337,7 @@
v-model="formData1.manufacturer"
placeholder="请输入生产厂家"
style="width:70%;"
:disabled="idMedicEdit"
></el-input>
<span class="word-num"></span>
......@@ -295,6 +349,7 @@
size="small"
v-model="formData1.department"
placeholder="请输入适用科室"
:disabled="idMedicEdit"
></el-input>
<!-- <el-select
......@@ -317,6 +372,7 @@
size="small"
v-model="formData1.treatDisease"
placeholder="请输入治疗疾病"
:disabled="idMedicEdit"
></el-input>
......@@ -332,6 +388,7 @@
v-model="formData1.expiredTime"
placeholder="请输入有效期"
style="width:70%;"
:disabled="idMedicEdit"
></el-input>
<!-- <el-date-picker
v-model="formData.expiredTime"
......@@ -352,6 +409,7 @@
v-model="formData1.modelNo"
placeholder="请输入型号"
style="width:70%;"
:disabled="idMedicEdit"
></el-input>
<span class="word-num"></span>
</el-col>
......@@ -363,6 +421,7 @@
v-model="formData1.standardNo"
placeholder="请输入执行标准号"
style="width:70%;"
:disabled="idMedicEdit"
></el-input>
<span class="word-num"></span>
</el-col>
......@@ -583,18 +642,6 @@
format="yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="商品使用日期" prop="endTime">
<el-col :span="13">
<el-input
size="small"
v-model="formData2.endTime"
placeholder="请输入商品使用日期"
style="width:70%;"
></el-input>
<span class="word-num"></span>
</el-col>
</el-form-item> -->
<el-form-item label="检测说明" >
<el-upload
:file-list="goodsCheckList"
......@@ -662,48 +709,30 @@
<el-radio :label="1">零售</el-radio>
<el-radio :label="2" :disabled="commissionFlag == 1">批发</el-radio>
</el-radio-group>
<!-- <el-select-->
<!-- v-model="formData.saleType"-->
<!-- placeholder="请选择销售方式"-->
<!-- size="small"-->
<!-- @change="getSaleType(formData.saleType,2)">-->
<!-- <el-option-->
<!-- v-for="item in saleTypeList"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item>
</div>
<div class="inline" v-if="formData.saleType == 1">
<el-form-item label="零售价" prop="optPrice">
<el-col :span="20">
<!-- <el-input-->
<!-- @input="$forceUpdate();"-->
<!-- size="small"-->
<!-- v-model="formData.optPrice"-->
<!-- placeholder="请输入零售价"-->
<!-- ></el-input>-->
<el-input-number class="stock-com" @input="$forceUpdate();" v-model="formData.optPrice" size="small" :precision="2" :min="0.00" :max="99999.99"></el-input-number>
<!-- <span class="word-num">{{(formData.name).replace(/\s+/g,"").length}}/60</span> -->
</el-col>
</el-form-item>
</div>
<div class="inline" v-if="formData.saleType == 2">
<el-form-item label="批发价" prop="optPrice">
<el-col :span="20">
<!-- <el-input-->
<!-- @input="$forceUpdate();"-->
<!-- size="small"-->
<!-- v-model="formData.optPrice"-->
<!-- placeholder="请输入批发价"></el-input>-->
<el-input-number class="stock-com" @input="$forceUpdate();" v-model="formData.optPrice" size="small" :precision="2" :min="0" :max="99999.99"></el-input-number>
</el-col>
</el-form-item>
</div>
<div class="inline" v-if="formData.saleType == 1">
<el-form-item label="绩效分值">
<el-col :span="20">
<el-input-number class="stock-com" @input="$forceUpdate();" v-model="formData.scorePerformance" size="small" :precision="2" :min="0.00" :max="999999.99"></el-input-number>
</el-col>
</el-form-item>
</div>
<div class="inline">
<el-form-item label="库存" prop="stock" class="required-label">
<el-col :span="20">
......@@ -713,14 +742,6 @@
<span class="sp sp-r" @click="changeStock(2)"><i class="el-icon-plus"></i></span>
</div>
<p class="error-message" v-if="!isgoodStock">库存不能为0</p>
<!-- <el-input
size="small"
v-model="formData.name"
placeholder="请输入库存"
></el-input> -->
<!-- <el-input-number readonly size="small" v-model="formData.stock"></el-input-number> -->
<!-- <span class="word-num">{{(formData.name).replace(/\s+/g,"").length}}/60</span> -->
</el-col>
</el-form-item>
</div>
......@@ -729,10 +750,7 @@
<el-form-item label="最小起购件数" prop="leastCount" class="required-label">
<el-col :span="20">
<div class="stock-com" style="width: 500px;display:flex">
<el-input-number class="stock-com" @input="$forceUpdate();" v-model="formData.leastCount" size="small" :precision="0" :min="0" :max="9999"></el-input-number>
<!-- <span class="sp sp-l" @click="minusCount(1)"><i class="el-icon-minus"></i></span>
<span class="sp sp-c">{{formData.leastCount}}</span>
<span class="sp sp-r" @click="plusCount(1)"><i class="el-icon-plus"></i></span> -->
<el-input-number class="stock-com" @input="$forceUpdate();" v-model="formData.leastCount" size="small" :precision="0" :min="0" :max="9999"></el-input-number>
<span class="word-num" style="margin-left: 10px;">最高9999件哦</span>
</div>
<p class="error-message" v-if="formData.leastCount <= 0">最小起购件数不能为0</p>
......@@ -754,18 +772,12 @@
<el-col :span="20" style="width: 300%;">
<div class="stock-com" style="width: 500px;display:flex">
<el-input-number class="stock-com" @input="$forceUpdate();" v-model="formData.mostCount" size="small" :precision="0" :min="-1" :max="9999"></el-input-number>
<!-- <span class="sp sp-l" @click="minusCount(2)"><i class="el-icon-minus"></i></span>
<span class="sp sp-c">{{formData.mostCount}}</span>
<span class="sp sp-r" @click="plusCount(2)"><i class="el-icon-plus"></i></span> -->
<span class="word-num" style="margin-left: 10px;">数值为-1时，代表单次购买上限已无限制(最高9999件哦)</span>
</div>
<p class="error-message" v-if="formData.mostCount === 0">单次购买上限不能为0</p>
<!-- <p class="error-message" v-if="formData.mostCount <= -1">单次购买上限已无限制</p>-->
</el-col>
</el-form-item>
</div>
<div class="inline" v-if="formData.saleType == 1">
<el-form-item label="第三方商品编码">
<el-col :span="20">
......@@ -791,16 +803,6 @@
</div>
</div>
<!-- </el-form>-->
<!-- <el-form-->
<!-- ref="formData"-->
<!-- :model="formData"-->
<!-- :rules="rules"-->
<!-- label-width="150px"-->
<!-- label-suffix="："-->
<!-- class="basic-form"-->
<!-- >-->
<div class="basic-item-icon" v-if="formData.saleType == 1">
<div class="part-tit">限购条件</div>
<div v-for="(item, index) in buyLimitDtoList" :key="index" >
......@@ -856,7 +858,6 @@
</div>
<span slot="footer" class="dialog-footer" style="text-align: right;">
<!-- <el-button @click="centerDialogVisible = false">取 消</el-button> -->
<el-button type="primary" @click="updateStock">完成</el-button>
</span>
</el-dialog>
......@@ -867,12 +868,13 @@
import BreadCrumb from "@/components/breadcrumb.vue";
let vm = null;
import { openLoading, closeLoading } from "../../utils/utils";
import { doUpload, getFilePath } from "../../utils/qiniu-util";
import { updateGoods ,updateStock,dosageAll,getDeparts,getGoodsList, getGoodDetails, updateGoodsV2, getHospitalInfoByStoreId, getCheckPackageIdList, getTypeCodeList } from '@/utils/goods';
import { isEmptyUtils } from "@/utils/index";
import { doUpload, getFilePath, createFilePath } from "../../utils/qiniu-util";
import { updateGoods ,updateStock,dosageAll,getDeparts,getGoodsList, getGoodDetails, updateGoodsV2, getHospitalInfoByStoreId, getCheckPackageIdList, getTypeCodeList,getBusinessCategory } from '@/utils/goods';
import { getStoreAdressRepot } from "@/utils/shop";
import Cropper from '@/components/common/cropper.vue'
import { originRules1, originRules2, originRules } from './rules';
import { originForm1, originForm2, originForm } from './forms';
import { originRules1, originRules2, originRules, originRules3 } from './rules';
import { originForm1, originForm2, originForm, originForm3 } from './forms';
export default {
components: {
......@@ -964,6 +966,7 @@
formData: JSON.parse(JSON.stringify(originForm)), // 通用信息
formData1: JSON.parse(JSON.stringify(originForm1)), // 基本信息
formData2: JSON.parse(JSON.stringify(originForm2)),
formData3: JSON.parse(JSON.stringify(originForm3)),
buyLimitDtoList:[],
rules: {},
rules1: {},
......@@ -1003,7 +1006,19 @@
title:"限购条件"
},
storeType: 1, //1: "供货商",2: "小药房",3: "医生小店"
hasRepoFlag: 0 //店铺是否有退货地址
hasRepoFlag: 0, //店铺是否有退货地址
videoList: [],//视频上传文件列表
videoModel:{
videoFullPath: ''
},
businessCategoryList:[],
sumFile: 0,
uploadProgress:0, // 上传视频进度条
}
},
computed: {
idMedicEdit() {
return this.isEdit && !this.isCheckServe;;
}
},
created() {
......@@ -1020,6 +1035,7 @@
this.rules = originRules;
this.rules1 = originRules1;
this.rules2 = originRules2;
this.rules3 = originRules3
// this.rules2.barCode = originRules.barCode;
this.jumPathThird = '/goods-manage?storeId=' + storeId +'&commissionFlag=' + this.commissionFlag +'&storeType=' + this.storeType;
......@@ -1029,6 +1045,7 @@
this.curmbThird = this.title;
this.formData.storeId = Number(storeId) || '';
this.getTypeCodeList();
this.getBusinessCategory();
this.getLever(0,1)
dosageAll().then((res)=>{
this.doseAll = res.data
......@@ -1061,6 +1078,27 @@
}
},
methods: {
// 获取业务类型
getBusinessCategory(){
getBusinessCategory().then((res) => {
if (res.code == '000000') {
this.businessCategoryList=res.data
}
}).catch((err)=>{})
},
// 判断imgurl是否有效
checkImgExists(imgurl) {
return new Promise(function(resolve, reject) {
var ImgObj = new Image()
ImgObj.src = imgurl
ImgObj.onload = function(res) {
resolve(res)
}
ImgObj.onerror = function(err) {
reject(err)
}
})
},
// 获取适用人群
getTypeCodeList() {
return getTypeCodeList().then((res) => {
......@@ -1097,18 +1135,34 @@
};
const { goodsInfo, medicalService, buyLimitDtoList, hasRepoFlag} = res.data;
const { goodsName, goodsDescription, goodsType,businessCategoryId, expressLimitFlag,goodsHeaderImages=[], goodsVideoList=[] } = goodsInfo;
this.formData = {...this.formData, ...goodsInfo};
this.formData2 = medicalService;
this.formData = { ...this.formData, ...this.formData2 };
this.formData3 = { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType,businessCategoryId, expressLimitFlag };
this.buyLimitDtoList = buyLimitDtoList;
this.hasRepoFlag = hasRepoFlag;
this.$set(this.formData2, 'suitableArr', this.formData.suitable.split(','));
this.$set(this.formData, 'suitableArr', this.formData.suitable.split(','));
this.formData.optPrice = this.formData.costPrice/100;
this.formData.stock = this.formData.goodsStock;
this.formData.scorePerformance = this.formData.scorePerformance/100;
this.formData.optPrice = this.formData.costPrice/100;
this.fileGoodsList = this.getImges(goodsInfo.goodsHeaderImages,1);
this.goodsCheckList = this.getImges(medicalService.goodsCheckImages, goodsType);
if (goodsInfo.goodsVideoList.length > 0) {
this.videoList.push(goodsInfo.goodsVideoList[0]);
this.videoModel.videoFullPath = this.videoList[0].goodsImgUrl;
}
let newImgList = [];
this.fileGoodsList.map((item,index) => {
this.checkImgExists(item.imageUrl).then(()=> {
newImgList.push(item)
}).catch(()=> {
newImgList = this.fileGoodsList.splice(index,1);
})
})
this.fileGoodsList = newImgList;
this.rules = {
...this.rules,
......@@ -1138,15 +1192,31 @@
});
}
const {goodsList, hasRepoFlag } = res.data;
const { goodsName, goodsDescription, goodsType, businessCategoryId,expressLimitFlag, goodsHeaderImages=[], goodsVideoList=[] } = goodsList[0];
this.formData1 = goodsList[0];
this.formData = goodsList[0];
this.formData3 = { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType,businessCategoryId, expressLimitFlag };
this.hasRepoFlag = hasRepoFlag;
this.buyLimitDtoList = this.formData.buyLimitDtoList;
this.formData.optPrice = this.formData.costPrice/100;
this.formData.scorePerformance = this.formData.scorePerformance/100;
this.fileGoodsList = this.getImges(goodsList[0].goodsImgList,1);
this.fileIntrList = this.getImges(goodsList[0].medicImgList,2);
this.formData.stock = this.formData.goodsStock;
this.formData.otc1 = this.formData.otc ? '1' : '0';
if (goodsList[0].goodsVideoList.length > 0) {
this.videoList.push(goodsList[0].goodsVideoList[0]);
this.videoModel.videoFullPath = this.videoList[0].goodsImgUrl;
}
let newImgList = [];
this.fileGoodsList.map((item,index) => {
this.checkImgExists(item.imageUrl).then(()=> {
newImgList.push(item)
}).catch(()=> {
newImgList = this.fileGoodsList.splice(index,1);
})
})
this.fileGoodsList = newImgList;
if(this.isMedic){
this.getLever(5,2,1)
}else{
......@@ -1268,31 +1338,9 @@
});
},
// 销售方式
getSaleType(saleType, type){
},
getGoodsTypes(goodsType,type){
this.goodsType = goodsType;
// if(goodsType == 5){
// this.isMedic = true;
// this.isCheckServe = false;
// this.getLever(goodsType,type);
// } else if(goodsType == 337){
// this.isMedic = false;
// this.isCheckServe = true;
// getHospitalInfoByStoreId(this.storeId).then(({code,message,data})=>{
// this.formData2.hospitalName = data.hospital;
// })
// getCheckPackageIdList().then(res=>{
// console.log(`getCheckPackageIdList`, res);
// this.checkPackageIdList = res.data;
// })
// }else{
// this.isMedic = false;
// this.isCheckServe = false;
// };
if(goodsType == 337){
this.isMedic = false;
this.isCheckServe = true;
......@@ -1416,15 +1464,16 @@
complete() {
this.formData1.leastCount = this.formData.leastCount;
this.formData1.mostCount = this.formData.mostCount;
let formNameList = ['formData', 'formData1', 'formData2'];
let formNameList = ['formData', 'formData1', 'formData2', 'formData3'];
// let formName = "formData";
if(this.goodsType == 337 ){
formNameList = ['formData', 'formData2'];
this.formData = { ...this.formData, ...this.formData2 };
formNameList = ['formData', 'formData2', 'formData3'];
this.formData = { ...this.formData, ...this.formData3,...this.formData2 };
}else{
formNameList = ['formData', 'formData1'];
this.formData = { ...this.formData, ...this.formData1 };
formNameList = ['formData', 'formData1', 'formData3'];
this.formData = { ...this.formData,...this.formData1,...this.formData3};
}
for(let i=0;i<this.fileGoodsList.length;i++){
this.fileGoodsList[i].imageSort = i+1
......@@ -1432,7 +1481,6 @@
for(let j=0;j<this.fileIntrList.length;j++){
this.fileIntrList[j].imageSort = j+1
}
this.formData.categoryId = this.formData.goodsType
this.formData.otc = this.formData.otc1 == 1 ? true : false
this.isgoodStock = this.formData.stock > 0 ? true : false
......@@ -1440,15 +1488,17 @@
// console.log(this.isgoodStock);
this.formData.goodsImages = this.fileGoodsList;
this.formData.goodsHeaderImages = this.fileGoodsList;
this.formData.goodsVideoList = this.videoList;
this.formData.specificationImages = this.fileIntrList;
this.formData.buyLimitDtoList = this.buyLimitDtoList;
this.isgoodsImages = this.formData.goodsImages.length == 0 ? false :true;
// 如果是【药品】类型的商品
if(this.isMedic){
// if(this.isMedic){
if(!this.isgoodsImages){
return;
}
}
// }
// 如果是【检测服务】类型的商品
if(this.isCheckServe){
this.formData.goodsCheckImages = this.goodsCheckList;
......@@ -1483,7 +1533,6 @@
return;
}
}
if(!isTrue){
return false;
}else{
......@@ -1507,9 +1556,11 @@
},
//更新商品
updateGoodsInfo(){
console.log('提交值',this.formData);
console.log('提交值',JSON.parse(JSON.stringify(this.formData)));
const submieFn = this.isCheckServe ? updateGoodsV2 : updateGoods;
submieFn(this.formData).then((res)=>{
let params = JSON.parse(JSON.stringify(this.formData))
params.scorePerformance = params.scorePerformance * 100;
submieFn(params).then((res)=>{
if (res.code !== '000000') {
return this.$message({
message: res.message,
......@@ -1528,11 +1579,17 @@
})
})
},
imgExceed(file) {
if (file.length > 6) {
this.$message.error("最多只能上传6张图片");
};
},
//上传商品头图
beforeUploadPic(file) {
if(this.fileGoodsList.length > 10){
return ;
}
// if(this.fileGoodsList.length > 6){
// this.$message.error("最多只能上传6张图片");
// return ;
// }
let vm = this;
let picTypes = ['image/jpeg','image/png']
......@@ -1549,7 +1606,10 @@
vm.slide2.oriUrl = theFile.target.result;
image.onload = function () {
let _this = this;
console.log(_this.width,_this.height)
if (_this.width !== 750 || _this.height !== 750) {
vm.$message.error("图片长宽尺寸必须为750*750");
return;
};
openLoading(vm);
doUpload(vm, file, getFilePath(file, null), "preview4", "progress1", 1).then(function (path) {
closeLoading(vm);
......@@ -1824,8 +1884,111 @@
} else {
this.$message.error(res.message);
}
})
})
},
// 视频
deleteVideo(videoList) {
console.log(videoList,'item,fileGoodsListitem,fileGoodsListv')
this.videoList = [];
this.videoModel.videoFullPath='';
},
beforeVideoUpload(file) {
const video2M = file.size / 1024 /1024 < 20;
console.log(file.size, 'video2Mvideo2Mvideo2M')
if (!video2M) {
this.$message.error('上传视频大小不能超过20M!');
}
else {
this.doVideoUpload(file, 1);
}
},
handleRemoveVideo(file, videoList) {
//console.log(this.videoList);
for (let i = 0; i < this.videoList.length; i++) {
if (this.videoList[i].name == file.name) {
this.videoList.splice(i, 1);
console.log("删除" + i);
}
}
},
checkUpdate(name) {
let flag = true;
for(let i=0;i<this.videoList.length;i++) {
if(this.videoList[i].name == name) {
flag = false;
this.$message.warning('上传文件重发');
}
}
console.log('name',name,'',this.videoList)
return flag;
},
doVideoUpload(file, index) {
console.log('file',file);
//console.log('videoList项目列表：',this.videoList);
this.videoModel.videoFullPath = '';
if(file.name.indexOf(' ') != -1){
this.$message.warning('文件名不能包含空格');
return;
}
let updateFlag = this.checkUpdate(file.name);
if(updateFlag == false) {
return;
}
var ext = file.type
var arr = ext.split('/');
var filety = "." + arr[1];
/*if (filety.indexOf(".pdf") < 0 && filety.indexOf(".jpeg") < 0 && filety.indexOf(".jpg") < 0
&& filety.indexOf(".png") < 0 && filety.indexOf(".mp4") < 0) {
this.$message.warning('文件格式错误');
return
}*/
let self = this;
//如果没有选择文件,返回
if (isEmptyUtils(file)) {
return;
}
console.log('file.type', file.type)
if(filety != ".mp4"){
// if (file.type !== 'video/mp4') {
self.$message.error('仅支持上传mp4格式视频');
return;
}
var arr = file.name.split('_');
if(arr.length != 4){
self.$message.error('上传视频文件名格式不正确：举例（GXY_001_02_03.mp4)');
return;
}
self.$message.info('开始上传');
self.videoModel.videoPath = createFilePath(file,file.name)
// let videoPath = createFilePath(file,file.name)
doUpload(self,file,self.videoModel.videoPath,"preview4",
"uploadProgress1",
"").then(function (result) {
console.log('成功result',result);
self.videoModel.videoFullPath = result.fullPath;
// self.model.size = result.size;
// self.model.ext = result.ext;
// self.model.name = self.model.videoPath;
let fileItem = {
goodsImgUrl: result.fullPath,
uid: '',
imageUrl: result.fullPath,
imageType: 9,
goodsId: self.formData.goodsId,
id: null,
deleteFlag: 0
}
self.videoList.push(fileItem);
self.$message.success('上传成功');
console.log('sumFile',self.sumFile,'videoList',self.videoList);
return false;
});
},
},
}
</script>
......@@ -1844,6 +2007,9 @@
color: #449284;
}
}
.word-tip {
color: #e6af7a;
}
}
.suitableList-select {
width: 445px;
......@@ -2065,4 +2231,29 @@
.el-icon-minus {
color:#ffffff;
}
#introVideoLecture {
height: 140px;
}
.video-progress {
width: 20%;
}
.el-upload-list {
width: 30%;
}
.label-video {
position: relative;
.el-button:focus, .el-button:hover {
color: #449284;
border-color: #449284;
background-color: #ecf5ff;
}
.dl-video {
position: absolute;
top: 50%;
left: 35%;
transform: translate(-50%,-50%);
}
}
</style>
src/views/goods/forms.js
浏览文件 @ ace2c371
......@@ -58,6 +58,7 @@ const form = {
incrStock: "", //增加库存
storeId: "",
optPrice: "",
scorePerformance: 0,
goodsStock: 0,
stock: 0,
externalGoodsCode: "",
......@@ -69,7 +70,18 @@ const form = {
expressLimitFlag: 0, //是否支持退货退款
};
const form3 = {
goodsName: "",
goodsDescription: "",
goodsHeaderImages: [],
goodsVideoList: [],
goodsType: "",
businessCategoryId:"",
expressLimitFlag: 0, //是否支持退货退款
};
export const originForm1 = form1;
export const originForm2 = form2;
export const originForm3 = form3;
export const originForm = form;
src/views/goods/goods-manage.vue
浏览文件 @ ace2c371
......@@ -94,8 +94,8 @@
</el-col>
<el-col :span="12" style="text-align: right">
<el-button v-if="commissionFlag == 2" type="primary" size="small" @click="batchSetPrice()">批量设置分佣</el-button>
<el-button type="primary" size="small" @click="exportOpt">批量导出商品</el-button>
<el-button v-if="commissionFlag == 2" type="primary" size="small" @click="batchSetPrice()" :disabled="tableData.length == 0">批量设置分佣</el-button>
<el-button type="primary" size="small" @click="exportOpt" :disabled="tableData.length == 0">批量导出商品</el-button>
<el-button v-if="isSSO" type="primary" size="small" @click="batchOpt(3)">批量导入商品</el-button>
<el-button type="primary" size="small" @click="edit('add')">新建单个商品</el-button>
</el-col>
......@@ -121,6 +121,7 @@
<span>{{ scope.row.goodsStatus | rangeStatus }}</span>
</template>
</el-table-column>
<el-table-column prop="goodsHisStock" label="商品总库存" width="100" align="center"></el-table-column>
<el-table-column prop="quantityOfSale" label="有效销量" width="120" align="center">
</el-table-column>
......@@ -161,6 +162,16 @@
</el-table-column>
<el-table-column prop="saleTime" label="发布时间" width="170" align="center">
</el-table-column>
<el-table-column prop="modifiedIdStr" label="最近操作人" width="170" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modifiedIdStr || '--' }}</span>
</template>
</el-table-column>
<el-table-column prop="modifiedTime" label="最近操作时间" width="170" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modifiedTime || '--' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center" fixed="right">
<template slot-scope="scope">
<div v-if="scope.row.commissionFlag == 2">
......@@ -552,7 +563,6 @@
handleRemove(){},
beforeRemove(){},
handleSelectionChange(val){
console.log(val)
this.selectList = val
},
......@@ -622,8 +632,10 @@
reader.readAsDataURL(file);
},
uploadTemp(){
// let url = "https://file.yunqueyi.com/trade/store/goods_import_template.xlsx"
const url = 'https://file.yunqueyi.com/trade/store/20210129/goods_import_template.xlsx';
// let url = "https://file.yunqueyi.com/trade/store/goods_import_template.xlsx 'https://file.yunqueyi.com/trade/store/20210129/goods_import_template.xlsx'"
// const url = 'https://files.yunqueyi.com/template/goods_import_template_1.xlsx';
const url = 'https://files.yunqueyi.com/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet/common/20211105150219553.xlsx';
window.location.href = url
},
getLever(id=0){
......@@ -821,7 +833,6 @@
},
exportOpt() {
const { goodsIdList, goodsType, goodsName, storeId, saleType } = this.searchForm;
getGoodsExportUrl({ goodsIdList, goodsType, goodsName, storeId, saleType }).then(res => {
if (res.code != '000000') {
this.$message({ message: res.message, type: 'error' });
......
src/views/goods/rules.js
浏览文件 @ ace2c371
......@@ -27,18 +27,18 @@ const rules1 = {
{ required: true, message: "请输入条形码", trigger: "submit" },
{ validator: checkBarcode, trigger: "submit" }
],
medicCommonName:[
{ required: true, message: "请输入商品通用名称", trigger: "blur" }
],
// medicCommonName:[
// { required: true, message: "请输入商品通用名称", trigger: "blur" }
// ],
// size:[
// { required: true, message: "请输入商品规格", trigger: "blur" }
// ],
// manufacturer:[
// { required: true, message: "请输入生产厂家", trigger: "blur" }
// ],
approvalNumber:[
{ required: true, message: "请输入批准文号", trigger: "blur" }
],
// approvalNumber:[
// { required: true, message: "请输入批准文号", trigger: "blur" }
// ],
// dosageId:[
// { required: true, message: "请选择剂型", trigger: "change" }
// ],
......@@ -89,19 +89,6 @@ const rules = {
{ required: true, message: "请输入条形码", trigger: "submit" },
{ validator: checkBarcode, trigger: "submit" }
],
goodsName: [
{ required: true, message: "请输入商品名称", trigger: "submit" },
{ validator: checkProjectStr, trigger: "submit" }
],
goodsHeaderImages: [
{ required: true, message: "请上传商品头图", trigger: "blur" }
],
goodsType:[
{ required: true, message: "请选择商品类型", trigger: "change" }
],
hcd:[
{ required: true, message: "请选择是否支持退货退款", trigger: "change" }
],
optPrice: [
{ required: true, message: "请输入价格", trigger: "blur" },
],
......@@ -126,8 +113,24 @@ const rules = {
// ],
}
const rules3 = {
goodsName: [
{ required: true, message: "请输入商品名称", trigger: "submit" },
{ validator: checkProjectStr, trigger: "submit" },
],
goodsDescription: [
{ required: true, message: "请输入商品介绍", trigger: "submit" },
],
goodsHeaderImages: [
{ required: true, message: "请上传商品头图", trigger: "blur" },
],
businessCategoryId: [{ required: true, message: "请选择业务类型", trigger: "change" }],
goodsType: [{ required: true, message: "请选择商品类型", trigger: "change" }],
};
export const originRules1 = rules1;
export const originRules2 = rules2;
export const originRules3 = rules3;
export const originRules = rules;
src/views/learning/item-data-all.vue
浏览文件 @ ace2c371
......@@ -841,8 +841,8 @@ export default {
if(vm.dataType == 0) {
cardData[0].value = parseFloat((data.hospitalRate*100).toFixed(1)) + '%';
cardData[0].hasNum = data.joinCount;
cardData[0].shouldNum = data.finishCount;
cardData[0].hasNum = data.hospitalJoinCount; //hospitalCount
cardData[0].shouldNum = data.hospitalCount; //hospitalJoinCount
vm.cardData = cardData;
} else if(vm.dataType == 1) {
......@@ -1100,8 +1100,7 @@ export default {
},
//机构人员分页
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
vm.formTable.pageSize = val;
vm.formTable.pageSize = val;
vm.formTable.pageNo = 1;
if(vm.downloadId == null) {
vm.searchPerson(1);
......@@ -1251,7 +1250,7 @@ export default {
}
}
.box-card2 {
width: 49%;
width: 32%;
margin-right: 2%;
}
.box-last {
......
src/views/qualification/components/historyDialog.vue 0 → 100644
浏览文件 @ ace2c371
<template>
<el-dialog
title="提示"
:visible.sync="hidden"
width="80%"
:before-close="handleClose"
>
<el-table :data="gridData">
<el-table-column property="date" label="审核时间"></el-table-column>
<el-table-column property="name" label="审核人"></el-table-column>
<el-table-column property="address" label="审核结果"></el-table-column>
<el-table-column property="address" label="失败原因" width="200">
<template class=""> </template>
</el-table-column>
<el-table-column property="address" label="操作">
<template>
<el-button
@click="goDetail(scope.row)"
class="c0D9078"
type="text"
size="small"
>查看详情</el-button
>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleNumChange"
:current-page="pageNo"
:page-sizes="[10, 30, 50, 100]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination>
</div>
</el-dialog>
</template>
<script>
import { getCertifyHistory } from "@/utils/qualification";
export default {
props: {
hidden: {
type: Boolean,
default: () => {
return false;
},
},
id: {
type: Number,
default: () => {
return 0;
},
},
},
data() {
return {
pageNo: 0,
pageSize: 10,
total: 100,
gridData: [],
};
},
created() {},
methods: {
init() {
const params = {
certificateInfoId: this.id,
pageNo: this.pageNo,
pageSize: this.pageSize,
};
getCertifyHistory(params).then((res) => {
this.gridData = res.data.contentList;
});
},
handleSizeChange(value) {
this.pageSize = value;
this.init();
},
handleNumChange(value) {
this.pageNo = value;
},
goDetail() {
},
show() {},
handleClose() {
this.pageSize = 10;
this.pageNo = 1;
this.gridData = [];
this.$emit("close");
},
},
};
</script>
<style lang='less' scoped>
</style>
src/views/qualification/components/refuseDialog.vue 0 → 100644
浏览文件 @ ace2c371
<template>
<el-dialog
title="拒绝原因"
:visible.sync="dialogVisible"
width="40%"
:before-close="handleClose"
>
<div class="refuse-dialog">
<el-radio
class="radio"
v-model="checkId"
v-for="item in list"
:key="item.id"
:label="item.id"
>{{ item.name }}</el-radio
>
<el-radio class="radio" v-model="checkId" :label="-1">手动输入</el-radio>
<el-input
v-if="checkId === -1"
type="textarea"
placeholder="请输入拒绝原因"
v-model="refuse"
maxlength="30"
show-word-limit
/>
</div>
<div class="btn">
<el-button type="default" size="small" @click="handleClose"
>取消</el-button
>
<el-button type="primary" size="small" @click="confirm">确认</el-button>
</div>
</el-dialog>
</template>
<script>
import { getRefuseTemplate } from "@/utils/qualification";
export default {
props: {},
data() {
return {
dialogVisible: false,
checkId: -1,
refuse: "",
list: [],
type: "",
typeData: {
1: "公司信息",
2: "营业执照",
3: "上一年年度报告",
4: "委托人身份证照片",
5: "委托书",
6: "法人身份证照片",
7: "药品经营许可证",
8: "药品经营质量管理规范认证证书",
9: "食品经营许可证",
10: "医疗器械经营许可证",
11: "二级医疗器械经营备案凭证",
12: "事业单位法人证",
},
};
},
created() {},
methods: {
init() {
getRefuseTemplate(this.type).then((res) => {
console.log(res);
this.list = res.data || [];
});
},
show(type) {
console.log(type);
this.type = type;
this.init(type);
this.dialogVisible = true;
},
handleClose() {
this.list = [];
this.refuse = "";
this.checkId = -1;
this.dialogVisible = false;
},
confirm() {
const params = {
refuseTemplateNo: this.checkId,
infoType: this.type,
infoTypeName:this.typeData[this.type]
};
if (this.checkId === -1) {
params.refuseContent = this.refuse;
} else {
params.refuseContent = this.list.filter((v) => {
return v.id === this.checkId;
})[0].name;
}
this.handleClose();
this.$emit("confirm", params);
},
},
};
</script>
<style lang='less' scoped>
.refuse-dialog {
display: flex;
flex-direction: column;
margin-bottom: 20px;
}
.radio {
margin-bottom: 10px;
}
.btn {
text-align: right;
}
</style>
src/views/qualification/detail.vue 0 → 100644
浏览文件 @ ace2c371
<template>
<div class="qualification-detail" ref="qualificationDetail">
<bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
<div class="qualification-content screenSet" id="screenSet">
<div class="head">
<div class="top space-between">
<div class="flex-c">
<div class="name">审核状态</div>
<div class="type" :class="typeState">{{ typeStateText }}</div>
<div class="history cp" @click="showHistoryDialog">
<i class="el-icon-document"></i>
查看审核历史
</div>
</div>
<div class="flex-c fs14">
<div class="mLR10">审核人：{{ detail.auditName }}</div>
<div>审核时间：{{ detail.auditTime }}</div>
</div>
</div>
<div class="hr"></div>
<div class="bottom" v-if="$route.query.source === 'ghs'">
<div>店铺名称：{{ detail.storeName }}</div>
<div>
管理员姓名：{{ detail.adminName }}
<span class="c0D9078 cp" @click="copyTxt">复制</span>
</div>
<div>管理员手机号：{{ detail.adminMobile }}</div>
</div>
<div class="bottom" v-if="$route.query.source === 'pf'">
<div>医生姓名：{{ detail.doctorName }}</div>
<div>
医生ID：{{ detail.doctorId }}
<span class="c0D9078 cp" @click="copyTxt">复制</span>
</div>
<div>申请时间：{{ detail.applyTime }}</div>
</div>
</div>
</div>
<div class="company" ref="company">
<div class="tit">
<div class="mr5">公司信息</div>
<div class="c0D9078 cp" @click="refuse(1)">
<i class="el-icon-edit-outline"></i>
拒绝原因
</div>
</div>
<div class="refuse-info">拒绝原因：{{ reasonRejection(1) }}</div>
<div class="info">
<div>
<div>企业类型：{{ detail.orgType }}</div>
<div>联系人：{{ detail.contactName }}</div>
</div>
<div>
<div>企业地区：{{ detail.areaStr }}</div>
<div>联系电话：{{ detail.contactPhone }}</div>
</div>
<div>详情地址：{{ detail.orgAddress }}</div>
</div>
</div>
<div class="business">
<div class="tit">
<div>工商信息</div>
</div>
<div class="refuse-info">拒绝原因：{{ reasonRejection(2) }}</div>
<div class="">
<div class="flex-c fs12">
<div class="mr5">营业执照</div>
<div class="c0D9078 cp" @click="refuse(2)">
<i class="el-icon-edit-outline"></i>拒绝原因
</div>
</div>
<div class="img">
<el-image
:src="detail.businessLicenseUrl"
:preview-src-list="[
'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
]"
/>
</div>
<div class="space-between flex-c">
<div>企业名称：{{ detail.orgName }}</div>
<div>信用代码：{{ detail.creditCode }}</div>
<div>
有效日期：{{ detail.licenseValidDateBegin }} 至
{{ detail.licenseValidDateEnd }}
</div>
</div>
</div>
<el-divider></el-divider>
<div>
<div class="flex-c fs12">
<div class="mr5">上一年度报告</div>
<div class="c0D9078 cp" @click="refuse(3)">
<i class="el-icon-edit-outline"></i>拒绝原因
</div>
</div>
<div class="refuse-info">拒绝原因：{{ reasonRejection(3) }}</div>
<div class="img">
<el-image
src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
:preview-src-list="[
'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
]"
/>
</div>
<div>有效日期：</div>
</div>
<el-divider></el-divider>
<div>
<div class="flex-c fs12">
<div class="mr5">委托人身份证照片</div>
<div class="c0D9078 cp" @click="refuse(4)">
<i class="el-icon-edit-outline"></i>拒绝原因
</div>
</div>
<div class="refuse-info">拒绝原因：{{ reasonRejection(4) }}</div>
<div class="img">
<el-image
:src="detail.assignorCertBackUrl"
:preview-src-list="[
'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
]"
/>
</div>
<div class="img">
<el-image
:src="detail.assignorCertFrontUrl"
:preview-src-list="[
'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
]"
/>
</div>
<div class="space-between flex-c">
<div>委托人姓名：{{ detail.assignorName }}</div>
<div>委托人身份证号：{{ detail.assignorCertNo }}</div>
<div>
委托人身份证有效日期：{{ detail.assignorValidDateBegin }}至{{
detail.assignorValidDateEnd
}}
</div>
</div>
</div>
<el-divider></el-divider>
<div>
<div class="flex-c fs12">
<div class="mr5">委托书</div>
<div class="c0D9078 cp" @click="refuse(5)">
<i class="el-icon-edit-outline"></i>拒绝原因
</div>
</div>
<div class="refuse-info">拒绝原因：{{ reasonRejection(5) }}</div>
<div class="img">
<el-image
:src="detail.assignorCertBackUrl"
:preview-src-list="[
'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
]"
/>
</div>
</div>
<el-divider></el-divider>
<div>
<div class="flex-c fs12">
<div class="mr5">法人身份证照片</div>
<div class="c0D9078 cp" @click="refuse(6)">
<i class="el-icon-edit-outline"></i>拒绝原因
</div>
</div>
<div class="refuse-info">拒绝原因：{{ reasonRejection(6) }}</div>
<div class="img">
<el-image
:src="detail.legalCertBackUrl"
:preview-src-list="[
'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
]"
/>
</div>
<div class="img">
<el-image
:src="detail.legalCertFrontUrl"
:preview-src-list="[
'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
]"
/>
</div>
<div class="space-between flex-c">
<div>法人人姓名：{{ detail.legalName }}</div>
<div>法人身份证号：{{ detail.legalCertNo }}</div>
<div>
法人身份证有效日期：{{ detail.legalValidDateBegin }} 至
{{ detail.legalValidDateEnd }}
</div>
</div>
</div>
<div>
<div class="tit">
<div>资质信息</div>
</div>
<div class="flex-start">
<div class="">经营范围：</div>
<div class="flex1">{{ detail.bizScope }}</div>
</div>
<div v-for="item in 4" :key="item" class="item">
<div class="flex-c fs12">
<div class="mr5">药品经营许可证</div>
<div class="c0D9078 cp" @click="refuse(7)">
<i class="el-icon-edit-outline"></i>拒绝原因
</div>
</div>
<div class="refuse-info">拒绝原因：{{ reasonRejection(7) }}</div>
<div class="img">
<el-image
src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
:preview-src-list="[
'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
]"
/>
</div>
<div>有效日期：沙发沙发沙发沙发</div>
</div>
</div>
</div>
<history-dialog :hidden="historyDialogHidden" @close="historyDialogClose" />
<refuse-dialog ref="refuseDialog" @confirm="refuseConfirm" />
<footer>
<el-button type="primary" size="small" @click="confirm"
>审核通过</el-button
>
<el-button type="default" size="small" @click="handleClose"
>审核不通过</el-button
>
</footer>
</div>
</template>
<script>
import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue";
import historyDialog from "./components/historyDialog.vue";
import refuseDialog from "./components/refuseDialog.vue";
import { getCertifyDetail, postCertifyAudit } from "@/utils/qualification";
import Footer from "../layout/footer.vue";
export default {
components: {
BreadCrumb,
historyDialog,
refuseDialog,
Footer,
},
filters: {},
computed: {
typeState() {
const reviewType = ["tobe-reviewed", "success-reviewed", "no-reviewed"];
return reviewType[this.$route.query.status];
},
typeStateText() {
const reviewType = ["待审核", "审核成功", "审核不通过"];
return reviewType[this.$route.query.status];
},
},
filters: {
},
data() {
return {
curmbFirst: "批发资质详情",
historyDialogHidden: false,
detail: {},
certifyValidDtoList: [], //认证审核校验描述
certifyLicenseImgList: [], //认证图片list：资质信息类
certifyReportImgList: [], //认证图片list 年度报告类
};
},
created() {
this.init();
},
methods: {
init() {
getCertifyDetail(this.id).then((res) => {
const {
certifyValidDtoList = [],
certifyLicenseImgList = [],
certifyReportImgList = [],
} = res.data;
console.log(this.certifyValidDtoList);
this.certifyValidDtoList = certifyValidDtoList;
this.certifyLicenseImgList = certifyLicenseImgList;
this.certifyReportImgList = certifyReportImgList;
this.detail = res.data;
});
},
showHistoryDialog() {
this.historyDialogHidden = true;
},
historyDialogClose() {
this.historyDialogHidden = false;
},
reasonRejection(type) {
const value = this.certifyValidDtoList.filter(v => {
return v.infoType === type
})[0] || {};
return value.refuseContent || '' ;
},
// copy
copyTxt(text) {
var type = "text/plain";
var blob = new Blob([text], { type });
var data = [new ClipboardItem({ [type]: blob })];
navigator.clipboard.write(data).then(
() => {
/* success */
this.$message.success("复制成功");
},
() => {
/* failure */
this.$message.error("复制失败");
}
);
},
confirm() {
const params = {
certificateInfoId:1,
certifyStatus:3,
certifyValidDtoList:this.certifyValidDtoList
}
if(this.certifyValidDtoList.length) {
this.$confirm("部分内容你已经标记拒绝，不可通过审核，请返回查看", "确认通过审核吗？", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
console.log(document.querySelector('#body-content').scrollTop);
console.log(this.$refs.company.scrollHeight,document.scrollTop);
document.querySelector('#body-content').scrollTop = this.$refs.company.scrollHeight
})
.catch(() => {});
return;
}
this.$confirm('', "确认通过审核吗？", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
postCertifyAudit(params).then(res => {
console.log(res);
document.querySelector('#body-content').scrollTop = 0;
this.init();
})
})
.catch(() => {});
},
handleClose() {
const params = {
certificateInfoId:1,
certifyStatus:4,
certifyValidDtoList:this.certifyValidDtoList
}
if(this.certifyValidDtoList.length) {
this.$confirm('', "确认通过审核不通过吗？", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
document.body.scrollTop = 0;
})
.catch(() => {});
return;
}
this.$confirm('未检测到有标记拒绝原因的项目，请返回查看', "确认通过审核不通过吗？", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
})
.catch(() => {});
},
refuseConfirm(params) {
console.log(params);
this.certifyValidDtoList.push(params)
},
refuse(type) {
console.log(type);
this.$refs.refuseDialog.show(type);
switch (type) {
case 1:
break;
}
},
},
};
</script>
<style lang="scss" scope>
.hr {
background-color: #dcdfe6;
position: relative;
display: block;
height: 1px;
width: 100%;
margin: 10px 0;
}
.mr5 {
margin-right: 5px;
}
.qualification-detail {
.qualification-content {
background: #fff;
padding: 10px;
.head {
.top {
display: flex;
align-items: center;
.name {
font-weight: bold;
font-size: 16px;
}
.type {
border: 1px solid #ccc;
padding: 2px 5px;
font-size: 14px;
border-radius: 5px;
margin: 0 5px;
&.tobe-reviewed {
color: #fac94d;
border: 1px solid #fac94d;
}
&.success-reviewed {
color: #71d60a;
border: 1px solid #71d60a;
}
&.no-reviewed {
color: #e2292a;
border: 1px solid #e2292a;
}
}
.history {
color: #0d9078;
font-size: 12px;
}
}
.bottom {
display: flex;
justify-content: space-between;
}
}
}
.company {
background-color: #fff;
margin: 10px 30px;
padding: 20px;
.c0D9078 {
margin-left: 5px;
font-size: 12px;
}
.info {
display: flex;
justify-content: space-between;
flex-wrap: nowrap;
line-height: 40px;
div {
}
}
}
.business {
background-color: #fff;
margin: 10px 30px;
padding: 20px;
font-size: 12px;
.img {
width: 80px;
height: 150px;
}
.item {
margin-bottom: 10px;
}
.flex-c {
margin-bottom: 10px;
}
.flex-start {
margin-bottom: 20px;
}
}
.tit {
display: flex;
align-items: center;
position: relative;
font-size: 16px;
margin-bottom: 20px;
> :first-child {
font-weight: bold;
}
&::before {
content: "";
width: 2px;
height: 70%;
position: absolute;
left: -5px;
background-color: #0d9078;
}
}
footer {
position: fixed;
bottom: 0;
right: 0;
background-color: #fff;
width: calc(100% - 255px);
text-align: right;
padding: 10px 20px;
}
.refuse-info {
font-size: 12px;
color: #e54543;
}
}
</style>
src/views/qualification/list.vue 0 → 100644
浏览文件 @ ace2c371
<template>
<div class="qualification-list">
<bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
<div class="qualification-content screenSet" id="screenSet">
<el-form
ref="searchForm"
:model="searchForm"
label-width="100px"
label-suffix=":"
:inline="true"
>
<template v-if="$route.query.source === 'ghs'">
<el-form-item label="店铺名称">
<el-input
v-model="searchForm.storeNameStr"
size="small"
style="width: 200px"
placeholder="请输入店铺名称，用‘、’隔开"
></el-input>
</el-form-item>
<el-form-item label="管理员姓名">
<el-input
v-model="searchForm.adminNameStr"
size="small"
style="width: 220px"
placeholder="请输入管理员姓名，用‘、’隔开"
></el-input>
</el-form-item>
<el-form-item label="管理员手机号">
<el-input
v-model="searchForm.adminMobileStr"
size="small"
style="width: 220px"
placeholder="亲输入管理员手机号，用‘、’隔开"
></el-input>
</el-form-item>
<el-form-item label="企业类型">
<el-select
v-model="searchForm.orgType"
placeholder="请选择"
size="small"
clearable
>
<el-option
v-for="(item, index) in orgList"
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</template>
<template v-if="$route.query.source === 'pf'">
<el-form-item label="医生ID">
<el-input
v-model="searchForm.doctorIdStr"
size="small"
style="width: 200px"
placeholder="请输入医生ID，用‘、’隔开"
></el-input>
</el-form-item>
<el-form-item label="医生姓名">
<el-input
v-model="searchForm.doctorNameStr"
size="small"
style="width: 200px"
placeholder="请输入医生姓名，用‘、’隔开"
></el-input>
</el-form-item>
<el-form-item label="企业名称">
<el-input
v-model="searchForm.orgNameStr"
size="small"
style="width: 200px"
placeholder="亲输入企业名称，用‘、’隔开"
></el-input>
</el-form-item>
</template>
<!-- <el-form-item label="审核状态">
<el-select
v-model="searchForm.status"
placeholder="请选择"
size="small"
>
<el-option
v-for="(item, index) in statusList"
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item> -->
</el-form>
<div class="form-btn">
<el-button type="primary" size="small" @click="submitForm"
>查询</el-button
>
<el-button type="default" size="small" @click="resetForm"
>重制</el-button
>
</div>
</div>
<div class="table">
<div class="tab">
<span
:class="{ checked: item.id === searchForm.status }"
v-for="item in tabList"
:key="item.id"
@click="checkTab(item)"
>{{ item.name }}</span
>
</div>
<el-table
:data="tableData"
align="left"
class="item-table"
style="width: 100%; margin-top: 10px"
>
<el-table-column
prop="id"
label="申请ID"
min-width="100"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.id }}</span>
</template>
</el-table-column>
<template v-if="$route.query.source === 'ghs'">
<el-table-column
prop="storeName"
label="店铺名称"
min-width="100"
align="center"
show-overflow-tooltip
>
<template slot-scope="scope">
<span>{{ scope.row.storeName }}</span>
</template>
</el-table-column>
<el-table-column
prop="adminName"
label="管理员姓名"
min-width="100"
align="center"
>
</el-table-column>
<el-table-column
prop="adminMobile"
label="管理员手机号"
min-width="100"
align="center"
>
</el-table-column>
</template>
<template v-if="$route.query.source === 'pf'">
<el-table-column
prop="storeName"
label="医生ID"
min-width="100"
align="center"
show-overflow-tooltip
>
<template slot-scope="scope">
<span>{{ scope.row.storeName }}</span>
</template>
</el-table-column>
<el-table-column
prop="applyName"
label="医生姓名"
min-width="100"
align="center"
>
</el-table-column>
</template>
<el-table-column
prop="orgName"
label="企业姓名"
min-width="100"
align="center"
>
</el-table-column>
<el-table-column
prop="orgType"
label="企业类型"
min-width="120"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.orgType }}</span>
</template>
</el-table-column>
<el-table-column
prop="status"
label="审核状态"
min-width="120"
align="center"
>
<template slot-scope="scope">
<span :class="scope.row.status | typeState">{{
scope.row.status | examineType
}}</span>
<el-tooltip
class="item"
effect="dark"
content="Top Left 提示文字"
placement="top-start"
>
<i class="el-icon-warning-outline no-reviewed"></i>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
prop="applyTime"
label="申请时间"
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="auditName"
label="审核人"
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="auditTime"
label="审核时间"
width="120"
align="center"
>
</el-table-column>
<el-table-column
label="操作"
min-width="230"
align="center"
fixed="right"
>
<template slot-scope="scope">
<div class="operation">
<el-button @click="editDetail(scope.row)" type="text" size="small"
>审核</el-button
>
<el-button @click="lookDetail(scope.row)" type="text" size="small"
>查看详情</el-button
>
</div>
</template>
</el-table-column>
</el-table>
<div class="pagination">
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleNumChange"
:current-page="searchForm.pageNo"
:page-sizes="[10, 30, 50, 100]"
:page-size="searchForm.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRows"
></el-pagination>
</div>
</div>
</div>
</template>
<script>
import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue";
import { getCertifyList } from "@/utils/qualification";
export default {
components: {
BreadCrumb,
},
filters: {
examineType(type) {
const obj = {
0: "待审核",
1: "审核通过",
2: "审核不通过",
};
return obj[type];
},
typeState(type) {
const reviewType = ["tobe-reviewed", "success-reviewed", "no-reviewed"];
return reviewType[type];
},
},
data() {
return {
curmbFirst: "首营资质审核",
tabList: [
{ id: 0, name: "全部" },
{ id: 2, name: "待审核" },
{ id: 3, name: "审核成功" },
{ id: 4, name: "审核失败" },
{ id: 5, name: "作废" },
],
searchForm: {
adminMobileStr: "",
adminNameStr: "",
doctorIdStr: "",
doctorNameStr: "",
orgNameStr: "",
orgType: "",
pageNo: 1,
pageSize: 10,
status: 0,
storeNameStr: "",
},
orgList: [
{ id: 1, name: "医疗机构(非营利性)" },
{ id: 2, name: "医疗机构(营利性)" },
{ id: 3, name: "零售-单体药店" },
{ id: 4, name: "零售-连锁药店" },
],
tableData: [
{
id: 1,
storeName: "11",
storeType: 2,
storeStatus: 2,
count: 2,
createdTime: 2,
commissionType: 2,
},
],
pageNo: 1,
pageSize: 10,
totalRows: 0,
};
},
created() {
this.init();
},
methods: {
init() {
const params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
type: Number(this.$route.query.type || 1),
...this.searchForm,
};
getCertifyList(params).then((res) => {
console.log(res);
const { contentList, total } = res.data;
this.tableData = contentList;
this.totalRows = total;
});
},
submitForm() {
this.init();
},
editDetail() {
this.$router.push({path:'/qualification-detail',query:{source:this.$route.query.source}})
},
lookDetail() {},
resetForm() {
(this.searchForm = {
adminMobileStr: "",
adminNameStr: "",
doctorIdStr: "",
doctorNameStr: "",
orgNameStr: "",
orgType: "",
pageNo: this.pageNo,
pageSize: this.pageSize,
status: this.searchForm.status,
storeNameStr: "",
}),
this.init();
},
handleSizeChange(value) {
this.pageSize = value;
this.pageNo = 1;
this.init();
},
handleNumChange(value) {
this.pageNo = value;
this.init();
},
checkTab(item) {
this.searchForm.status = item.id;
this.init();
},
},
};
</script>
<style lang="scss" scope>
.qualification-list {
.qualification-content {
background: #fff;
padding: 10px;
}
.form-btn {
text-align: right;
}
.table {
background-color: #fff;
margin: 10px 30px;
padding: 20px;
.tobe-reviewed {
color: #fac94d;
}
.success-reviewed {
color: #71d60a;
}
.no-reviewed {
color: #e2292a;
}
.tab {
span {
font-weight: bold;
font-size: 18px;
margin-right: 30px;
cursor: pointer;
&.checked {
color: #0d9078;
}
}
}
.operation {
span {
color: #0d9078;
}
}
}
}
</style>
src/views/shop/create-shop.vue
浏览文件 @ ace2c371
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
src/views/shop/shop-list.vue
浏览文件 @ ace2c371
......@@ -65,6 +65,22 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="店铺状态">
<el-select
v-model="searchForm.certifyStatus"
placeholder="请选择"
size="small"
clearable>
<el-option
v-for="item in storeTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right">
<el-button type="primary" size="small" @click="searchList">查询</el-button>
<el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
......@@ -93,9 +109,23 @@
<span>{{ scope.row.tradeStore.storeType | storeTypeFormat}}</span>
</template>
</el-table-column>
<el-table-column prop="storeStatus" label="店铺状态" min-width="100" align="center">
<el-table-column prop="storeType" label="店铺状态" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.tradeStore.storeStatus | statusFormat }}</span>
<span v-if="scope.row.tradeStore.storeType != 2" :class="scope.row.tradeStore.certifyStatus == 4 ? 'red' : 'green'">
{{ scope.row.tradeStore.certifyStatus | storeStatusFormat}}
</span>
<span v-else>
上线
</span>
<el-popover
v-if="scope.row.tradeStore.storeType != 2"
placement="top-start"
width="200"
trigger="hover"
:content="certificateInfoRespContent(scope.row.certificateInfoResp)">
<i v-if="scope.row.tradeStore.certifyStatus == 4" slot="reference" class="el-icon-warning-outline red"></i>
</el-popover>
</template>
</el-table-column>
<el-table-column prop="count" label="已上架商品数" min-width="120" align="center">
......@@ -132,14 +162,40 @@
</template>
</el-table-column>
<el-table-column label="操作" min-width="230" align="center" fixed="right">
<!-- <template slot-scope="scope">-->
<!-- <div>-->
<!-- <el-button v-if="scope.row.tradeStore.storeType == 1 && scope.row.tradeStore.certifyStatus == 3" @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>-->
<!-- <el-button @click="editShop(scope.row, 'true')" type="text" size="small">查看</el-button>-->
<!-- <el-button v-if="scope.row.tradeStore.storeType == 1 && scope.row.tradeStore.certifyStatus > 2" @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button>-->
<!-- <el-button v-if="checkIsEdit(scope.row)" @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button>-->
<!-- <el-button v-if="checkIsEdit(scope.row)" @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>-->
<!-- <el-button v-if="scope.row.tradeStore.storeType == 1 && scope.row.tradeStore.certifyStatus == 3"@click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>-->
<!-- <el-button v-if="scope.row.tradeStore.storeType == 3" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>-->
<!-- </div>-->
<!-- </template>-->
<template slot-scope="scope">
<div>
<el-button v-if="scope.row.tradeStore.commissionFlag == 2" @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>
<el-button @click="editShop(scope.row)" type="text" size="small">{{scope.row.tradeStore.storeType == 3 ? '查看' : '编辑'}}</el-button>
<el-button @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button>
<el-button @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
<el-button v-if="scope.row.tradeStore.commissionFlag == 2" @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
<el-button v-if="storageIdType == 1 && (scope.row.tradeStore.storeType == 3 && scope.row.tradeStore.storeStatus == 1)" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
<el-button @click="editShop(scope.row, 'true')" type="text" size="small">查看</el-button>
<el-button v-if="checkIsEdit(scope.row)" checkIsEdit @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button>
<el-button v-if="checkGoods(scope.row)" @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button>
<el-button v-if="checkBills(scope.row)" @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
<el-button v-if="checkSpe(scope.row)" @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>
<el-button v-if="checkSpe(scope.row)" @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
<el-button v-if="scope.row.tradeStore.storeType == 3 && isOutsideGetted == 'no'" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
</div>
</template>
</el-table-column>
......@@ -209,8 +265,6 @@
<el-button type="primary" @click="confirmSetPrice">确 定</el-button>
</span>
</el-dialog>
</div>
</div>
</template>
......@@ -219,12 +273,14 @@
import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue";
import { queryStore, queryShopAuth, closeShop } from '@/utils/shop';
import { getUserTypeReq } from "@/utils/cme/cmeApi";
export default {
components: {
BreadCrumb
},
data(){
return{
isOutsideGetted: 'no',
curmbFirst: '云鹊店铺',
showAllFlag: false,
showNewFlag: false,
......@@ -237,21 +293,12 @@
id: null,
type: null,
commissionType: 0,
proxyCommissionType:0
proxyCommissionType:0,
certifyStatus:null
},
canAdd: false,
totalRows: 0,
tableData: [
// {
// tradeStore: {
// id: 12,
// storeName: '康爱多',
// storeType: 1,
// storeStatus: 0,
// count: 2,
// createdTime: ''
// }
// }
],
typeList: [
{
......@@ -279,15 +326,27 @@
value: 2,
label: "固定分佣"
}],
storeTypeList: [
{
value: 1,
label: "待完善"
},
{
value: 2,
label: "待审核"
},
{
value: 3,
label: "审核通过"
},
{
value: 4,
label: "审核失败"
},
],
setPriceVisible: false,
setPriceForm:{
// commissionType: 1,
// commissionPrice: '',
// commissionPrice1: '',
// commissionPrice2: '',
// storeId: '',
// goodsId: '',
// maxPrice: ''
adminCommissionGoodsRespList:[],
commission:{
commissionKind: "",
......@@ -311,9 +370,6 @@
},
},
setPriceRules: {
// commissionType: [
// {required: true, message: "请选择分佣方式", trigger: 'blur'}
// ]
},
}
},
......@@ -322,6 +378,7 @@
// this.idType = localStorage.getItem("storageIdType");
this.storageIdType = localStorage.getItem("storageIdType") - 0;
console.log(this.storageIdType);
this.getUserTypeReq();
this.getAddAuth();
this.searchList();
},
......@@ -334,6 +391,15 @@
}
})
},
getUserTypeReq () {
getUserTypeReq().then(res => {
console.log('--res', res);
if(res.code == '000000'){
this.isOutsideGetted = res.data.code;
}
});
},
searchList() {
openLoading(this);
let params = this.searchForm;
......@@ -376,9 +442,8 @@
},
//新建店铺
createShop() {
this.$router.push({
path: `/create-shop`
})
let l = `${location.origin}#/create-shop?disabled=false`;
window.open(l);
},
//店铺管理
shopManage(row) {
......@@ -391,14 +456,6 @@
}
});
window.open(routeData.href, '_blank');
// this.$router.push({
// path: '/goods-manage',
// query: {
// storeId: row.tradeStore.id,
// commissionFlag:row.tradeStore.commissionFlag
// }
// })
},
orderManage(row) {
let routeData = this.$router.resolve({
......@@ -408,22 +465,11 @@
}
});
window.open(routeData.href, '_blank');
// this.$router.push({
// path: '/order-manage',
// query: {
// storeId: row.tradeStore.id,
// }
// })
},
//编辑
editShop(row) {
this.$router.push({
path: `/create-shop`,
query:{
storeId: row.tradeStore.id,
storeData: JSON.stringify(row),
}
})
editShop(row, disabled) {
let l = `${location.origin}#/create-shop?storeId=${row.tradeStore.id}&disabled=${disabled}&certifyStatus=${row.tradeStore.certifyStatus}`;
window.open(l);
},
handleSizeChange(val) {
this.searchForm.pageSize = val;
......@@ -495,52 +541,6 @@
});
return;
}
// for(let i = 0; i < this.setPriceForm.adminCommissionGoodsRespList.length; i++){
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && (this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == null || this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == "")){
//
// this.$message({
// message: '请选择分佣方式',
// type: "warning"
// });
// return;
// }
//
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 == undefined ){
// this.$message({
// message: '请输入按比例分佣',
// type: "warning"
// });
// return;
// }
// else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 > 100){
// this.$message({
// message: '请输入按比例分佣0-100',
// type: "warning"
// });
// return;
// }
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 == undefined ){
// this.$message({
// message: '请输入固定分佣金额',
// type: "warning"
// });
// return;
// }
//
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1){
// this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 * 100;
// }
// else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2){
// this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 * 100;
// }
//
// }
let timeoutId = null
timeoutId && clearTimeout(timeoutId)
timeoutId = setTimeout(() => {
......@@ -567,13 +567,6 @@
}
vm.setPriceForm.adminCommissionGoodsRespList[0] = vm.setPriceForm.commission;
vm.setPriceForm.adminCommissionGoodsRespList[1] = vm.setPriceForm.proxyCommission;
// if(vm.setPriceForm.commissionType == 1){
// vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice1;
// }
// else if(vm.setPriceForm.commissionType == 2){
// vm.setPriceForm.commissionPriceStr = vm.setPriceForm.commissionPrice2;
// }
// vm.setPriceForm.commissionPrice = vm.setPriceForm.commissionPriceStr * 100;
vm.POST('/store/commission/admin/store/save', vm.setPriceForm.adminCommissionGoodsRespList).then(res => {
vm.loading = false
// closeLoading(this);
......@@ -689,26 +682,7 @@
storeId: row.tradeStore.id,
};
}
// this.batchUpdatePriceFlag = batchUpdatePriceFlag;
// this.setPriceForm.storeId = row.tradeStore.id;
// this.setPriceForm.goodsId = row.tradeStore.goodsId;
// this.setPriceForm.commissionType = "";
// this.setPriceForm.commissionPrice1 = undefined;
// this.setPriceForm.commissionPrice2 = undefined;
// this.setPriceForm.commissionType = row.tradeStore.commissionType;
// if(this.setPriceForm.commissionType == 1){
// this.setPriceForm.commissionPrice1 = row.tradeStore.commissionPrice/100;
// }
// else if(this.setPriceForm.commissionType == 2){
// this.setPriceForm.commissionPrice2 = row.tradeStore.commissionPrice/100;
// }
this.setPriceVisible = true;
// if(this.$refs.setPriceForm) {
// this.$refs.setPriceForm.resetFields()
// }
// this.getProfit(row);
},
// 运费配置
setFreight(row) {
......@@ -721,7 +695,62 @@
});
window.open(routeData.href, '_blank');
},
certificateInfoRespContent (c) {
let v ='';
const b = c ? c.certifyValidDtoList : [];
if( b.length > 0) {
b.map( (i, j)=> {
if(j <= 3){
v = v + i.refuseContent;
}
});
}
return v;
},
checkIsEdit (row){
const {storeType, certifyStatus} = row.tradeStore;
if(storeType == 1 && Number(certifyStatus) > 2){
return true;
}else if(storeType == 2){
return true;
}else{
return false;
}
},
checkGoods(row) {
const {storeType, certifyStatus} = row.tradeStore;
if(storeType == 1 && Number(certifyStatus) === 3){
return true
}else if(storeType == 2){
return true
}else if(storeType == 3){
if(Number(certifyStatus) == 1 || Number(certifyStatus) == 3){
return true;
}else{
return false;
}
}else{
return false;
}
},
checkBills(row) {
const {storeType, certifyStatus} = row.tradeStore;
if(storeType == 1 && Number(certifyStatus) !== 3){
return false;
}else{
return true;
}
},
checkSpe(row) {
const {storeType, certifyStatus} = row.tradeStore;
if(storeType == 1 && Number(certifyStatus) == 3){
return true;
}else if(storeType == 2){
return true;
}else{
return false;
}
},
},
filters: {
storeTypeFormat: function(value){
......@@ -769,6 +798,27 @@
return value;
}
},
storeStatusFormat(v) {
let s = '';
switch (v) {
case 1:
s = '信息待完善'
break;
case 2:
s = '待审核'
break;
case 3:
s = '审核成功'
break;
case 4:
s = '审核失败'
break;
default:
s ='审核成功'
break;
}
return s;
}
},
}
</script>
......@@ -805,5 +855,11 @@
}
}
}
.red{
color: #FF4B33;
}
.green{
color: #449284;
}
}
</style>
yarn.lock 0 → 100644
浏览文件 @ ace2c371
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或