合并

dist/static/css/chunk-005a280c.be0820c1.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-eb544890],.el-button--primary[data-v-eb544890]:active,.el-button--primary[data-v-eb544890]:focus,.el-button--primary[data-v-eb544890]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-eb544890]{margin-top:40px}.el-col[data-v-eb544890]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-eb544890]{width:200px;margin:0 20px}[data-v-eb544890] .el-tree-node__content{height:40px!important}

dist/static/css/chunk-019e666d.ad01c304.css

@@ -0,0 +1 @@
+.bannerImg[data-v-3d1daefc],.bannerImg[data-v-7a547026],.bannerImg[data-v-37cd9aa1],.bannerImg[data-v-55f45a98],.bannerImg[data-v-5416f1c2],.bannerImg[data-v-22834abc],.bannerImg[data-v-c8aebd42],.bannerImg[data-v-da0bc4c8]{height:60px}

dist/static/css/chunk-18fe20e7.4fc5bd13.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-1ca6e9ea],.el-button--primary[data-v-1ca6e9ea]:active,.el-button--primary[data-v-1ca6e9ea]:focus,.el-button--primary[data-v-1ca6e9ea]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-1ca6e9ea] .el-date-editor.el-input,[data-v-1ca6e9ea] .el-select{width:100%!important}[data-v-1ca6e9ea] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-1ca6e9ea] .el-dialog__body{padding:10px 20px}.newBand[data-v-1ca6e9ea]{display:inline-block}

dist/static/css/chunk-35e813ce.b9b34c48.css

@@ -1 +1 @@
-.inputStyle[data-v-0d2ffef9]{width:100px;text-align:center}.title[data-v-0eb05fc4]{margin-bottom:20px}.amap-demo[data-v-0eb05fc4]{height:300px}.inputStyle[data-v-7d789d15]{width:100px;text-align:center}.work[data-v-7d789d15]{margin-bottom:30px;font-size:16px}[data-v-14faa8e0] .dialog-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.visible[data-v-a432fde2]{visibility:hidden}.cl-container .topFrom[data-v-a432fde2]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-a432fde2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-a432fde2]{list-style:none}.cl-container .searchForm[data-v-a432fde2]{margin:0 30px}.btnWraps[data-v-a432fde2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-a432fde2]{margin-right:20px}.inputStyle[data-v-a432fde2]{width:180px}.red[data-v-a432fde2]{color:red}.exportBtn[data-v-a432fde2]{background:#13817a}
+.inputStyle[data-v-0d2ffef9]{width:100px;text-align:center}.title[data-v-7ec1495b]{margin-bottom:20px}.amap-demo[data-v-7ec1495b]{height:300px}.inputStyle[data-v-2b78a271]{width:100px;text-align:center}.work[data-v-2b78a271]{margin-bottom:30px;font-size:16px}[data-v-14faa8e0] .dialog-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.visible[data-v-a432fde2]{visibility:hidden}.cl-container .topFrom[data-v-a432fde2]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-a432fde2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-a432fde2]{list-style:none}.cl-container .searchForm[data-v-a432fde2]{margin:0 30px}.btnWraps[data-v-a432fde2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-a432fde2]{margin-right:20px}.inputStyle[data-v-a432fde2]{width:180px}.red[data-v-a432fde2]{color:red}.exportBtn[data-v-a432fde2]{background:#13817a}

dist/static/css/chunk-36eb99eb.6f59660b.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-230fa150],.el-button--primary[data-v-230fa150]:active,.el-button--primary[data-v-230fa150]:focus,.el-button--primary[data-v-230fa150]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-230fa150]{margin-top:40px}.el-col[data-v-230fa150]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-230fa150]{width:200px;margin:0 20px}[data-v-230fa150] .el-tree-node__content{height:40px!important}[data-v-230fa150] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-230fa150]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-230fa150]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-230fa150]{width:120px;height:120px;display:block}

dist/static/css/chunk-4f05fb4d.9d0f9855.css

@@ -0,0 +1 @@
+.m-core[data-v-64261d50]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.m-core .left[data-v-64261d50]{width:550px}.m-core .right[data-v-64261d50]{margin-left:30px;min-width:600px}.m-core .right .box-card[data-v-64261d50]{width:100%;min-height:500px}.m-core .right .box-card .cardWrap[data-v-64261d50]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100%;margin-top:30px}.m-core .right .box-card .cardWrap .row[data-v-64261d50]{line-height:30px;font-size:14px}.m-core .right .box-card .cardWrap .title[data-v-64261d50]{text-align:center}.m-core .right .box-card .cardWrap .cardWrapleft[data-v-64261d50],.m-core .right .box-card .cardWrap .cardWrapright[data-v-64261d50]{width:48%}.m-core .right .box-card .cardWrap .cardWrapright .textWrap[data-v-64261d50]{margin-top:20px;width:100%;border:1px solid #999;min-height:100px}

dist/static/css/chunk-4f4cd23f.f6d84613.css

@@ -1 +1 @@
-.studenTable[data-v-674abd38]{height:300px;overflow:auto}.infoMsg[data-v-674abd38]{margin:30px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:center}.infoMsg .title[data-v-674abd38]{color:#999;font-size:14px;line-height:30px;min-width:100px}.infoMsg .status[data-v-674abd38]{font-size:20px}.infoMsg .left[data-v-674abd38]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-674abd38],.infoMsg .right[data-v-674abd38]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-674abd38]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-674abd38]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-674abd38]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-674abd38]{width:300px}.wrap[data-v-674abd38]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-674abd38]{margin-right:20px}
+.studenTable[data-v-edfcf184]{height:300px;overflow:auto}.infoMsg[data-v-edfcf184]{margin:30px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:center}.infoMsg .title[data-v-edfcf184]{color:#999;font-size:14px;line-height:30px;min-width:100px}.infoMsg .status[data-v-edfcf184]{font-size:20px}.infoMsg .left[data-v-edfcf184]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-edfcf184],.infoMsg .right[data-v-edfcf184]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-edfcf184]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-edfcf184]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-edfcf184]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-edfcf184]{width:300px}.wrap[data-v-edfcf184]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-edfcf184]{margin-right:20px}

dist/static/css/chunk-5788a6bc.83fc13bc.css

@@ -0,0 +1 @@
+.inputStyle[data-v-0d2ffef9]{width:100px;text-align:center}.title[data-v-7ec1495b]{margin-bottom:20px}.amap-demo[data-v-7ec1495b]{height:300px}.inputStyle[data-v-2b78a271]{width:100px;text-align:center}.work[data-v-2b78a271]{margin-bottom:30px;font-size:16px}[data-v-14faa8e0] .dialog-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.visible[data-v-a432fde2]{visibility:hidden}.cl-container .topFrom[data-v-a432fde2]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-a432fde2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-a432fde2]{list-style:none}.cl-container .searchForm[data-v-a432fde2]{margin:0 30px}.btnWraps[data-v-a432fde2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-a432fde2]{margin-right:20px}.inputStyle[data-v-a432fde2]{width:180px}.red[data-v-a432fde2]{color:red}.exportBtn[data-v-a432fde2]{background:#13817a}

dist/static/css/chunk-5d1342d6.21c8c99e.css

@@ -0,0 +1 @@
+.topWrap[data-v-2d0a556f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.topWrap div[data-v-2d0a556f]{margin-right:10px}

dist/static/css/chunk-5eba8d57.c25445e8.css

@@ -0,0 +1 @@
+.m-core[data-v-3a98e477]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-3a98e477]{width:180px}.m-core h4[data-v-3a98e477]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-3a98e477],.m-core .right[data-v-3a98e477],.m-core .vipLeft[data-v-3a98e477]{width:400px}.planList[data-v-3a98e477]{padding:0 25px}.planList .planTop[data-v-3a98e477]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-3a98e477]{font-size:14px}.planList .planCore .row[data-v-3a98e477]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-3a98e477]{width:87px}.okBtn[data-v-3a98e477]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

dist/static/css/chunk-5f68936a.4921ac88.css

@@ -0,0 +1 @@
+.el-input[data-v-7f7d9f38],.el-select[data-v-7f7d9f38],.el-textarea[data-v-7f7d9f38]{width:100%!important}.el-button--primary[data-v-7f7d9f38],.el-button--primary[data-v-7f7d9f38]:active,.el-button--primary[data-v-7f7d9f38]:focus,.el-button--primary[data-v-7f7d9f38]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-7f7d9f38] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}[data-v-7f7d9f38] .avatar-uploader .el-upload:hover{border-color:#409eff}.uploadFile[data-v-7f7d9f38] .el-input__inner{padding:0;height:40px;line-height:32px}.avatar-uploader-icon[data-v-7f7d9f38]{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.avatar[data-v-7f7d9f38]{width:178px;height:178px;display:block}

dist/static/css/chunk-66568257.82f41d9c.css

@@ -0,0 +1 @@
+[data-v-f3a9e9e0] .el-button--primary,[data-v-f3a9e9e0] .el-button--primary:active,[data-v-f3a9e9e0] .el-button--primary:focus,[data-v-f3a9e9e0] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-f3a9e9e0] .el-date-editor.el-input{width:100%!important}[data-v-f3a9e9e0] .el-select{width:98%!important}[data-v-f3a9e9e0] .el-table{display:inline-block}

dist/static/css/chunk-6e714362.fecea941.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-698ef3e4],.el-button--primary[data-v-698ef3e4]:active,.el-button--primary[data-v-698ef3e4]:focus,.el-button--primary[data-v-698ef3e4]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-698ef3e4] .el-date-editor.el-input,[data-v-698ef3e4] .el-select{width:100%!important}

dist/static/css/chunk-7549322d.4f152666.css

@@ -1 +1 @@
-.m-core[data-v-77da314b]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-77da314b]{width:180px}.m-core h4[data-v-77da314b]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-77da314b],.m-core .right[data-v-77da314b],.m-core .vipLeft[data-v-77da314b]{width:400px}.planList[data-v-77da314b]{padding:0 25px}.planList .planTop[data-v-77da314b]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-77da314b]{font-size:14px}.planList .planCore .row[data-v-77da314b]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-77da314b]{width:87px}.okBtn[data-v-77da314b]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-3a98e477]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-3a98e477]{width:180px}.m-core h4[data-v-3a98e477]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-3a98e477],.m-core .right[data-v-3a98e477],.m-core .vipLeft[data-v-3a98e477]{width:400px}.planList[data-v-3a98e477]{padding:0 25px}.planList .planTop[data-v-3a98e477]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-3a98e477]{font-size:14px}.planList .planCore .row[data-v-3a98e477]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-3a98e477]{width:87px}.okBtn[data-v-3a98e477]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

dist/static/css/chunk-7e63cdb5.94ff2cca.css

@@ -1 +1 @@
-.topWrap[data-v-874a8b26]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.topWrap div[data-v-874a8b26]{margin-right:10px}
+.topWrap[data-v-2d0a556f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.topWrap div[data-v-2d0a556f]{margin-right:10px}

dist/static/css/chunk-a877262c.289c3306.css

@@ -0,0 +1 @@
+[data-v-3505bcba] .el-button--primary,[data-v-3505bcba] .el-button--primary:active,[data-v-3505bcba] .el-button--primary:focus,[data-v-3505bcba] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-3505bcba] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-3505bcba] .el-date-editor.el-input{width:100%!important}[data-v-3505bcba] .el-select{width:98%!important}[data-v-3505bcba] .el-table{display:inline-block}

dist/static/css/chunk-fe766a16.fbd194ff.css

