Merge branch 'online' of http://git.dayaedu.com/molingzhide/dy-admin-manager into online

dist/static/css/chunk-7e7e8090.4d83ad24.css → dist/static/css/chunk-02b86e57.1a280cf5.css

@@ -1 +1 @@
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}[data-v-2fadebcc] .demo-table-expand .el-form-item{margin-right:0;margin-bottom:0;width:50%}[data-v-2fadebcc] .demo-table-expand label{color:#99a9bf}
+.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}[data-v-1fbb079a] .demo-table-expand .el-form-item{margin-right:0;margin-bottom:0;width:50%}[data-v-1fbb079a] .demo-table-expand label{color:#99a9bf}

dist/static/css/chunk-9eaddc9a.dd9768ec.css → dist/static/css/chunk-1b7547ea.d4094ea9.css

@@ -1 +1 @@
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.titleP[data-v-d97cb02a]{line-height:30px}
+.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.titleP[data-v-8a8e90ea]{line-height:30px}

dist/static/css/chunk-4031964c.c50f72dd.css → dist/static/css/chunk-21cdef4d.30f1935d.css

@@ -1 +1 @@
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.micon[data-v-5c550ad1]{position:absolute;top:3px;right:2px}
+.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.micon[data-v-007daf71]{position:absolute;top:3px;right:2px}

dist/static/css/chunk-6c96388b.9845ebe2.css → dist/static/css/chunk-3a5fff64.a10ceca0.css

@@ -1 +1 @@
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.el-button--primary[data-v-6a1578c0],.el-button--primary[data-v-6a1578c0]:active,.el-button--primary[data-v-6a1578c0]:focus,.el-button--primary[data-v-6a1578c0]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-6a1578c0] .el-image-viewer__close{color:#fff;opacity:1}[data-v-6a1578c0] .el-date-editor.el-input,[data-v-6a1578c0] .el-select{width:100%!important}[data-v-6a1578c0] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}
+.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.el-button--primary[data-v-5e811600],.el-button--primary[data-v-5e811600]:active,.el-button--primary[data-v-5e811600]:focus,.el-button--primary[data-v-5e811600]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-5e811600] .el-image-viewer__close{color:#fff;opacity:1}[data-v-5e811600] .el-date-editor.el-input,[data-v-5e811600] .el-select{width:100%!important}[data-v-5e811600] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}

dist/static/css/chunk-559f4eee.63c58e6d.css → dist/static/css/chunk-612206a7.ccdffbd9.css

@@ -1 +1 @@
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.point[data-v-ce14fc80]{font-weight:700;color:#13817a}
+.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.point[data-v-72a60a4a]{font-weight:700;color:#13817a}

dist/static/css/chunk-736b8030.5a3fb8b4.css → dist/static/css/chunk-7009dc6a.5e73f213.css

@@ -1 +1 @@
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.schoolCell[data-v-4312788c]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4312788c] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-4d0e6264]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4d0e6264] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.schoolCell[data-v-6260081a]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-6260081a] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-4d0e6264]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4d0e6264] .el-textarea.is-disabled .el-textarea__inner{color:#333}

dist/static/css/chunk-9e94fe5a.58ccc8d2.css → dist/static/css/chunk-7c6731d3.311e88e2.css

@@ -1 +1 @@
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.newBand[data-v-0b164ca6]{display:inline-block}.noWrap[data-v-0b164ca6]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.newBand[data-v-9fe02ab4]{display:inline-block}.noWrap[data-v-9fe02ab4]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}

dist/static/css/chunk-219e6340.ba36be9b.css → dist/static/css/chunk-7e6298b5.5ca29b17.css

@@ -1 +1 @@
-.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.msg[data-v-0a15195f]{min-width:120px}.label[data-v-0a15195f]{width:520px}
+.pagination-container[data-v-5985d484]{background:#fff;padding:32px 16px;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5985d484]{display:none}.msg[data-v-25400902]{min-width:120px}.label[data-v-25400902]{width:520px}

src/views/businessManager/orderManager/salesList.vue

@@ -14,6 +14,11 @@
                     type="text"></el-input>
         </el-form-item>
         <el-form-item>
+          <el-input v-model.trim="searchForm.goodsName"
+                    placeholder="请输入商品名称"
+                    type="text"></el-input>
+        </el-form-item>
+        <el-form-item>
           <el-select multiple
                      collapse-tags
                      v-model="searchForm.organIdList"
@@ -295,6 +300,7 @@ export default {
       detail: {},
       searchForm: {
         search: '',
+        goodsName: '',
         cooperationOrganId: '',
         startTime: null,
         endTime: null,
@@ -409,6 +415,7 @@ export default {
         endTime: null,
         organIdList: [],
         search: '',
+        goodsName: [],
         cooperationOrganId: '',
       }
       this.getList()

src/views/teamBuild/components/teamBaseInfo.vue

@@ -688,7 +688,7 @@ export default {
   beforeDestroy () { },
   methods: {
     isNotEditing: function () {
-      return !(this.teamStatus === 'resetTeam' || this.teamStatus === 'teamDraft' || this.teamStatus === 'teamAudit' || this.teamStatus === 'newTeam')
+      return !(this.teamStatus === 'resetTeam' || this.teamStatus === 'teamDraft' || this.teamStatus === 'teamAudit' || this.teamStatus === 'newTeam' || this.teamStatus === 'teamList')
     },
     changeFeeType (val) {
       // console.log(val == "ONLINE");