@@ -0,0 +1 @@
+.studenTable[data-v-edfcf184]{height:300px;overflow:auto}.infoMsg[data-v-edfcf184]{margin:30px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:center}.infoMsg .title[data-v-edfcf184]{color:#999;font-size:14px;line-height:30px;min-width:100px}.infoMsg .status[data-v-edfcf184]{font-size:20px}.infoMsg .left[data-v-edfcf184]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-edfcf184],.infoMsg .right[data-v-edfcf184]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-edfcf184]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-edfcf184]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-edfcf184]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-edfcf184]{width:300px}.wrap[data-v-edfcf184]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-edfcf184]{margin-right:20px}

src/views/HumanResources/index.vue

@@ -386,11 +386,12 @@ export default {
   activated () {
     this.getList();
     this.getSubjectList()
-    // this.getTreeList()
+    // 
   },
   mounted () {
     this.getList();
     this.getSubjectList()
+    this.getTreeList()
   },
   computed: {
     subjectListObj () {

src/views/accompanyManager/accompanyList.vue

@@ -327,6 +327,19 @@ export default {
     };
   },
   created () {
+    // if (this.$route.query.searchForm) {
+    //   this.$route.query.searchForm instanceof Object
+    //     ? (this.searchForm = this.$route.query.searchForm)
+    //     : (this.searchForm = JSON.parse(this.$route.query.searchForm));
+    // }
+    // if (this.$route.query.rules) {
+    //   this.$route.query.rules instanceof Object
+    //     ? (this.rules = this.$route.query.rules)
+    //     : (this.rules = JSON.parse(this.$route.query.rules));
+    // }
+    // this.init();
+  },
+  mounted () {
     if (this.$route.query.searchForm) {
       this.$route.query.searchForm instanceof Object
         ? (this.searchForm = this.$route.query.searchForm)
@@ -339,7 +352,6 @@ export default {
     }
     this.init();
   },
-  mounted () { },
   activated () {
     this.init();
   },

src/views/adapayAccount/form.vue

@@ -1,104 +1,146 @@
 <!--  -->
 <template>
-    <div class="m-container">
-        <h2>
-            <el-page-header @back="onCancel"
-                :content="(payType == 'create' ? '创建账号' : '修改账号')"></el-page-header>
-        </h2>
-        <div class="m-core" style="overflow: hidden">
-            <el-col :span="10">
-                <el-form :model="form" :rules="rules" ref="accountForm" label-position="right" label-width="180px">
-                    <el-form-item label="商户号" prop="memberId">
-                        <el-input v-model="form.memberId" :disabled="payType == 'update' ? true : false" placeholder="请输入商户号"></el-input>
-                    </el-form-item>
-                    <el-form-item label="公司名称" prop="name">
-                        <el-input v-model="form.name" placeholder="请输入公司名称"></el-input>
-                    </el-form-item>
-                    <el-form-item label="公司法人" prop="legalPerson">
-                        <el-input v-model="form.legalPerson" placeholder="请输入公司法人"></el-input>
-                    </el-form-item>
-                    <el-form-item label="公司法人手机号" prop="legalMp">
-                        <el-input v-model="form.legalMp" placeholder="请输入公司法人手机号"></el-input>
-                    </el-form-item>
-                    <el-form-item label="法人身份证号" prop="legalCertId">
-                        <el-input v-model="form.legalCertId" placeholder="请输入法人身份证号"></el-input>
-                    </el-form-item>
-                    <el-form-item label="身份证有效期" prop="legalCertIdExpires">
-                        <el-date-picker
-                            v-model="form.legalCertIdExpires"
+  <div class="m-container">
+    <h2>
+      <el-page-header @back="onCancel"
+                      :content="(payType == 'create' ? '创建账号' : '修改账号')"></el-page-header>
+    </h2>
+    <div class="m-core"
+         style="overflow: hidden">
+      <el-col :span="10">
+        <el-form :model="form"
+                 :rules="rules"
+                 ref="accountForm"
+                 label-position="right"
+                 label-width="180px">
+          <el-form-item label="商户号"
+                        prop="memberId">
+            <el-input v-model="form.memberId"
+                      :disabled="payType == 'update' ? true : false"
+                      placeholder="请输入商户号"></el-input>
+          </el-form-item>
+          <el-form-item label="公司名称"
+                        prop="name">
+            <el-input v-model="form.name"
+                      placeholder="请输入公司名称"></el-input>
+          </el-form-item>
+          <el-form-item label="公司法人"
+                        prop="legalPerson">
+            <el-input v-model="form.legalPerson"
+                      placeholder="请输入公司法人"></el-input>
+          </el-form-item>
+          <el-form-item label="公司法人手机号"
+                        prop="legalMp">
+            <el-input v-model="form.legalMp"
+                      placeholder="请输入公司法人手机号"></el-input>
+          </el-form-item>
+          <el-form-item label="法人身份证号"
+                        prop="legalCertId">
+            <el-input v-model="form.legalCertId"
+                      placeholder="请输入法人身份证号"></el-input>
+          </el-form-item>
+          <el-form-item label="身份证有效期"
+                        prop="legalCertIdExpires">
+            <el-date-picker v-model="form.legalCertIdExpires"
                             :picker-options="{ firstDayOfWeek:1 }"
                             value-format="yyyyMMdd"
                             type="date"
                             placeholder="请选择身份证有效期">
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="银行卡号" prop="cardNo">
-                        <el-input v-model="form.cardNo" placeholder="请输入银行卡号"></el-input>
-                    </el-form-item>
-                    <el-form-item label="所属银行" prop="bankCode">
-                        <el-select v-model="form.bankCode"
-                            placeholder="请选择所属银行">
-                            <el-option v-for="(item, index) in backList" :key="index" :label="item.title"
-                                    :value="item.value"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="省市" required>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item prop="provCode">
-                                    <el-select v-model="form.provCode" style="width: 98% !important" @change="onProvChange" placeholder="请选择省份">
-                                        <el-option v-for="(item, index) in cityList" :key="index" :label="item.title"
-                                                :value="item.value"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item prop="areaCode">
-                                    <el-select v-model="form.areaCode" style="width: 100% !important" placeholder="请选择城市">
-                                        <el-option v-for="(item, index) in selectListCity" :key="index" :label="item.title"
-                                                :value="item.value"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </el-form-item>
-                    <el-form-item label="统一社会信用码" prop="socialCreditCode">
-                        <el-input v-model="form.socialCreditCode" placeholder="请输入统一社会信用码"></el-input>
-                    </el-form-item>
-                    <el-form-item label="统一社会信用码有效期" prop="socialCreditCodeExpires">
-                        <el-date-picker
-                            v-model="form.socialCreditCodeExpires"
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="银行卡号"
+                        prop="cardNo">
+            <el-input v-model="form.cardNo"
+                      placeholder="请输入银行卡号"></el-input>
+          </el-form-item>
+          <el-form-item label="所属银行"
+                        prop="bankCode">
+            <el-select v-model="form.bankCode"
+                       placeholder="请选择所属银行">
+              <el-option v-for="(item, index) in backList"
+                         :key="index"
+                         :label="item.title"
+                         :value="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="省市"
+                        required>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item prop="provCode">
+                  <el-select v-model="form.provCode"
+                             style="width: 98% !important"
+                             @change="onProvChange"
+                             placeholder="请选择省份">
+                    <el-option v-for="(item, index) in cityList"
+                               :key="index"
+                               :label="item.title"
+                               :value="item.value"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item prop="areaCode">
+                  <el-select v-model="form.areaCode"
+                             style="width: 100% !important"
+                             placeholder="请选择城市">
+                    <el-option v-for="(item, index) in selectListCity"
+                               :key="index"
+                               :label="item.title"
+                               :value="item.value"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <el-form-item label="统一社会信用码"
+                        prop="socialCreditCode">
+            <el-input v-model="form.socialCreditCode"
+                      placeholder="请输入统一社会信用码"></el-input>
+          </el-form-item>
+          <el-form-item label="统一社会信用码有效期"
+                        prop="socialCreditCodeExpires">
+            <el-date-picker v-model="form.socialCreditCodeExpires"
                             :picker-options="{ firstDayOfWeek:1 }"
                             value-format="yyyyMMdd"
                             type="date"
                             placeholder="请选择统一社会信用码有效期">
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="经营范围" prop="businessScope">
-                        <!-- <el-input v-model="form.businessScope" placeholder="请输入经营范围"></el-input> -->
-                        <el-input type="textarea" :rows="3" v-model="form.businessScope" placeholder="请输入经营范围"></el-input>
-                    </el-form-item>
-                    <el-form-item label="公司地址" prop="address">
-                        <el-input v-model="form.address" placeholder="请输入公司地址"></el-input>
-                    </el-form-item>
-                    <el-form-item label="证照文件" prop="multipartFile">
-                        <!-- <el-input type="file" class="uploadFile" v-model="form.multipartFile"></el-input> -->
-                        <el-upload
-                            class="avatar-upload"
-                            ref="upload"
-                            action="/api-web/uploadFile"
-                            :on-preview="handlePreview"
-                            :on-remove="handleRemove"
-                            :on-change="handleChange"
-                            :file-list="fileList"
-                            :multiple="false"
-                            :limit="1"
-                            :auto-upload="false">
-                            <el-button slot="trigger" type="primary">选取文件</el-button>
-                            <!-- ，且不超过500kb -->
-                            <div slot="tip" style="display: inline; padding-left: 20px;" class="el-upload__tip">只能上传一个文件</div>
-                        </el-upload>
-                        <!-- <el-upload class="avatar-uploader"
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="经营范围"
+                        prop="businessScope">
+            <!-- <el-input v-model="form.businessScope" placeholder="请输入经营范围"></el-input> -->
+            <el-input type="textarea"
+                      :rows="3"
+                      v-model="form.businessScope"
+                      placeholder="请输入经营范围"></el-input>
+          </el-form-item>
+          <el-form-item label="公司地址"
+                        prop="address">
+            <el-input v-model="form.address"
+                      placeholder="请输入公司地址"></el-input>
+          </el-form-item>
+          <el-form-item label="证照文件"
+                        prop="multipartFile">
+            <!-- <el-input type="file" class="uploadFile" v-model="form.multipartFile"></el-input> -->
+            <el-upload class="avatar-upload"
+                       ref="upload"
+                       action="/api-web/uploadFile"
+                       :on-preview="handlePreview"
+                       :on-remove="handleRemove"
+                       :on-change="handleChange"
+                       :file-list="fileList"
+                       :multiple="false"
+                       :limit="1"
+                       :auto-upload="false">
+              <el-button slot="trigger"
+                         type="primary">选取文件</el-button>
+              <!-- ，且不超过500kb -->
+              <div slot="tip"
+                   style="display: inline; padding-left: 20px;"
+                   class="el-upload__tip">只能上传一个文件</div>
+            </el-upload>
+            <!-- <el-upload class="avatar-uploader"
                             action="/api-web/uploadFile"
                             :headers="headers"
                             :show-file-list="false"
@@ -110,18 +152,21 @@
                             <i v-else
                             class="el-icon-plus avatar-uploader-icon"></i>
                         </el-upload> -->
-                    </el-form-item>
-                    <el-form-item label="邮编" prop="zipCode">
-                        <el-input v-model="form.zipCode" placeholder="请输入邮编"></el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button @click="onCancel">取 消</el-button>
-                        <el-button type="primary" @click="onSubmit('accountForm')">确 定</el-button>
-                    </el-form-item>
-                </el-form>
-            </el-col>
-        </div>
+          </el-form-item>
+          <el-form-item label="邮编"
+                        prop="zipCode">
+            <el-input v-model="form.zipCode"
+                      placeholder="请输入邮编"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="onCancel">取 消</el-button>
+            <el-button type="primary"
+                       @click="onSubmit('accountForm')">确 定</el-button>
+          </el-form-item>
+        </el-form>
+      </el-col>
     </div>
+  </div>
 </template>
 
 <script>
@@ -132,253 +177,255 @@ import load from '@/utils/loading'
 import { createMember, updateMember } from './api.js'
 import { isvalidPhone } from '@/utils/validate'
 let validPhone = (rule, value, callback) => {
-    if (!value) {
-        callback(new Error('请输入公司法人手机号'))
-    } else if (!isvalidPhone(value)) {
-        callback(new Error('请输入正确的11位手机号码'))
-    } else {
-        callback()
-    }
+  if (!value) {
+    callback(new Error('请输入公司法人手机号'))
+  } else if (!isvalidPhone(value)) {
+    callback(new Error('请输入正确的11位手机号码'))
+  } else {
+    callback()
+  }
 }
 export default {
-    name: 'ADaPayAccount',
-    data() {
-        const query = this.$route.query
-        return {
-            payType: query.type,
-            row: query.row ? JSON.parse(query.row) : {},
-            backList: bankJson,
-            cityList: cityJson,
-            selectListCity: [],
-            headers: {
-                Authorization: getToken()
-            },
-            fileList: [],
-            files: null, // 上传对象
-            id: null, // 编号
-            form: {
-                memberId: null,
-                name: null,
-                legalPerson: null,
-                legalMp: null,
-                legalCertId: null,
-                legalCertIdExpires: null,
-                cardNo: null,
-                bankCode: null,
-                provCode: null,
-                areaCode: null,
-                socialCreditCode: null,
-                socialCreditCodeExpires: null,
-                businessScope: null,
-                address: null,
-                multipartFile: null,
-                zipCode: null
-            },
-            rules: {
-                memberId: [{required: true, message:'请输入商户号', trigger: 'blur'}],
-                name: [{required: true, message:'请输入公司名称', trigger: 'blur'}],
-                legalPerson: [{required: true, message:'请输入公司法人', trigger: 'blur'}],
-                legalMp: [{ type: 'number', required: true, validator: validPhone, trigger: 'blur' }],
-                legalCertId: [{required: true, message:'请输入法人身份证号', trigger: 'blur'}],
-                legalCertIdExpires: [{required: true, message:'请选择身份证有效期', trigger: 'change'}],
-                cardNo: [{required: true, message:'请输入银行卡号', trigger: 'blur'}],
-                bankCode: [{required: true, message:'请选择所属银行', trigger: 'change'}],
-                provCode: [{required: true, message:'请选择省份', trigger: 'change'}],
-                areaCode: [{required: true, message:'请选择城市', trigger: 'change'}],
-                socialCreditCode: [{required: true, message:'请输入统一社会信用码', trigger: 'blur'}],
-                socialCreditCodeExpires: [{required: true, message:'请选择统一社会信用码有效期', trigger: 'change'}],
-                businessScope: [{required: true, message:'请输入经营范围', trigger: 'blur'}],
-                address: [{required: true, message:'请输入公司地址', trigger: 'blur'}],
-                multipartFile: [{required: true, message:'请上传证照文件', trigger: 'change'}],
-                zipCode: [{required: true, message:'请输入邮编', trigger: 'blur'}]
-            }
-        };
+  name: 'ADaPayAccount',
+  data () {
+    const query = this.$route.query
+    return {
+      payType: query.type,
+      row: query.row ? JSON.parse(query.row) : {},
+      backList: bankJson,
+      cityList: cityJson,
+      selectListCity: [],
+      headers: {
+        Authorization: getToken()
+      },
+      fileList: [],
+      files: null, // 上传对象
+      id: null, // 编号
+      form: {
+        memberId: null,
+        name: null,
+        legalPerson: null,
+        legalMp: null,
+        legalCertId: null,
+        legalCertIdExpires: null,
+        cardNo: null,
+        bankCode: null,
+        provCode: null,
+        areaCode: null,
+        socialCreditCode: null,
+        socialCreditCodeExpires: null,
+        businessScope: null,
+        address: null,
+        multipartFile: null,
+        zipCode: null
+      },
+      rules: {
+        memberId: [{ required: true, message: '请输入商户号', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入公司名称', trigger: 'blur' }],
+        legalPerson: [{ required: true, message: '请输入公司法人', trigger: 'blur' }],
+        legalMp: [{ type: 'number', required: true, validator: validPhone, trigger: 'blur' }],
+        legalCertId: [{ required: true, message: '请输入法人身份证号', trigger: 'blur' }],
+        legalCertIdExpires: [{ required: true, message: '请选择身份证有效期', trigger: 'change' }],
+        cardNo: [{ required: true, message: '请输入银行卡号', trigger: 'blur' }],
+        bankCode: [{ required: true, message: '请选择所属银行', trigger: 'change' }],
+        provCode: [{ required: true, message: '请选择省份', trigger: 'change' }],
+        areaCode: [{ required: true, message: '请选择城市', trigger: 'change' }],
+        socialCreditCode: [{ required: true, message: '请输入统一社会信用码', trigger: 'blur' }],
+        socialCreditCodeExpires: [{ required: true, message: '请选择统一社会信用码有效期', trigger: 'change' }],
+        businessScope: [{ required: true, message: '请输入经营范围', trigger: 'blur' }],
+        address: [{ required: true, message: '请输入公司地址', trigger: 'blur' }],
+        multipartFile: [{ required: true, message: '请上传证照文件', trigger: 'change' }],
+        zipCode: [{ required: true, message: '请输入邮编', trigger: 'blur' }]
+      }
+    };
+  },
+  mounted () {
+    this.__init()
+  },
+  activated () {
+    this.__init()
+  },
+  methods: {
+    __init () {
+      const query = this.$route.query
+      this.payType = query.type
+      this.row = query.row ? JSON.parse(query.row) : {}
+      this.files = null
+      this.fileList = []
+      this.form.multipartFile = null
+      if (this.payType == 'update') {
+        const row = this.row
+        this.id = row.id
+        this.form = {
+          memberId: row.memberId,
+          name: row.name,
+          legalPerson: row.legalPerson,
+          legalMp: row.legalMp,
+          legalCertId: row.legalCertId,
+          legalCertIdExpires: row.legalCertIdExpires,
+          cardNo: row.cardNo,
+          bankCode: row.bankCode,
+          provCode: row.provCode,
+          areaCode: row.areaCode,
+          socialCreditCode: row.socialCreditCode,
+          socialCreditCodeExpires: row.socialCreditCodeExpires,
+          businessScope: row.businessScope,
+          address: row.address,
+          multipartFile: row.multipartFile,
+          zipCode: row.zipCode
+        }
+        this.cityList.forEach(item => {
+          if (item.value == row.provCode) {
+            this.selectListCity = item.cities
+          }
+        })
+      } else if (this.payType == 'create') {
+        // this.form = {
+        //     memberId: null,
+        //     name: null,
+        //     legalPerson: null,
+        //     legalMp: null,
+        //     legalCertId: null,
+        //     legalCertIdExpires: null,
+        //     cardNo: null,
+        //     bankCode: null,
+        //     provCode: null,
+        //     areaCode: null,
+        //     socialCreditCode: null,
+        //     socialCreditCodeExpires: null,
+        //     businessScope: null,
+        //     address: null,
+        //     multipartFile: null,
+        //     zipCode: null
+        // }
+        this.$refs["accountForm"].resetFields()
+      }
     },
-    mounted() {
-        this.__init()
+    async onSubmit (formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          const form = this.form
+          let formData = new FormData()
+          formData.append("memberId", form.memberId)
+          formData.append("name", form.name)
+          formData.append("legalPerson", form.legalPerson)
+          formData.append("legalMp", form.legalMp)
+          formData.append("legalCertId", form.legalCertId)
+          formData.append("legalCertIdExpires", form.legalCertIdExpires)
+          formData.append("cardNo", form.cardNo)
+          formData.append("bankCode", form.bankCode)
+          formData.append("provCode", form.provCode)
+          formData.append("areaCode", form.areaCode)
+          formData.append("socialCreditCode", form.socialCreditCode)
+          formData.append("socialCreditCodeExpires", form.socialCreditCodeExpires)
+          formData.append("businessScope", form.businessScope)
+          formData.append("address", form.address)
+          formData.append("multipartFile", form.multipartFile)
+          formData.append("zipCode", form.zipCode)
+          if (this.payType == 'create') {
+            createMember(formData).then(res => {
+              if (res.code == 200) {
+                this.$message.success('保存成功')
+                this.onCancel()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+          } else if (this.payType == 'update') {
+            formData.append('id', this.id)
+            updateMember(formData).then(res => {
+              if (res.code == 200) {
+                this.$message.success('保存成功')
+                this.onCancel()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+          }
+        } else {
+          return false;
+        }
+      });
     },
-    activated() {
-        this.__init()
+    handleChange (file) {
+      this.files = file
+      this.form.multipartFile = file.raw
+      this.$refs["accountForm"].validateField('multipartFile')
     },
-    methods: {
-        __init() {
-            const query = this.$route.query
-            this.payType = query.type
-            this.row = query.row ? JSON.parse(query.row) : {}
-            this.files = null
-            this.fileList = []
-            this.form.multipartFile = null
-            if(this.payType == 'update') {
-                const row = this.row
-                this.id = row.id
-                this.form = {
-                    memberId: row.memberId,
-                    name: row.name,
-                    legalPerson: row.legalPerson,
-                    legalMp: row.legalMp,
-                    legalCertId: row.legalCertId,
-                    legalCertIdExpires: row.legalCertIdExpires,
-                    cardNo: row.cardNo,
-                    bankCode: row.bankCode,
-                    provCode: row.provCode,
-                    areaCode: row.areaCode,
-                    socialCreditCode: row.socialCreditCode,
-                    socialCreditCodeExpires: row.socialCreditCodeExpires,
-                    businessScope: row.businessScope,
-                    address: row.address,
-                    multipartFile: row.multipartFile,
-                    zipCode: row.zipCode
-                }
-                this.cityList.forEach(item => {
-                    if(item.value == row.provCode) {
-                        this.selectListCity = item.cities
-                    }
-                })
-            } else if(this.payType == 'create') {
-                // this.form = {
-                //     memberId: null,
-                //     name: null,
-                //     legalPerson: null,
-                //     legalMp: null,
-                //     legalCertId: null,
-                //     legalCertIdExpires: null,
-                //     cardNo: null,
-                //     bankCode: null,
-                //     provCode: null,
-                //     areaCode: null,
-                //     socialCreditCode: null,
-                //     socialCreditCodeExpires: null,
-                //     businessScope: null,
-                //     address: null,
-                //     multipartFile: null,
-                //     zipCode: null
-                // }
-                this.$refs["accountForm"].resetFields()
-            }
-        },
-        async onSubmit (formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    const form = this.form
-                    let formData = new FormData()
-                        formData.append("memberId", form.memberId)
-                        formData.append("name", form.name)
-                        formData.append("legalPerson", form.legalPerson)
-                        formData.append("legalMp", form.legalMp)
-                        formData.append("legalCertId", form.legalCertId)
-                        formData.append("legalCertIdExpires", form.legalCertIdExpires)
-                        formData.append("cardNo", form.cardNo)
-                        formData.append("bankCode", form.bankCode)
-                        formData.append("provCode", form.provCode)
-                        formData.append("areaCode", form.areaCode)
-                        formData.append("socialCreditCode", form.socialCreditCode)
-                        formData.append("socialCreditCodeExpires", form.socialCreditCodeExpires)
-                        formData.append("businessScope", form.businessScope)
-                        formData.append("address", form.address)
-                        formData.append("multipartFile", form.multipartFile)
-                        formData.append("zipCode", form.zipCode)
-                    if(this.payType == 'create') {
-                        createMember(formData).then(res => {
-                            if(res.code == 200) {
-                                this.$message.success('保存成功')
-                                this.onCancel()
-                            } else {
-                                this.$message.error(res.msg)
-                            }
-                        })
-                    } else if(this.payType == 'update') {
-                        formData.append('id', this.id)
-                        updateMember(formData).then(res => {
-                            if(res.code == 200) {
-                                this.$message.success('保存成功')
-                                this.onCancel()
-                            } else {
-                                this.$message.error(res.msg)
-                            }
-                        })
-                    }
-                } else {
-                    return false;
-                }
-            });
-        },
-        handleChange(file) {
-            this.files = file
-            this.form.multipartFile = file.raw
-            this.$refs["accountForm"].validateField('multipartFile')
-        },
-        handleRemove(file, fileList) {
-            this.files = null
-            this.form.multipartFile = null
-        },
-        handlePreview(file) {
-            // console.log(file);
-        },
-        onProvChange(value) {
-            this.form.areaCode = null
-            this.cityList.forEach(item => {
-                if(item.value == value) {
-                    this.selectListCity = item.cities
-                }
-            })
-        },
-        onCancel () {
-            this.files = null
-            this.fileList = []
-            this.form.multipartFile = null
-            this.$router.push({
-                path: "/insideSetting/adapayManager"
-            });
+    handleRemove (file, fileList) {
+      this.files = null
+      this.form.multipartFile = null
+    },
+    handlePreview (file) {
+      // console.log(file);
+    },
+    onProvChange (value) {
+      this.form.areaCode = null
+      this.cityList.forEach(item => {
+        if (item.value == value) {
+          this.selectListCity = item.cities
         }
+      })
     },
+    onCancel () {
+      this.files = null
+      this.fileList = []
+      this.form.multipartFile = null
+      this.$router.push({
+        path: "/insideSetting/adapayManager"
+      });
+    }
+  },
 };
 </script>
 <style lang='scss' scoped>
-.el-input, .el-textarea, .el-select {
-    width: 100% !important;
+.el-input,
+.el-textarea,
+.el-select {
+  width: 100% !important;
 }
 .el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
     color: #fff;
-    &:hover,
-    &:active,
-    &:focus {
-        background: #14928a;
-        border-color: #14928a;
-        color: #fff;
-    }
+  }
 }
 /deep/.avatar-uploader {
-    .el-upload {
-        border: 1px dashed #d9d9d9;
-        border-radius: 6px;
-        cursor: pointer;
-        position: relative;
-        overflow: hidden;
-        &:hover {
-            border-color: #409EFF;
-        }
+  .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    &:hover {
+      border-color: #409eff;
     }
+  }
 }
 .uploadFile {
-    /deep/.el-input__inner {
-        padding: 0;
-        height: 40px;
-        line-height: 32px;
-    }
+  /deep/.el-input__inner {
+    padding: 0;
+    height: 40px;
+    line-height: 32px;
+  }
 }
 .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 178px;
-    height: 178px;
-    line-height: 178px;
-    text-align: center;
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
 }
 .avatar {
-    width: 178px;
-    height: 178px;
-    display: block;
+  width: 178px;
+  height: 178px;
+  display: block;
 }
 </style>

src/views/adapayAccount/index.vue

@@ -1,113 +1,136 @@
 <!--  -->
 <template>
-    <div class="m-container">
-        <h2>
-            <div class="squrt"></div>汇付账号管理
-        </h2>
-        <div class="topWrap">
-            <div class="newBand" v-permission="'adapay/createMember'" @click="onOperationAccount('create')" >创建账号</div>
-        </div>
-        <div class="m-core">
-            <el-form :inline="true"
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>汇付账号管理
+    </h2>
+    <div class="topWrap">
+      <div class="newBand"
+           v-permission="'adapay/createMember'"
+           @click="onOperationAccount('create')">创建账号</div>
+    </div>
+    <div class="m-core">
+      <el-form :inline="true"
                class="searchForm"
                v-model.trim="searchForm">
-                <el-form-item>
-                <el-input v-model.trim="searchForm.memberId"
-                            placeholder="请输入商户号"></el-input>
-                </el-form-item>
-                <el-form-item>
-                <el-input v-model.trim="searchForm.name"
-                            placeholder="请输入公司名称"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-select v-model.trim="searchForm.status"
-                                filterable
-                                clearable
-                                placeholder="请选择审核状态">
-                        <el-option label="处理中" value="pending"></el-option>
-                        <el-option label="成功" value="succeeded"></el-option>
-                        <el-option label="失败" value="failed"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button @click="getList" type="danger">搜索</el-button>
-                </el-form-item>
-            </el-form>
-            <div class="tableWrap">
-                <el-table :data="tableList"
-                            :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-                    <el-table-column label="商户号"
-                                    align="center"
-                                    prop="memberId"></el-table-column>
-                    <el-table-column label="法人"
-                                    align="center"
-                                    prop="legalPerson"></el-table-column>
-                    <el-table-column label="法人手机号"
-                                    align="center"
-                                    prop="legalMp"></el-table-column>
-                    <el-table-column label="法人身份证号"
-                                    align="center"
-                                    prop="legalCertId"></el-table-column>
-                    <el-table-column label="公司名称"
-                                    align="center"
-                                    prop="name"></el-table-column>
-                    <el-table-column label="统一社会信用码"
-                                    align="center"
-                                    prop="socialCreditCode"></el-table-column>
-                    <el-table-column label="银行卡号"
-                                    align="center"
-                                    prop="cardNo"></el-table-column>
-                    <el-table-column label="审核状态"
-                                    align="center"
-                                    prop="status">
-                        <template slot-scope="scope">
-                            {{ scope.row.status | formatStatus }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="备注"
-                                    align="center"
-                                    prop="memo"></el-table-column>
-                    <el-table-column label="操作"
-                                    width="250px"
-                                    align="center"
-                                    fixed="right">
-                        <template slot-scope="scope">
-                            <el-button v-if="scope.row.status === 'failed'"  v-permission="'adapay/updateMember'" @click="onOperationAccount('update', scope.row)" type="text">修改</el-button>
-                            <el-button v-if="scope.row.status === 'succeeded'"  v-permission="'adapay/createSettleAccount'" @click="onUpdateAccount(scope.row)" type="text">修改结算账户</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <pagination :total="rules.total"
-                            :page.sync="rules.page"
-                            :limit.sync="rules.limit"
-                            :page-sizes="rules.page_size"
-                            @pagination="getList" />
-            </div>
-        </div>
+        <el-form-item>
+          <el-input v-model.trim="searchForm.memberId"
+                    placeholder="请输入商户号"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model.trim="searchForm.name"
+                    placeholder="请输入公司名称"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model.trim="searchForm.status"
+                     filterable
+                     clearable
+                     placeholder="请选择审核状态">
+            <el-option label="处理中"
+                       value="pending"></el-option>
+            <el-option label="成功"
+                       value="succeeded"></el-option>
+            <el-option label="失败"
+                       value="failed"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getList"
+                     type="danger">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="tableWrap">
+        <el-table :data="tableList"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column label="商户号"
+                           align="center"
+                           prop="memberId"></el-table-column>
+          <el-table-column label="法人"
+                           align="center"
+                           prop="legalPerson"></el-table-column>
+          <el-table-column label="法人手机号"
+                           align="center"
+                           prop="legalMp"></el-table-column>
+          <el-table-column label="法人身份证号"
+                           align="center"
+                           prop="legalCertId"></el-table-column>
+          <el-table-column label="公司名称"
+                           align="center"
+                           prop="name"></el-table-column>
+          <el-table-column label="统一社会信用码"
+                           align="center"
+                           prop="socialCreditCode"></el-table-column>
+          <el-table-column label="银行卡号"
+                           align="center"
+                           prop="cardNo"></el-table-column>
+          <el-table-column label="审核状态"
+                           align="center"
+                           prop="status">
+            <template slot-scope="scope">
+              {{ scope.row.status | formatStatus }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注"
+                           align="center"
+                           prop="memo"></el-table-column>
+          <el-table-column label="操作"
+                           width="250px"
+                           align="center"
+                           fixed="right">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.status === 'failed'"
+                         v-permission="'adapay/updateMember'"
+                         @click="onOperationAccount('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button v-if="scope.row.status === 'succeeded'"
+                         v-permission="'adapay/createSettleAccount'"
+                         @click="onUpdateAccount(scope.row)"
+                         type="text">修改结算账户</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
+      </div>
+    </div>
 
-        <el-dialog title="绑定结算账户" :visible.sync="zeroVisible" width="400px" @close="onFormClose('maskForm')">
-            <el-form :model='maskForm'
+    <el-dialog title="绑定结算账户"
+               :visible.sync="zeroVisible"
+               width="400px"
+               @close="onFormClose('maskForm')">
+      <el-form :model='maskForm'
                :rules="maskRules"
                label-width="100px"
                label-position="right"
                ref="maskForm">
-                <el-form-item label="银行卡号" prop="cardNo">
-                    <el-input v-model="maskForm.cardNo" placeholder="请输入银行卡号"></el-input>
-                </el-form-item>
-                <el-form-item label="所属银行" prop="bankCode">
-                    <el-select v-model="maskForm.bankCode" style="width: 100% !important" placeholder="请选择所属银行">
-                        <el-option v-for="(item, index) in backList" :key="index" :label="item.title"
-                                :value="item.value"></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-form>
-            <span slot="footer"
-                    class="dialog-footer">
-                <el-button @click="zeroVisible = false">取 消</el-button>
-                <el-button type="primary" @click="addZero('maskForm')">确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
+        <el-form-item label="银行卡号"
+                      prop="cardNo">
+          <el-input v-model="maskForm.cardNo"
+                    placeholder="请输入银行卡号"></el-input>
+        </el-form-item>
+        <el-form-item label="所属银行"
+                      prop="bankCode">
+          <el-select v-model="maskForm.bankCode"
+                     style="width: 100% !important"
+                     placeholder="请选择所属银行">
+            <el-option v-for="(item, index) in backList"
+                       :key="index"
+                       :label="item.title"
+                       :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="zeroVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="addZero('maskForm')">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -118,105 +141,104 @@ import { cityJson } from './cityJson'
 import { bankJson } from './bankJson'
 import cleanDeep from 'clean-deep'
 export default {
-    components: {
-        pagination,
-        AccountForm
-    },
-    data () {
-        return {
-            zeroVisible: false,
-            backList: bankJson,
-            rules: {
-                // 分页规则
-                limit: 20, // 限制显示条数
-                page: 1, // 当前页
-                total: 0, // 总条数
-                page_size: [10, 20, 50, 100] // 选择限制显示条数
-            },
-            tableList: [],
-            searchForm: { },
-            maskRules: {
-                cardNo: [{required: true, message:'请输入银行卡号', trigger: 'blur'}],
-                bankCode: [{required: true, message:'请选择所属银行', trigger: 'change'}]
-            },
-            maskForm: {
-                memberId: null,
-                cardNo: null,
-                bankCode: null
-            }
-        };
-    },
-    mounted () {
-        this.getList()
+  components: {
+    pagination,
+    AccountForm
+  },
+  data () {
+    return {
+      zeroVisible: false,
+      backList: bankJson,
+      rules: {
+        // 分页规则
+        limit: 20, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 50, 100] // 选择限制显示条数
+      },
+      tableList: [],
+      searchForm: {},
+      maskRules: {
+        cardNo: [{ required: true, message: '请输入银行卡号', trigger: 'blur' }],
+        bankCode: [{ required: true, message: '请选择所属银行', trigger: 'change' }]
+      },
+      maskForm: {
+        memberId: null,
+        cardNo: null,
+        bankCode: null
+      }
+    };
+  },
+  mounted () {
+    this.getList()
+  },
+  activated () {
+    this.getList()
+  },
+  methods: {
+    getList () {
+      try {
+        let obj = this.searchForm
+        obj.page = this.rules.page
+        obj.rows = this.rules.limit
+        queryPageList(cleanDeep(obj)).then(res => {
+          if (res.code == 200) {
+            this.tableList = res.data.rows
+            this.rules.total = res.data.total
+          }
+        })
+      } catch {
+        //
+      }
     },
-    activated () {
-        this.getList()
+    onFormClose (formName) {
+      this.$refs[formName].resetFields()
     },
-    methods: {
-        getList() {
-            try {
-                let obj = this.searchForm
-                obj.page= this.rules.page
-                obj.rows= this.rules.limit
-                queryPageList(cleanDeep(obj)).then(res => {
-                    if(res.code == 200) {
-                        this.tableList = res.data.rows
-                        this.rules.total = res.data.total
-                    }
-                })
-            } catch {
-                //
-            }
-        },
-        onFormClose(formName) {
-            this.$refs[formName].resetFields()
-        },
-        onOperationAccount(type, row) {
-            this.$router.push({
-                path: '/insideSetting/adapayOperation',
-                query: {
-                    type: type,
-                    row: JSON.stringify(row)
-                }
-            })
-        },
-        onUpdateAccount(row) {
-            this.zeroVisible = true
-            this.maskForm = {
-                memberId: row.memberId,
-                cardNo: row.cardNo,
-                bankCode: row.bankCode
-            }
-        },
-        addZero(formName) {
-             this.$refs[formName].validate(valid => {
-                if (valid) {
-                    createSettleAccount(cleanDeep(this.maskForm)).then(res => {
-                        if(res.code == 200) {
-                            this.$message.success('修改结算账户成功')
-                            this.zeroVisible = false
-                        } else {
-                            this.$message.error(res.msg)
-                        }
-                    })
-                } else {
-                    return false;
-                }
-            });
+    onOperationAccount (type, row) {
+      this.$router.push({
+        path: '/insideSetting/adapayOperation',
+        query: {
+          type: type,
+          row: JSON.stringify(row)
         }
+      })
+    },
+    onUpdateAccount (row) {
+      this.zeroVisible = true
+      this.maskForm = {
+        memberId: row.memberId,
+        cardNo: row.cardNo,
+        bankCode: row.bankCode
+      }
     },
-    filters: {
-        formatStatus(val) {
-            const templateList = {
-                pending:"处理中",
-                succeeded:"成功",
-                failed: "失败"
+    addZero (formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          createSettleAccount(cleanDeep(this.maskForm)).then(res => {
+            if (res.code == 200) {
+              this.$message.success('修改结算账户成功')
+              this.zeroVisible = false
+            } else {
+              this.$message.error(res.msg)
             }
-            return templateList[val]
+          })
+        } else {
+          return false;
         }
+      });
     }
+  },
+  filters: {
+    formatStatus (val) {
+      const templateList = {
+        pending: "处理中",
+        succeeded: "成功",
+        failed: "失败"
+      }
+      return templateList[val]
+    }
+  }
 };
 </script>
 <style lang='scss' scoped>
-
 </style>

src/views/afterSchoolManager/afterSchoolDetail.vue

@@ -3,9 +3,10 @@
   <div class="m-container">
     <h2>
       <!-- <div class='squrt'></div> {{ pageName }} -->
-      <el-page-header @back="goBack" :content="title"></el-page-header>
+      <el-page-header @back="goBack"
+                      :content="title"></el-page-header>
     </h2>
-    <afterWorkList/>
+    <afterWorkList />
   </div>
 </template>
 
@@ -13,39 +14,39 @@
 import afterWorkList from "@/views/afterSchoolManager/afterWorkList";
 export default {
   components: { afterWorkList },
-  data() {
+  data () {
     return {
       FsearchForm: null,
       Frules: null,
-      title:'',
-      id:null
+      title: '',
+      id: null
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {
-    this.init();
-  },
+  // created() {
+  //   this.init();
+  // },
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
-    
+  mounted () {
+    this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       if (this.$route.query.searchForm) {
         this.FsearchForm = this.$route.query.searchForm;
       }
       if (this.$route.query.rules) {
         this.Frules = this.$route.query.rules;
       }
-          this.title = this.$route.query.title
-          this.id = this.$route.query.extracurricularExercisesId
-          // console.log(this.id)
-        //   console.log(this.$router.query)
+      this.title = this.$route.query.title
+      this.id = this.$route.query.extracurricularExercisesId
+      // console.log(this.id)
+      //   console.log(this.$router.query)
     },
-    goBack() {
+    goBack () {
       this.$router.push({ path: "/business/afterSchoolManager", query: { rules: this.Frules, searchForm: this.FsearchForm } });
     }
   }

src/views/afterSchoolManager/afterSchoolTeach.vue

@@ -2,38 +2,34 @@
 <template>
   <div class="m-core">
     <div class="m-core">
-      <el-form :inline="true" :model="searchForm">
+      <el-form :inline="true"
+               :model="searchForm">
         <el-form-item>
-          <el-input
-            v-model.trim="searchForm.search"
-            @keyup.enter.native="search"
-            placeholder="学生姓名"
-          ></el-input>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="search"
+                    placeholder="学生姓名"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="指导老师" v-model="searchForm.teacherId" clearable filterable>
-            <el-option
-              v-for="(item,index) in teacherList"
-              :label="item.realName"
-              :value="item.id"
-              :key="index"
-            ></el-option>
+          <el-select placeholder="指导老师"
+                     v-model="searchForm.teacherId"
+                     clearable
+                     filterable>
+            <el-option v-for="(item,index) in teacherList"
+                       :label="item.realName"
+                       :value="item.id"
+                       :key="index"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="organId">
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.organIdList"
-            filterable
-            clearable
-            placeholder="请选择分部"
-          >
-            <el-option
-              v-for="(item,index) in organList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.organIdList"
+                     filterable
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="(item,index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item>
@@ -43,95 +39,121 @@
           </el-select>
         </el-form-item> -->
         <el-form-item>
-          <el-select placeholder="实际安排" v-model="searchForm.actualExercisesNumIsAchieve" clearable>
-            <el-option label="符合预期" value="1"></el-option>
-            <el-option label="不符合预期" value="0"></el-option>
+          <el-select placeholder="实际安排"
+                     v-model="searchForm.actualExercisesNumIsAchieve"
+                     clearable>
+            <el-option label="符合预期"
+                       value="1"></el-option>
+            <el-option label="不符合预期"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="提交次数" v-model="searchForm.exercisesReplyNumIsAchieve" clearable>
-            <el-option label="符合预期" value="1"></el-option>
-            <el-option label="不符合预期" value="0"></el-option>
+          <el-select placeholder="提交次数"
+                     v-model="searchForm.exercisesReplyNumIsAchieve"
+                     clearable>
+            <el-option label="符合预期"
+                       value="1"></el-option>
+            <el-option label="不符合预期"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="评价次数" v-model="searchForm.exercisesMessageNumIsAchieve" clearable>
-            <el-option label="符合预期" value="1"></el-option>
-            <el-option label="不符合预期" value="0"></el-option>
+          <el-select placeholder="评价次数"
+                     v-model="searchForm.exercisesMessageNumIsAchieve"
+                     clearable>
+            <el-option label="符合预期"
+                       value="1"></el-option>
+            <el-option label="不符合预期"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
-            placeholder="及时评价"
-            v-model="searchForm.exercisesMessageTimelyNumIsAchieve"
-            clearable
-          >
-            <el-option label="符合预期" value="1"></el-option>
-            <el-option label="不符合预期" value="0"></el-option>
+          <el-select placeholder="及时评价"
+                     v-model="searchForm.exercisesMessageTimelyNumIsAchieve"
+                     clearable>
+            <el-option label="符合预期"
+                       value="1"></el-option>
+            <el-option label="不符合预期"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="周次选择">
-          <el-date-picker
-            v-model.trim="searchForm.timer"
-            style="width:400px;"
-            type="daterange"
-            :picker-options="{
+          <el-date-picker v-model.trim="searchForm.timer"
+                          style="width:400px;"
+                          type="daterange"
+                          :picker-options="{
         firstDayOfWeek: 1
     }"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            @change="getWeekTime"
-          ></el-date-picker>
+                          value-format="yyyy-MM-dd"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          @change="getWeekTime"></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="search">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
-          <el-button
-            @click="onExport"
-            type="primary"
-            v-permission="'export/exercisesSituations'"
-            style=" background: #14928a; border:1px solid #14928a;"
-          >导出</el-button>
+          <el-button type="danger"
+                     @click="search">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
+          <el-button @click="onExport"
+                     type="primary"
+                     v-permission="'export/exercisesSituations'"
+                     style=" background: #14928a; border:1px solid #14928a;">导出</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableList"
-        >
-          <el-table-column align="center" prop="studentId" label="学员编号"></el-table-column>
-          <el-table-column align="center" prop="studentName" label="学生姓名"></el-table-column>
-          <el-table-column align="center" prop="organName" label="所属分部"></el-table-column>
-          <el-table-column align="center" prop="teacherName" label="指导老师"></el-table-column>
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="学员编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentName"
+                           label="学生姓名"></el-table-column>
+          <el-table-column align="center"
+                           prop="organName"
+                           label="所属分部"></el-table-column>
+          <el-table-column align="center"
+                           prop="teacherName"
+                           label="指导老师"></el-table-column>
           <!-- <el-table-column align="center" label="当前有VIP课" width="100" >
             <template slot-scope="scope">
               <div>{{scope.row.existVipCourse?'是':'否'}}</div>
             </template>
           </el-table-column> -->
-          <el-table-column align="center" prop label="预期安排">
+          <el-table-column align="center"
+                           prop
+                           label="预期安排">
             <template slot-scope="scope">
               <div>{{scope.row.expectExercisesNum+'次'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop label="实际安排">
+          <el-table-column align="center"
+                           prop
+                           label="实际安排">
             <template slot-scope="scope">
               <div>{{scope.row.actualExercisesNum+'次'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop label="提交次数">
+          <el-table-column align="center"
+                           prop
+                           label="提交次数">
             <template slot-scope="scope">
               <div>{{scope.row.exercisesReplyNum+'次'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop label="评价次数">
+          <el-table-column align="center"
+                           prop
+                           label="评价次数">
             <template slot-scope="scope">
               <div>{{scope.row.exercisesMessageNum+'次'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop label="及时评价次数">
+          <el-table-column align="center"
+                           prop
+                           label="及时评价次数">
             <template slot-scope="scope">
               <div>{{scope.row.exercisesMessageTimelyNum+'次'}}</div>
             </template>
@@ -141,21 +163,21 @@
               <div v-if="scope.row.extracurricularExercises&&scope.row.extracurricularExercises.teacher">{{scope.row.extracurricularExercises.teacher.username}}</div>
             </template>
           </el-table-column>-->
-          <el-table-column align="center" label="操作">
+          <el-table-column align="center"
+                           label="操作">
             <template slot-scope="scope">
               <div v-if="scope.row.actualExercisesNum >0">
-                <el-button type="text" @click="lookDetail(scope.row)">查看</el-button>
+                <el-button type="text"
+                           @click="lookDetail(scope.row)">查看</el-button>
               </div>
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          :total="rules.total"
-          :page.sync="rules.page"
-          :limit.sync="rules.limit"
-          :page-sizes="rules.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
     </div>
   </div>
@@ -179,7 +201,7 @@ nowTime =
   nowTime.getDate();
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       tableList: [],
       searchForm: {
@@ -205,11 +227,11 @@ export default {
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created() {
+  created () {
     // 设置默认为当前周
   },
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
+  mounted () {
     this.searchForm.timer = [];
     this.searchForm.timer.push(this.getNowDateAndMonday(nowTime));
     this.searchForm.timer.push(this.getNowDateAndSunday(nowTime));
@@ -227,17 +249,17 @@ export default {
     // 获取分部  老师
     this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       if (this.$route.query.teacherId) {
         this.searchForm.teacherId = this.$route.query.teacherId * 1;
       }
       this.getList();
     },
-    getDate() {
+    getDate () {
       let obj = {
         search: this.searchForm.search || null,
         actualExercisesNumIsAchieve:
@@ -263,7 +285,7 @@ export default {
       }
       return obj;
     },
-    getList() {
+    getList () {
       let obj = this.getDate();
       if (!obj) return;
       findStudentExtracurricularExercisesSituations(obj).then(res => {
@@ -274,7 +296,7 @@ export default {
       });
     },
 
-    onReSet() {
+    onReSet () {
       this.searchForm = {
         timer: [],
         search: null,
@@ -288,7 +310,7 @@ export default {
       this.search();
     },
 
-    onExport() {
+    onExport () {
       let url = "/api-web/export/exercisesSituations";
       let obj = this.getDate();
       const options = {
@@ -350,13 +372,13 @@ export default {
               load.endLoading();
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    getNowDateAndMonday(time) {
+    getNowDateAndMonday (time) {
       let timestamp = new Date(time.replace(/-/g, "/")).getTime();
       let serverDate = new Date(time);
       if (serverDate.getDay() == 0) {
@@ -382,7 +404,7 @@ export default {
       let str = mondayY + "-" + mondayM + "-" + mondayD;
       return str;
     },
-    getNowDateAndSunday(time) {
+    getNowDateAndSunday (time) {
       let timestamp = new Date(time.replace(/-/g, "/")).getTime();
       let serverDate = new Date(time);
 
@@ -406,7 +428,7 @@ export default {
       let str = tomorrowY + "-" + tomorrowM + "-" + tomorrowD;
       return str;
     },
-    getWeekTime(val) {
+    getWeekTime (val) {
       if (val && val.length > 0) {
         let start = this.getNowDateAndMonday(val[0]);
         let end = this.getNowDateAndSunday(val[1]);
@@ -414,7 +436,7 @@ export default {
         this.searchForm.timer.splice(1, 1, end);
       }
     },
-    lookDetail(row) {
+    lookDetail (row) {
       // this.afterSchoolVisible = true;
 
       let rules = JSON.stringify(this.rules);

src/views/afterSchoolManager/index.vue

@@ -55,7 +55,7 @@ export default {
         : this.activeIndex;
 
     },
-    handleClick (val, event) { 
+    handleClick (val, event) {
       this.activeIndex = val.name
       this.activeStatus[val.name - 1] = true
     }

src/views/app/entryActivities.vue

@@ -1,11 +1,14 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>时间充值活动</h2>
+    <h2>
+      <div class="squrt"></div>时间充值活动
+    </h2>
     <div class="m-core">
       <div @click="onChargeOperation('create')"
            v-permission="'/entryOperation'"
            class='newBand'>添加</div>
-      <el-form :inline="true" :model="searchForm">
+      <el-form :inline="true"
+               :model="searchForm">
         <!-- <el-form-item>
           <el-select placeholder="请选择适用范围">
             <el-option value="NEW" label="新用户"></el-option>
@@ -13,26 +16,34 @@
           </el-select>
         </el-form-item> -->
         <el-form-item>
-          <el-select v-model="searchForm.delFlag" clearable placeholder="请选择活动状态">
-            <el-option value="false" label="启用"></el-option>
-            <el-option value="true" label="停止"></el-option>
+          <el-select v-model="searchForm.delFlag"
+                     clearable
+                     placeholder="请选择活动状态">
+            <el-option value="false"
+                       label="启用"></el-option>
+            <el-option value="true"
+                       label="停止"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item >
-          <el-button type="danger" @click="getList">搜索</el-button>
+        <el-form-item>
+          <el-button type="danger"
+                     @click="getList">搜索</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
         <el-table :data="dataList"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column  align="center" prop="id"
+          <el-table-column align="center"
+                           prop="id"
                            label="活动编号">
           </el-table-column>
-          <el-table-column  align="center" prop="name"
+          <el-table-column align="center"
+                           prop="name"
                            label="活动名称">
           </el-table-column>
-          <el-table-column  align="center" label="适用范围">
-                           <!-- NEW("NEW", "新手"), ALL("ALL", "全部"); -->
+          <el-table-column align="center"
+                           label="适用范围">
+            <!-- NEW("NEW", "新手"), ALL("ALL", "全部"); -->
             <template slot-scope="scope">
               {{ scope.row.suitableUser == 'NEW' ? '新用户' : ''  }}
               {{ scope.row.suitableUser == 'ALL' ? '全部' : ''  }}
@@ -41,32 +52,39 @@
           <!-- <el-table-column  align="center" prop="tag"
                            label="活动类型">
           </el-table-column> -->
-          <el-table-column  align="center" label="有效期" width="225px">
+          <el-table-column align="center"
+                           label="有效期"
+                           width="225px">
             <template slot-scope="scope">
               开始时间：{{ scope.row.startDate }} <br /> 结束时间：{{ scope.row.endDate }}
             </template>
           </el-table-column>
-          <el-table-column  align="center" label="价格/元">
+          <el-table-column align="center"
+                           label="价格/元">
             <template slot-scope="scope">
               原价：{{ scope.row.totalPrice }}元 <br /> 折扣价：{{ scope.row.discountPrice ? scope.row.discountPrice : 0 }}元
             </template>
           </el-table-column>
-          <el-table-column  align="center" label="时间/分钟">
+          <el-table-column align="center"
+                           label="时间/分钟">
             <template slot-scope="scope">
               购买：{{ scope.row.purchaseMinutes }}分钟 <br /> 赠送：{{ scope.row.giveMinutes ? scope.row.giveMinutes : 0 }}分钟
             </template>
           </el-table-column>
-          <el-table-column  align="center"
+          <el-table-column align="center"
                            label="活动状态">
             <template slot-scope="scope">
               {{ scope.row.delFlag ? '停用' : '启用' }}
             </template>
           </el-table-column>
-          <el-table-column  align="center"
+          <el-table-column align="center"
                            label="操作">
             <template slot-scope="scope">
-              <el-button type="text" v-permission="'/entryOperationLook'" @click="onChargeOperation('look', scope.row)">查看</el-button>
-              <el-button v-permission="'tenantEntryActivities/updateDelFlag'" @click="onChargeOperation('update', scope.row)"
+              <el-button type="text"
+                         v-permission="'/entryOperationLook'"
+                         @click="onChargeOperation('look', scope.row)">查看</el-button>
+              <el-button v-permission="'tenantEntryActivities/updateDelFlag'"
+                         @click="onChargeOperation('update', scope.row)"
                          type="text">{{ scope.row.delFlag ? '启用' : '停用' }}</el-button>
             </template>
           </el-table-column>
@@ -131,16 +149,16 @@ export default {
             this.messageTips(tempString, res)
           })
         }).catch(() => {
-               
+
         })
-      } else if(type == 'create') {
+      } else if (type == 'create') {
         this.$router.push({
           path: '/insideSetting/entryOperation',
           query: {
             type: 'create'
           }
         })
-      } else if(type == 'look') {
+      } else if (type == 'look') {
         this.$router.push({
           path: '/insideSetting/entryOperation',
           query: {

src/views/app/suggestion.vue

@@ -1,34 +1,45 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>意见反馈管理</h2>
+    <h2>
+      <div class="squrt"></div>意见反馈管理
+    </h2>
     <div class="m-core">
       <div class="tableWrap">
         <el-table :data="dataList"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          
-          <el-table-column align="center" label="反馈时间" prop="createTime">
+
+          <el-table-column align="center"
+                           label="反馈时间"
+                           prop="createTime">
             <template slot-scope="scope">
               {{scope.row.createTime | dateForMinFormat}}
             </template>
           </el-table-column>
           <!-- <el-table-column align="center" prop="name" label="标题"> -->
           <!-- </el-table-column> -->
-          <el-table-column align="center" label="内容" prop="content">
-              <template slot-scope="scope">
-                <el-popover
-                    placement="top-start"
-                    width="300"
-                    trigger="hover"
-                    :content="scope.row.content">
-                    <span slot="reference">{{ scope.row.content }}</span>
-                </el-popover>
-                  <!-- <div :title="scope.row.content">{{ scope.row.content }}</div> -->
-              </template>
+          <el-table-column align="center"
+                           label="内容"
+                           prop="content">
+            <template slot-scope="scope">
+              <el-popover placement="top-start"
+                          width="300"
+                          trigger="hover"
+                          :content="scope.row.content">
+                <span slot="reference">{{ scope.row.content }}</span>
+              </el-popover>
+              <!-- <div :title="scope.row.content">{{ scope.row.content }}</div> -->
+            </template>
           </el-table-column>
-          <el-table-column align="center" label="用户" prop="username"></el-table-column>
-          <el-table-column align="center" prop="mobileNo" label="邮箱或手机号">
+          <el-table-column align="center"
+                           label="用户"
+                           prop="username"></el-table-column>
+          <el-table-column align="center"
+                           prop="mobileNo"
+                           label="邮箱或手机号">
           </el-table-column>
-          <el-table-column align="center" label="客户端" prop="clientType"></el-table-column>
+          <el-table-column align="center"
+                           label="客户端"
+                           prop="clientType"></el-table-column>
           <!-- <el-table-column align="center"
                            label="操作">
             <template slot-scope="scope">
@@ -101,11 +112,11 @@ export default {
   }
 }
 /deep/.el-table .cell {
-    display: -webkit-box;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
 }
 /deep/.el-date-editor.el-input {
   width: 100% !important;

src/views/buildVip/index.vue

@@ -604,7 +604,7 @@ export default {
     //     }
     //   });
     // }
-    this.init();
+    // this.init();
   },
   mounted () {
     // 获取所有老师的接口  根据声部id获取老师
@@ -615,6 +615,12 @@ export default {
     //     this.studentList = res.data.rows
     //   }
     // })
+    Object.assign(this.$data, this.$options.data());
+    setTimeout(() => {
+      this.$refs["leftForm"].resetFields();
+    }, 100);
+    this.init();
+
   },
   activated () {
     Object.assign(this.$data, this.$options.data());

src/views/businessManager/shopManager/shopOperation.vue

@@ -1,39 +1,65 @@
 <template>
   <div class="m-container">
     <h2>
-      <el-page-header @back="onCancel" :content="(pageType == 'create' ? '添加' : '修改') + '商品'"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="(pageType == 'create' ? '添加' : '修改') + '商品'"></el-page-header>
     </h2>
 
     <div class="m-core">
-      <el-form :model="form" :rules="rules" ref="form" label-width="120px">
-        <el-form-item label="货号" prop="sn">
-          <el-input v-model.trim="form.sn" placeholder="请输入货号" style="width: 400px"></el-input>
+      <el-form :model="form"
+               :rules="rules"
+               ref="form"
+               label-width="120px">
+        <el-form-item label="货号"
+                      prop="sn">
+          <el-input v-model.trim="form.sn"
+                    placeholder="请输入货号"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="品牌" prop="brand">
-          <el-input v-model.trim="form.brand" placeholder="请输入品牌" style="width: 400px"></el-input>
+        <el-form-item label="品牌"
+                      prop="brand">
+          <el-input v-model.trim="form.brand"
+                    placeholder="请输入品牌"
+                    style="width: 400px"></el-input>
         </el-form-item>
         <!-- <el-form-item label="备查货号" prop="supplyChannel" v-if="pageType == 'create'">
           <el-input v-model.trim="form.supplyChannel" placeholder="请输入备查货号" style="width: 400px"></el-input>
         </el-form-item> -->
-        <el-form-item label="商品名称" prop="name">
-          <el-input v-model.trim="form.name" placeholder="请输入商品名称" style="width: 400px"></el-input>
+        <el-form-item label="商品名称"
+                      prop="name">
+          <el-input v-model.trim="form.name"
+                    placeholder="请输入商品名称"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="商品类型" prop="type">
-          <el-select v-model.trim="form.type" placeholder="请选择商品类型" style="width: 400px !important;">
+        <el-form-item label="商品类型"
+                      prop="type">
+          <el-select v-model.trim="form.type"
+                     placeholder="请选择商品类型"
+                     style="width: 400px !important;">
             <el-option v-for="(item, index) in goodsType"
                        :key="index"
                        :label="item.label"
                        :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品分类" prop="goodsCategoryId">
-          <el-select v-model.trim="form.goodsCategoryId" placeholder="请选择商品分类" style="width: 400px !important;" filterable>
-            <el-option v-for="item in categoryList" :key="item.value" :label="item.label" :value="item.value">
+        <el-form-item label="商品分类"
+                      prop="goodsCategoryId">
+          <el-select v-model.trim="form.goodsCategoryId"
+                     placeholder="请选择商品分类"
+                     style="width: 400px !important;"
+                     filterable>
+            <el-option v-for="item in categoryList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品型号" prop="specification">
-          <el-input v-model.trim="form.specification" placeholder="请输入商品型号" style="width: 400px"></el-input>
+        <el-form-item label="商品型号"
+                      prop="specification">
+          <el-input v-model.trim="form.specification"
+                    placeholder="请输入商品型号"
+                    style="width: 400px"></el-input>
         </el-form-item>
         <!-- <el-form-item label="内部库存" prop="stockCount">
           <el-input type="number" :disabled="pageType != 'create'" v-model.trim="form.stockCount" placeholder="请输入内部库存" style="width: 400px"></el-input>
@@ -41,50 +67,94 @@
         <el-form-item label="税务库存" prop="taxStockCount">
           <el-input type="number" :disabled="pageType != 'create'" v-model.trim="form.taxStockCount" placeholder="请输入税务库存" style="width: 400px"></el-input>
         </el-form-item> -->
-        <el-form-item label="库存类型" prop="stockType">
-          <el-select v-model="form.stockType" placeholder="请选择库存类型" style="width: 400px !important;">
+        <el-form-item label="库存类型"
+                      prop="stockType">
+          <el-select v-model="form.stockType"
+                     placeholder="请选择库存类型"
+                     style="width: 400px !important;">
             <el-option v-for="(item, index) in stockType"
                        :key="index"
                        :label="item.label"
                        :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="市场价" prop="marketPrice">
-          <el-input type="number" placeholder="请输入市场价" @mousewheel.native.prevent v-model.trim="form.marketPrice" style="width: 400px"></el-input>
+        <el-form-item label="市场价"
+                      prop="marketPrice">
+          <el-input type="number"
+                    placeholder="请输入市场价"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.marketPrice"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="零售价" prop="discountPrice">
-          <el-input type="number" placeholder="请输入零售价" @mousewheel.native.prevent v-model.trim="form.discountPrice" style="width: 400px"></el-input>
+        <el-form-item label="零售价"
+                      prop="discountPrice">
+          <el-input type="number"
+                    placeholder="请输入零售价"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.discountPrice"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="商品团购价" prop="groupPurchasePrice">
-          <el-input type="number" placeholder="请输入商品团购价" @mousewheel.native.prevent v-model.trim="form.groupPurchasePrice" style="width: 400px"></el-input>
+        <el-form-item label="商品团购价"
+                      prop="groupPurchasePrice">
+          <el-input type="number"
+                    placeholder="请输入商品团购价"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.groupPurchasePrice"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="是否APP展示" prop="clientShow">
-          <el-select v-model="form.clientShow" placeholder="请选择是否APP展示" style="width: 400px !important;">
-            <el-option label="是" :value="1"></el-option>
-            <el-option label="否" :value="0"></el-option>
+        <el-form-item label="是否APP展示"
+                      prop="clientShow">
+          <el-select v-model="form.clientShow"
+                     placeholder="请选择是否APP展示"
+                     style="width: 400px !important;">
+            <el-option label="是"
+                       :value="1"></el-option>
+            <el-option label="否"
+                       :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否库存预警" prop="stockWarning">
-          <el-select v-model="form.stockWarning" placeholder="请选择库存预警" style="width: 400px !important;">
-            <el-option label="是" :value="1"></el-option>
-            <el-option label="否" :value="0"></el-option>
+        <el-form-item label="是否库存预警"
+                      prop="stockWarning">
+          <el-select v-model="form.stockWarning"
+                     placeholder="请选择库存预警"
+                     style="width: 400px !important;">
+            <el-option label="是"
+                       :value="1"></el-option>
+            <el-option label="否"
+                       :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品图片" prop="image">
-          <el-upload class="avatar-uploader" action="/api-web/uploadFile" accept=".jpg, .jpeg, .png" :headers="headers"
-            :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
-            <img v-if="form.image" :src="form.image" class="avatar">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        <el-form-item label="商品图片"
+                      prop="image">
+          <el-upload class="avatar-uploader"
+                     action="/api-web/uploadFile"
+                     accept=".jpg, .jpeg, .png"
+                     :headers="headers"
+                     :show-file-list="false"
+                     :on-success="handleAvatarSuccess"
+                     :before-upload="beforeAvatarUpload">
+            <img v-if="form.image"
+                 :src="form.image"
+                 class="avatar">
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="商品描述" prop="brief">
-          <el-input type="textarea" v-model.trim="form.brief" style="width: 400px"></el-input>
+        <el-form-item label="商品描述"
+                      prop="brief">
+          <el-input type="textarea"
+                    v-model.trim="form.brief"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="商品详情" prop="desc">
-		      <el-input type="textarea" v-model.trim="form.desc" style="width: 400px"></el-input>
+        <el-form-item label="商品详情"
+                      prop="desc">
+          <el-input type="textarea"
+                    v-model.trim="form.desc"
+                    style="width: 400px"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="onSubmit('form')" type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+          <el-button @click="onSubmit('form')"
+                     type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
           <el-button @click="onReSet('form')">重置</el-button>
         </el-form-item>
       </el-form>
@@ -92,48 +162,244 @@
   </div>
 </template>
 <script>
-  import {
-    categoryListTree,
-    goodsAdd,
-    goodsUpdate,
-    goodsSingleQuery
-  } from '@/api/businessManager'
-  import {
-    getToken
-  } from '@/utils/auth'
-  import { goodsType, stockType } from '@/utils/searchArray'
-  let validPrice = (rule, value, callback) => {
-    if (value == '' && typeof value == 'string' || value == null) {
-      callback(new Error('请输入金额'))
-    } else if (value < 0) {
-      callback(new Error('输入金额必须大于或等于0'))
-    } else if (value >= 100000) {
-      callback(new Error('输入金额必须小于100000'))
-    } else {
-      callback()
-    }
+import {
+  categoryListTree,
+  goodsAdd,
+  goodsUpdate,
+  goodsSingleQuery
+} from '@/api/businessManager'
+import {
+  getToken
+} from '@/utils/auth'
+import { goodsType, stockType } from '@/utils/searchArray'
+let validPrice = (rule, value, callback) => {
+  if (value == '' && typeof value == 'string' || value == null) {
+    callback(new Error('请输入金额'))
+  } else if (value < 0) {
+    callback(new Error('输入金额必须大于或等于0'))
+  } else if (value >= 100000) {
+    callback(new Error('输入金额必须小于100000'))
+  } else {
+    callback()
   }
-  let validStock = (rule, value, callback) => {
-    if(value == '' && typeof value == 'string' || value == null) {
-      callback(new Error('请输入库存'))
-    } else if(value < 0) {
-      callback(new Error('库存数量必须大于或等于0'))
-    } else {
-      callback()
-    }
+}
+let validStock = (rule, value, callback) => {
+  if (value == '' && typeof value == 'string' || value == null) {
+    callback(new Error('请输入库存'))
+  } else if (value < 0) {
+    callback(new Error('库存数量必须大于或等于0'))
+  } else {
+    callback()
   }
-  export default {
-    name: 'shopOperation',
-    data() {
-      return {
-        goodsType: goodsType,
-        stockType: stockType,
-        categoryList: [],
-        pageType: null,
-        headers: {
-          Authorization: getToken()
+}
+export default {
+  name: 'shopOperation',
+  data () {
+    return {
+      goodsType: goodsType,
+      stockType: stockType,
+      categoryList: [],
+      pageType: null,
+      headers: {
+        Authorization: getToken()
+      },
+      form: {
+        sn: null,
+        brand: null,
+        supplyChannel: null,
+        name: null,
+        type: null,
+        goodsCategoryId: null,
+        specification: null,
+        stockCount: null,
+        taxStockCount: null,
+        stockType: null,
+        marketPrice: null,
+        discountPrice: null,
+        groupPurchasePrice: null,
+        clientShow: null,
+        stockWarning: null,
+        image: null,
+        brief: null,
+        desc: null
+      },
+      rules: {
+        sn: [{ required: true, message: '请输入商品货号', trigger: 'blur' }],
+        brand: [{
+          required: true,
+          message: '请输入品牌',
+          trigger: 'blur'
+        },
+        {
+          min: 2,
+          max: 30,
+          message: '长度在 2 到 30 个字符',
+          trigger: 'blur'
+        }
+        ],
+        supplyChannel: [
+          { required: true, message: '请输入备查货号', trigger: 'blur' }
+        ],
+        name: [{
+          required: true,
+          message: '请输入商品名称',
+          trigger: 'blur'
         },
-        form: {
+        {
+          min: 2,
+          max: 30,
+          message: '长度在 2 到 30 个字符',
+          trigger: 'blur'
+        }
+        ],
+        type: [{
+          required: true,
+          message: '请选择商品分类',
+          trigger: 'change'
+        }],
+        goodsCategoryId: [{
+          required: true,
+          message: '请选择商品类型',
+          trigger: 'change'
+        }],
+        specification: [{
+          required: true,
+          message: '请输入商品型号',
+          trigger: 'blur'
+        },
+        {
+          min: 2,
+          max: 30,
+          message: '长度在 2 到 30 个字符',
+          trigger: 'blur'
+        }
+        ],
+        stockCount: [
+          { required: true, validator: validStock, trigger: 'blur' }
+        ],
+        taxStockCount: [
+          { required: true, validator: validStock, trigger: 'blur' }
+        ],
+        stockType: [
+          { required: true, message: '请选择库存类型', trigger: 'change' }
+        ],
+        marketPrice: [{
+          required: true,
+          validator: validPrice,
+          trigger: 'blur'
+        }],
+        discountPrice: [{
+          required: true,
+          validator: validPrice,
+          trigger: 'blur'
+        }],
+        groupPurchasePrice: [{
+          required: true,
+          validator: validPrice,
+          trigger: 'blur'
+        }],
+        clientShow: [
+          { required: true, message: '请选择是否APP展示', trigger: 'change' }
+        ],
+        stockWarning: [
+          { required: true, message: '请选择是否库存预警', trigger: 'change' }
+        ],
+        image: [{
+          required: true,
+          message: '请选择图片',
+          trigger: 'blur'
+        }],
+        brief: [{
+          required: true,
+          message: '请输入商品描述',
+          trigger: 'blur'
+        }],
+        desc: [{
+          required: true,
+          message: '请输入商品详情',
+          trigger: 'blur'
+        }]
+      },
+      Fsearch: null,
+      Frules: null
+    }
+  },
+  created () {
+    this.init()
+  },
+  activated () {
+    this.init()
+  },
+  mounted () {
+
+  },
+  methods: {
+    init () {
+      let query = this.$route.query
+      if (query.paramInfo) {
+        let paramInfo = JSON.parse(query.paramInfo)
+        this.pageType = paramInfo.type
+        this.id = paramInfo.id
+      }
+      if (query.search) {
+        this.Fsearch = query.search;
+      }
+      if (query.pageInfo) {
+        this.Frules = query.pageInfo
+      }
+      this.getList()
+      this.getCatagory()
+    },
+    onSubmit (formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.pageType == 'create') {
+            if (this.form.id) { // 判断有没有Id，如果有则删除
+              delete this.form.id
+            }
+            this.form.status = 'NO' // 默认上架
+            goodsAdd(this.form).then(res => {
+              this.messageTips('添加', res)
+            })
+          } else if (this.pageType == 'update') {
+            goodsUpdate(this.form).then(res => {
+              this.messageTips('修改', res)
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    messageTips (title, res) {
+      if (res.code == 200) {
+        this.$message.success(title + '成功')
+        this.$router.push({
+          path: '/shopManager/shopManager',
+          query: {
+            pageInfo: this.Frules,
+            searchForm: this.Fsearch
+          }
+        })
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    onCancel () {
+      this.$router.push({
+        path: '/shopManager/shopManager',
+        query: {
+          pageInfo: this.Frules,
+          searchForm: this.Fsearch
+        }
+      })
+    },
+    onReSet (formName) {
+      this.$refs[formName].resetFields()
+    },
+    getList () {
+      if (this.pageType == 'create') {
+        this.form = {
           sn: null,
           brand: null,
           supplyChannel: null,
@@ -152,338 +418,142 @@
           image: null,
           brief: null,
           desc: null
-        },
-        rules: {
-          sn: [{ required: true, message: '请输入商品货号', trigger: 'blur' }],
-          brand: [{
-              required: true,
-              message: '请输入品牌',
-              trigger: 'blur'
-            },
-            {
-              min: 2,
-              max: 30,
-              message: '长度在 2 到 30 个字符',
-              trigger: 'blur'
-            }
-          ],
-          supplyChannel: [
-            {required: true, message:'请输入备查货号', trigger: 'blur'}
-          ],
-          name: [{
-              required: true,
-              message: '请输入商品名称',
-              trigger: 'blur'
-            },
-            {
-              min: 2,
-              max: 30,
-              message: '长度在 2 到 30 个字符',
-              trigger: 'blur'
-            }
-          ],
-          type: [{
-            required: true,
-            message: '请选择商品分类',
-            trigger: 'change'
-          }],
-          goodsCategoryId: [{
-            required: true,
-            message: '请选择商品类型',
-            trigger: 'change'
-          }],
-          specification: [{
-              required: true,
-              message: '请输入商品型号',
-              trigger: 'blur'
-            },
-            {
-              min: 2,
-              max: 30,
-              message: '长度在 2 到 30 个字符',
-              trigger: 'blur'
-            }
-          ],
-          stockCount: [
-            {required: true, validator: validStock, trigger: 'blur'}
-          ],
-          taxStockCount: [
-            {required: true, validator: validStock, trigger: 'blur'}
-          ],
-          stockType: [
-            {required: true, message: '请选择库存类型', trigger: 'change' }
-          ],
-          marketPrice: [{
-            required: true,
-            validator: validPrice,
-            trigger: 'blur'
-          }],
-          discountPrice: [{
-            required: true,
-            validator: validPrice,
-            trigger: 'blur'
-          }],
-          groupPurchasePrice: [{
-            required: true,
-            validator: validPrice,
-            trigger: 'blur'
-          }],
-          clientShow: [
-            {required: true, message: '请选择是否APP展示', trigger: 'change' }
-          ],
-          stockWarning: [
-            {required: true, message: '请选择是否库存预警', trigger: 'change' }
-          ],
-          image: [{
-            required: true,
-            message: '请选择图片',
-            trigger: 'blur'
-          }],
-          brief: [{
-            required: true,
-            message: '请输入商品描述',
-            trigger: 'blur'
-          }],
-          desc: [{
-            required: true,
-            message: '请输入商品详情',
-            trigger: 'blur'
-          }]
-        },
-        Fsearch: null,
-        Frules: null
-      }
-    },
-    created() {
-      this.init()
-    },
-    activated() {
-      this.init()
-    },
-    mounted() {
-
-    },
-    methods: {
-      init() {
-        let query = this.$route.query
-        if (query.paramInfo) {
-          let paramInfo = JSON.parse(query.paramInfo)
-          this.pageType = paramInfo.type
-          this.id = paramInfo.id
         }
-        if (query.search) {
-          this.Fsearch = query.search;
+        if (this.$refs['form']) {
+          this.$refs['form'].resetFields();
         }
-        if (query.pageInfo) {
-          this.Frules = query.pageInfo
-        }
-        this.getList()
-        this.getCatagory()
-      },
-      onSubmit(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            if (this.pageType == 'create') {
-              if (this.form.id) { // 判断有没有Id，如果有则删除
-                delete this.form.id
-              }
-              this.form.status = 'NO' // 默认上架
-              goodsAdd(this.form).then(res => {
-                this.messageTips('添加', res)
-              })
-            } else if (this.pageType == 'update') {
-              goodsUpdate(this.form).then(res => {
-                this.messageTips('修改', res)
-              })
-            }
-          } else {
-            return false
-          }
-        })
-      },
-      messageTips(title, res) {
-        if (res.code == 200) {
-          this.$message.success(title + '成功')
-          this.$router.push({
-            path: '/shopManager/shopManager',
-            query: {
-              pageInfo: this.Frules,
-              searchForm: this.Fsearch
+
+      } else {
+        goodsSingleQuery(this.id).then(res => {
+          if (res.code == 200) {
+            let result = res.data
+            this.form = {
+              id: result.id,
+              sn: result.sn,
+              brand: result.brand,
+              supplyChannel: result.supplyChannel,
+              name: result.name,
+              type: result.type,
+              goodsCategoryId: result.goodsCategoryId,
+              specification: result.specification,
+              stockCount: result.stockCount,
+              taxStockCount: result.taxStockCount,
+              stockType: result.stockType,
+              marketPrice: result.marketPrice,
+              discountPrice: result.discountPrice,
+              groupPurchasePrice: result.groupPurchasePrice,
+              clientShow: result.clientShow,
+              stockWarning: result.stockWarning,
+              image: result.image,
+              brief: result.brief,
+              desc: result.desc
             }
-          })
-        } else {
-          this.$message.error(res.msg)
-        }
-      },
-      onCancel() {
-        this.$router.push({
-          path: '/shopManager/shopManager',
-          query: {
-            pageInfo: this.Frules,
-            searchForm: this.Fsearch
           }
         })
-      },
-      onReSet(formName) {
-        this.$refs[formName].resetFields()
-      },
-      getList() {
-        if (this.pageType == 'create') {
-          this.form = {
-            sn: null,
-            brand: null,
-            supplyChannel: null,
-            name: null,
-            type: null,
-            goodsCategoryId: null,
-            specification: null,
-            stockCount: null,
-            taxStockCount: null,
-            stockType: null,
-            marketPrice: null,
-            discountPrice: null,
-            groupPurchasePrice: null,
-            clientShow: null,
-            stockWarning: null,
-            image: null,
-            brief: null,
-            desc: null
-          }
-          if (this.$refs['form']) {
-            this.$refs['form'].resetFields();
-          }
+      }
 
-        } else {
-          goodsSingleQuery(this.id).then(res => {
-            if (res.code == 200) {
-              let result = res.data
-              this.form = {
-                id: result.id,
-                sn: result.sn,
-                brand: result.brand,
-                supplyChannel: result.supplyChannel,
-                name: result.name,
-                type: result.type,
-                goodsCategoryId: result.goodsCategoryId,
-                specification: result.specification,
-                stockCount: result.stockCount,
-                taxStockCount: result.taxStockCount,
-                stockType: result.stockType,
-                marketPrice: result.marketPrice,
-                discountPrice: result.discountPrice,
-                groupPurchasePrice: result.groupPurchasePrice,
-                clientShow: result.clientShow,
-                stockWarning: result.stockWarning,
-                image: result.image,
-                brief: result.brief,
-                desc: result.desc
-              }
-            }
+    },
+    getCatagory () {
+      categoryListTree({
+        delFlag: 0,
+        rows: 9999
+      }).then(res => {
+        let result = res.data
+        if (res.code == 200) {
+          let tempArray = []
+          result.rows.forEach(row => {
+            tempArray.push({
+              label: row.name,
+              value: row.id
+            })
           })
+          this.categoryList = tempArray
         }
+      })
+    },
+    handleAvatarSuccess (res, file) {
+      this.form.image = res.data.url
 
-      },
-      getCatagory() {
-        categoryListTree({
-          delFlag: 0,
-          rows: 9999
-        }).then(res => {
-          let result = res.data
-          if (res.code == 200) {
-            let tempArray = []
-            result.rows.forEach(row => {
-              tempArray.push({
-                label: row.name,
-                value: row.id
-              })
-            })
-            this.categoryList = tempArray
-          }
-        })
-      },
-      handleAvatarSuccess(res, file) {
-        this.form.image = res.data.url
-
-      },
-      beforeAvatarUpload(file) {
-        const imageType = {
-          'image/png': true,
-          'image/jpeg': true
-        }
-        const isImage = imageType[file.type]
-        const isLt2M = file.size / 1024 / 1024 < 2
+    },
+    beforeAvatarUpload (file) {
+      const imageType = {
+        'image/png': true,
+        'image/jpeg': true
+      }
+      const isImage = imageType[file.type]
+      const isLt2M = file.size / 1024 / 1024 < 2
 
-        if (!isImage) {
-          this.$message.error('只能上传图片格式!')
-        }
-        if (!isLt2M) {
-          this.$message.error('上传头像图片大小不能超过 2MB!')
-        }
-        return isImage && isLt2M;
-      },
-    }
+      if (!isImage) {
+        this.$message.error('只能上传图片格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isImage && isLt2M;
+    },
   }
+}
 </script>
 <style lang="scss" scoped>
-  .el-button--primary {
+.el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
     color: #fff;
-
-    &:hover,
-    &:active,
-    &:focus {
-      background: #14928a;
-      border-color: #14928a;
-      color: #fff;
-    }
   }
+}
 
-  .el-row {
-    margin-top: 40px;
-  }
+.el-row {
+  margin-top: 40px;
+}
 
-  .el-col {
-    display: flex;
-    align-items: center;
-    margin-bottom: 20px;
-    justify-content: flex-end;
-    margin-right: 50%;
-  }
+.el-col {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  justify-content: flex-end;
+  margin-right: 50%;
+}
 
-  .el-input-group {
-    width: 200px;
-    margin: 0 20px;
-  }
+.el-input-group {
+  width: 200px;
+  margin: 0 20px;
+}
 
-  /deep/.el-tree-node__content {
-    height: 40px !important;
-  }
+/deep/.el-tree-node__content {
+  height: 40px !important;
+}
 
-  /deep/.avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
+/deep/.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
 
-  .avatar-uploader .el-upload:hover {
-    border-color: #409eff;
-  }
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
 
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 120px;
-    height: 120px;
-    line-height: 120px;
-    text-align: center;
-  }
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 120px;
+  height: 120px;
+  line-height: 120px;
+  text-align: center;
+}
 
-  .avatar {
-    width: 120px;
-    height: 120px;
-    display: block;
-  }
+.avatar {
+  width: 120px;
+  height: 120px;
+  display: block;
+}
 </style>

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -76,7 +76,7 @@ export default {
     }
   },
   mounted () {
-      this.onReSet()
+    this.onReSet()
     this.init()
   },
   activated () {
@@ -131,7 +131,7 @@ export default {
       let tempData = []
       if (silderList.code == 200) {
         tempData = this.setTableData(silderList.data)
-        
+
         this.data = tempData
       }
       // console.log(this.pageType)

src/views/categroyManager/insideSetting/branchActive.vue

@@ -142,12 +142,14 @@ export default {
       this.$route.query.rules instanceof Object ? this.pageInfo = this.$route.query.rules : this.pageInfo = JSON.parse(this.$route.query.rules);
     }
   },
-  activated() {
+  activated () {
     this.getList()
+    this.__init()
   },
   mounted () {
     this.getList() // 获取列表数据
     this.__init()
+
   },
   methods: {
     async __init () {

src/views/contentManager/components/activity.vue

@@ -1,61 +1,84 @@
 <template>
   <div>
     <!-- 搜索标题 -->
-    <div @click="openTeaching('create')" class="newBand">新建</div>
+    <div @click="openTeaching('create')"
+         class="newBand">新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" label="轮播图">
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center"
+                         label="轮播图">
           <template slot-scope="scope">
-            <img class="bannerImg" :src="scope.row.coverImage" alt />
+            <img class="bannerImg"
+                 :src="scope.row.coverImage"
+                 alt />
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="title" label="标题"></el-table-column>
-        <el-table-column align="center" label="跳转连接">
+        <el-table-column align="center"
+                         prop="title"
+                         label="标题"></el-table-column>
+        <el-table-column align="center"
+                         label="跳转连接">
           <template slot-scope="scope">{{ scope.row.linkUrl + '/' + scope.row.id }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="remark" label="是否使用">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="是否使用">
           <template slot-scope="scope">{{ scope.row.status == 1 ? '是' : '否' }}</template>
         </el-table-column>
-        
-        <el-table-column align="center" prop="order" label="排序"></el-table-column>
-        <el-table-column align="center" prop="remark" label="适用范围">
+
+        <el-table-column align="center"
+                         prop="order"
+                         label="排序"></el-table-column>
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
-            <p v-if=" scope.row.tenantId == 2">对外</p> 
+            <p v-if=" scope.row.tenantId == 2">对外</p>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作">
+        <el-table-column align="center"
+                         label="操作">
           <template slot-scope="scope">
-            <el-button @click="openTeaching('update', scope.row)" type="text">修改</el-button>
-            <el-button v-if="scope.row.status == 1" @click="onStop(scope.row, 0)" type="text">停用</el-button>
-            <el-button v-else @click="onStop(scope.row, 1)" type="text">启用</el-button>
-            <el-button @click="onDel(scope.row)" type="text">删除</el-button>
+            <el-button @click="openTeaching('update', scope.row)"
+                       type="text">修改</el-button>
+            <el-button v-if="scope.row.status == 1"
+                       @click="onStop(scope.row, 0)"
+                       type="text">停用</el-button>
+            <el-button v-else
+                       @click="onStop(scope.row, 1)"
+                       type="text">启用</el-button>
+            <el-button @click="onDel(scope.row)"
+                       type="text">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -68,7 +91,7 @@ export default {
   components: {
     pagination
   },
-  data() {
+  data () {
     return {
       searchForm: {
         tenantId: '1'
@@ -85,14 +108,14 @@ export default {
       }
     };
   },
-  activated() {
+  activated () {
     this.getList();
   },
-  mounted() {
+  mounted () {
     this.getList();
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         clientName: 'manage',
         tenantId: this.searchForm.tenantId,
@@ -107,7 +130,7 @@ export default {
         }
       });
     },
-    openTeaching(type, rows) {
+    openTeaching (type, rows) {
       let params = {};
       if (type == "update") {
         params.id = rows.id;
@@ -119,7 +142,7 @@ export default {
         query: params
       });
     },
-    onDel(row) {
+    onDel (row) {
       // 删除
       this.$confirm("确定是否删除?", "提示", {
         confirmButtonText: "确定",
@@ -136,9 +159,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    onStop(row, status) {
+    onStop (row, status) {
       // 停止
       // newsUpdate
       let tempStr = ["停用", "启用"];

src/views/contentManager/components/advert.vue

@@ -1,67 +1,90 @@
 <template>
   <div>
     <!-- 搜索标题 -->
-    <div @click="openTeaching('create')" class="newBand">新建</div>
+    <div @click="openTeaching('create')"
+         class="newBand">新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" label="广告图">
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center"
+                         label="广告图">
           <template slot-scope="scope">
-            <img class="bannerImg" :src="scope.row.videoCoverImage || scope.row.coverImage" alt />
+            <img class="bannerImg"
+                 :src="scope.row.videoCoverImage || scope.row.coverImage"
+                 alt />
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="title" label="标题"></el-table-column>
-        <el-table-column align="center" label="跳转连接">
+        <el-table-column align="center"
+                         prop="title"
+                         label="标题"></el-table-column>
+        <el-table-column align="center"
+                         label="跳转连接">
           <template slot-scope="scope">{{ scope.row.linkUrl }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="remark" label="是否使用">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="是否使用">
           <template slot-scope="scope">{{ scope.row.status == 1 ? '是' : '否' }}</template>
         </el-table-column>
         <el-table-column align='center'
                          prop="memo"
                          label="版本号">
-            <template slot-scope="scope">
-              {{ scope.row.memo ? scope.row.memo : '--' }}
-            </template>
+          <template slot-scope="scope">
+            {{ scope.row.memo ? scope.row.memo : '--' }}
+          </template>
         </el-table-column>
-        <el-table-column align="center" prop="order" label="排序"></el-table-column>
-        <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="order"
+                         label="排序"></el-table-column>
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作">
+        <el-table-column align="center"
+                         label="操作">
           <template slot-scope="scope">
-            <el-button @click="openTeaching('update', scope.row)" type="text">修改</el-button>
-            <el-button v-if="scope.row.status == 1" @click="onStop(scope.row, 0)" type="text">停用</el-button>
-            <el-button v-else @click="onStop(scope.row, 1)" type="text">启用</el-button>
-            <el-button @click="onDel(scope.row)" type="text">删除</el-button>
+            <el-button @click="openTeaching('update', scope.row)"
+                       type="text">修改</el-button>
+            <el-button v-if="scope.row.status == 1"
+                       @click="onStop(scope.row, 0)"
+                       type="text">停用</el-button>
+            <el-button v-else
+                       @click="onStop(scope.row, 1)"
+                       type="text">启用</el-button>
+            <el-button @click="onDel(scope.row)"
+                       type="text">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -74,7 +97,7 @@ export default {
   components: {
     pagination
   },
-  data() {
+  data () {
     return {
       searchForm: {
         tenantId: '1'
@@ -91,14 +114,14 @@ export default {
       }
     };
   },
-  activated() {
+  activated () {
     this.getList();
   },
-  mounted() {
+  mounted () {
     this.getList();
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         clientName: 'manage',
         tenantId: this.searchForm.tenantId,
@@ -113,7 +136,7 @@ export default {
         }
       });
     },
-    openTeaching(type, rows) {
+    openTeaching (type, rows) {
       let params = {};
       if (type == "update") {
         params.id = rows.id;
@@ -125,7 +148,7 @@ export default {
         query: params
       });
     },
-    onDel(row) {
+    onDel (row) {
       // 删除
       this.$confirm("确定是否删除?", "提示", {
         confirmButtonText: "确定",
@@ -142,9 +165,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    onStop(row, status) {
+    onStop (row, status) {
       // 停止
       // newsUpdate
       let tempStr = ["停用", "启用"];

src/views/contentManager/components/appPage.vue

@@ -4,18 +4,22 @@
     <div @click="openTeaching('create')"
          class='newBand'>新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
@@ -50,15 +54,17 @@
         <el-table-column align='center'
                          prop="memo"
                          label="版本号">
-            <template slot-scope="scope">
-              {{ scope.row.memo ? scope.row.memo : '--' }}
-            </template>
+          <template slot-scope="scope">
+            {{ scope.row.memo ? scope.row.memo : '--' }}
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          prop="order"
                          label="排序">
         </el-table-column>
-             <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>

src/views/contentManager/components/banner.vue

@@ -4,18 +4,22 @@
     <div @click="openTeaching('create')"
          class='newBand'>新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
@@ -50,15 +54,17 @@
         <el-table-column align='center'
                          prop="memo"
                          label="版本号">
-            <template slot-scope="scope">
-              {{ scope.row.memo ? scope.row.memo : '--' }}
-            </template>
+          <template slot-scope="scope">
+            {{ scope.row.memo ? scope.row.memo : '--' }}
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          prop="order"
                          label="排序">
         </el-table-column>
-             <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>
@@ -68,19 +74,20 @@
                          label="操作">
           <template slot-scope="scope">
             <el-button @click="openTeaching('update', scope.row)"
-                      v-if="!scope.row.memo || permission('banner/copyrightbtn')"
+                       v-if="!scope.row.memo || permission('banner/copyrightbtn')"
                        type="text">修改</el-button>
-                       <div style="display: inline-block" v-if="!scope.row.memo || permission('banner/copyrightbtn')">
-                      <el-button v-if="scope.row.status == 1"
-                       @click="onStop(scope.row, 0)"
-                       type="text">停用</el-button>
-                        <el-button v-else
-                       @click="onStop(scope.row, 1)"
-                       type="text">启用</el-button>
-                       </div>
-            
+            <div style="display: inline-block"
+                 v-if="!scope.row.memo || permission('banner/copyrightbtn')">
+              <el-button v-if="scope.row.status == 1"
+                         @click="onStop(scope.row, 0)"
+                         type="text">停用</el-button>
+              <el-button v-else
+                         @click="onStop(scope.row, 1)"
+                         type="text">启用</el-button>
+            </div>
+
             <el-button @click="onDel(scope.row)"
-                  v-if="!scope.row.memo || permission('banner/copyrightbtn')"
+                       v-if="!scope.row.memo || permission('banner/copyrightbtn')"
                        type="text">删除</el-button>
           </template>
         </el-table-column>

src/views/contentManager/components/flashPage.vue

@@ -4,18 +4,22 @@
     <div @click="openTeaching('create')"
          class='newBand'>新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
@@ -51,7 +55,9 @@
                          prop="order"
                          label="排序">
         </el-table-column>
-             <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>

src/views/contentManager/components/information.vue

@@ -4,18 +4,22 @@
     <div @click="openTeaching('create')"
          class='newBand'>新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
@@ -51,7 +55,9 @@
                          prop="order"
                          label="排序">
         </el-table-column>
-             <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>

src/views/contentManager/components/knowledge.vue

@@ -18,13 +18,19 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-          <el-select v-model="searchForm.subType" clearable placeholder="请选择知识类别">
-            <el-option label="演奏小技巧" :value="1"></el-option>
-            <el-option label="乐理基础" :value="2"></el-option>
-            <el-option label="乐器保养" :value="3"></el-option>
-            <el-option label="乐曲演奏展示" :value="4"></el-option>
-          </el-select>
-        </el-form-item>
+        <el-select v-model="searchForm.subType"
+                   clearable
+                   placeholder="请选择知识类别">
+          <el-option label="演奏小技巧"
+                     :value="1"></el-option>
+          <el-option label="乐理基础"
+                     :value="2"></el-option>
+          <el-option label="乐器保养"
+                     :value="3"></el-option>
+          <el-option label="乐曲演奏展示"
+                     :value="4"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="getList"
                    type="danger">搜索</el-button>
@@ -216,7 +222,7 @@ export default {
     }
   },
   filters: {
-    formatSubType(val) {
+    formatSubType (val) {
       const template = {
         1: '演奏小技巧',
         2: '乐理基础',

src/views/contentManager/components/training.vue

@@ -1,60 +1,83 @@
 <template>
   <div>
     <!-- 搜索标题 -->
-    <div @click="openTeaching('create')" class="newBand">新建</div>
+    <div @click="openTeaching('create')"
+         class="newBand">新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" label="轮播图">
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center"
+                         label="轮播图">
           <template slot-scope="scope">
-            <img class="bannerImg" :src="scope.row.coverImage" alt />
+            <img class="bannerImg"
+                 :src="scope.row.coverImage"
+                 alt />
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="title" label="标题"></el-table-column>
-        <el-table-column align="center" label="跳转连接">
+        <el-table-column align="center"
+                         prop="title"
+                         label="标题"></el-table-column>
+        <el-table-column align="center"
+                         label="跳转连接">
           <template slot-scope="scope">{{ scope.row.linkUrl + '/' + scope.row.id }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="remark" label="是否使用">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="是否使用">
           <template slot-scope="scope">{{ scope.row.status == 1 ? '是' : '否' }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="order" label="排序"></el-table-column>
-        <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="order"
+                         label="排序"></el-table-column>
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作">
+        <el-table-column align="center"
+                         label="操作">
           <template slot-scope="scope">
-            <el-button @click="openTeaching('update', scope.row)" type="text">修改</el-button>
-            <el-button v-if="scope.row.status == 1" @click="onStop(scope.row, 0)" type="text">停用</el-button>
-            <el-button v-else @click="onStop(scope.row, 1)" type="text">启用</el-button>
-            <el-button @click="onDel(scope.row)" type="text">删除</el-button>
+            <el-button @click="openTeaching('update', scope.row)"
+                       type="text">修改</el-button>
+            <el-button v-if="scope.row.status == 1"
+                       @click="onStop(scope.row, 0)"
+                       type="text">停用</el-button>
+            <el-button v-else
+                       @click="onStop(scope.row, 1)"
+                       type="text">启用</el-button>
+            <el-button @click="onDel(scope.row)"
+                       type="text">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -67,7 +90,7 @@ export default {
   components: {
     pagination
   },
-  data() {
+  data () {
     return {
       searchForm: {
         tenantId: '1'
@@ -84,14 +107,14 @@ export default {
       }
     };
   },
-  activated() {
+  activated () {
     this.getList();
   },
-  mounted() {
+  mounted () {
     this.getList();
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         clientName: 'manage',
         tenantId: this.searchForm.tenantId,
@@ -106,7 +129,7 @@ export default {
         }
       });
     },
-    openTeaching(type, rows) {
+    openTeaching (type, rows) {
       let params = {};
       if (type == "update") {
         params.id = rows.id;
@@ -118,7 +141,7 @@ export default {
         query: params
       });
     },
-    onDel(row) {
+    onDel (row) {
       // 删除
       this.$confirm("确定是否删除?", "提示", {
         confirmButtonText: "确定",
@@ -135,9 +158,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    onStop(row, status) {
+    onStop (row, status) {
       // 停止
       // newsUpdate
       let tempStr = ["停用", "启用"];