1201 16:11

111

dist/static/css/chunk-32a447f7.6b3cf943.css → dist/static/css/chunk-0cdd6d72.aa487c23.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{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-31cb099a]{display:none}.select[data-v-bffcb4bc]{font-size:14px}.btnList[data-v-bffcb4bc]{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}.btnList div[data-v-bffcb4bc]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{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-31cb099a]{display:none}.select[data-v-7a92e011]{font-size:14px}.btnList[data-v-7a92e011]{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}.btnList div[data-v-7a92e011]{margin-right:15px}

dist/static/css/chunk-17c335d6.c98ac437.css

@@ -1 +0,0 @@
-.floor[data-v-053d1a12]{padding-right:20px;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;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-053d1a12]{background:#f85043;margin-left:164px}.floor .add[data-v-053d1a12],.floor .remove[data-v-053d1a12]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-053d1a12]{background:#14928a;margin-left:20px}.studentMask[data-v-053d1a12]{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}.studentMask .left[data-v-053d1a12]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-053d1a12]{margin-bottom:20px}.studentMask .left h4[data-v-053d1a12]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-053d1a12]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-053d1a12]{padding-left:10px;line-height:25px}.studentMask .right .tableList[data-v-053d1a12]{max-height:500px;overflow-y:auto}.el-date-editor.el-input[data-v-053d1a12],.el-date-editor.el-input__inner[data-v-053d1a12]{width:100px}

dist/static/css/chunk-5c68c8b3.d0c2b744.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-2208ea8a],.el-button--primary[data-v-2208ea8a]:active,.el-button--primary[data-v-2208ea8a]:focus,.el-button--primary[data-v-2208ea8a]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-2208ea8a]{margin-top:40px}.el-col[data-v-2208ea8a]{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-2208ea8a]{width:200px;margin:0 20px}[data-v-2208ea8a] .el-tree-node__content{height:40px!important}[data-v-2208ea8a] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-2208ea8a]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-2208ea8a]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-2208ea8a]{width:120px;height:120px;display:block}

dist/static/css/chunk-aac389ec.a1e30022.css

@@ -0,0 +1 @@
+.floor[data-v-58eb2a4c]{padding-right:20px;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;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-58eb2a4c]{background:#f85043;margin-left:164px}.floor .add[data-v-58eb2a4c],.floor .remove[data-v-58eb2a4c]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-58eb2a4c]{background:#14928a;margin-left:20px}.studentMask[data-v-58eb2a4c]{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}.studentMask .left[data-v-58eb2a4c]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-58eb2a4c]{margin-bottom:20px}.studentMask .left h4[data-v-58eb2a4c]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-58eb2a4c]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-58eb2a4c]{padding-left:10px;line-height:25px}.studentMask .right .tableList[data-v-58eb2a4c]{max-height:500px;overflow-y:auto}.el-date-editor.el-input[data-v-58eb2a4c],.el-date-editor.el-input__inner[data-v-58eb2a4c]{width:100px}

dist/static/css/chunk-bd3544fc.6e2e42d1.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-5a92ffa5],.el-button--primary[data-v-5a92ffa5]:active,.el-button--primary[data-v-5a92ffa5]:focus,.el-button--primary[data-v-5a92ffa5]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-5a92ffa5]{margin-top:40px}.el-col[data-v-5a92ffa5]{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-5a92ffa5]{width:200px;margin:0 20px}[data-v-5a92ffa5] .el-tree-node__content{height:40px!important}[data-v-5a92ffa5] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-5a92ffa5]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-5a92ffa5]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-5a92ffa5]{width:120px;height:120px;display:block}

dist/static/css/chunk-377484c0.03972dfb.css → dist/static/css/chunk-d92f5054.5e398bfe.css

@@ -1 +1 @@
-.el-button--primary[data-v-32cca616],.el-button--primary[data-v-32cca616]:active,.el-button--primary[data-v-32cca616]:focus,.el-button--primary[data-v-32cca616]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-32cca616] .el-date-editor.el-input,[data-v-32cca616] .el-select{width:100%!important}[data-v-32cca616] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-32cca616]{margin-top:20px;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}.infoWrap .left[data-v-32cca616]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-32cca616]{margin-bottom:20px}.infoWrap .right[data-v-32cca616]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-32cca616]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-32cca616]{width:150px;height:150px}.salarySet h3[data-v-735f2758]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-735f2758],.salarySet .tableList .right[data-v-735f2758]{float:left}.salarySet .tableList .left[data-v-735f2758]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-735f2758]{width:56%;margin-left:2%}[data-v-735f2758] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-735f2758] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}
+.el-button--primary[data-v-412e64f9],.el-button--primary[data-v-412e64f9]:active,.el-button--primary[data-v-412e64f9]:focus,.el-button--primary[data-v-412e64f9]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-412e64f9] .el-date-editor.el-input,[data-v-412e64f9] .el-select{width:100%!important}[data-v-412e64f9] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-412e64f9]{margin-top:20px;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}.infoWrap .left[data-v-412e64f9]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-412e64f9]{margin-bottom:20px}.infoWrap .right[data-v-412e64f9]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-412e64f9]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-412e64f9]{width:150px;height:150px}.salarySet h3[data-v-735f2758]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-735f2758],.salarySet .tableList .right[data-v-735f2758]{float:left}.salarySet .tableList .left[data-v-735f2758]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-735f2758]{width:56%;margin-left:2%}[data-v-735f2758] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-735f2758] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}

dist/static/css/chunk-20cc8fbe.f42408b3.css → dist/static/css/chunk-ff51b55c.d7074c03.css

@@ -1 +1 @@
-.setBtn[data-v-3b267e69]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-020aa985]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-020aa985]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}
+.setBtn[data-v-3b267e69]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-258c987e]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-258c987e]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

src/views/businessManager/shopManager/shopOperation.vue

@@ -97,7 +97,7 @@ import { categoryListTree, goodsAdd, goodsUpdate, goodsSingleQuery } from '@/api
 // import store from '@/store'
 import { getToken } from '@/utils/auth'
 let validPrice = (rule, value, callback) => {
-  if (!value) {
+  if (!value.toString()) {
     callback(new Error('请输入金额'))
   } else if (value < 0) {
     callback(new Error('输入金额必须大于0'))

src/views/categroyManager/insideSetting/staffManager.vue

@@ -1,29 +1,38 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>员工管理</h2>
+    <h2>
+      <div class="squrt"></div>员工管理
+    </h2>
     <div class="m-core">
-      <div @click="roleOperation('create')" class='newBand'>添加</div>
+      <div @click="roleOperation('create')"
+           class='newBand'>添加</div>
 
       <el-form :inline="true"
                class="searchForm"
-                @submit.native.prevent
+               @submit.native.prevent
                v-model="searchForm">
         <el-form-item>
-          <el-input type="text" v-model="searchForm.search" placeholder="姓名或手机号"></el-input>
+          <el-input type="text"
+                    v-model="searchForm.search"
+                    @keyup.enter.native='getList'
+                    placeholder="姓名或手机号"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="search"
                      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' prop="realName"
+        <el-table :data='tableList'
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align='center'
+                           prop="realName"
                            label="姓名">
           </el-table-column>
-          <el-table-column align='center' prop="phone"
+          <el-table-column align='center'
+                           prop="phone"
                            label="手机号">
           </el-table-column>
           <el-table-column align='center'
@@ -32,7 +41,8 @@
               {{ scope.row.roleNames | joinArray(',') }}
             </template>
           </el-table-column>
-          <el-table-column align='center' prop="jobNature"
+          <el-table-column align='center'
+                           prop="jobNature"
                            label="工作类型">
             <template slot-scope="scope">
               {{ scope.row.jobNature | jobNature }}
@@ -40,21 +50,22 @@
           </el-table-column>
           <el-table-column align='center'
                            label="所属部门">
-            
-            <span style="display: inline-block;width: 100%;overflow: hidden;white-space: nowrap; text-overflow: ellipsis;" slot-scope="scope">
-              <el-popover
-                placement="top-start"
-                width="200"
-                trigger="hover"
-                :content="scope.row.organNameList | joinArray(',')">
+
+            <span style="display: inline-block;width: 100%;overflow: hidden;white-space: nowrap; text-overflow: ellipsis;"
+                  slot-scope="scope">
+              <el-popover placement="top-start"
+                          width="200"
+                          trigger="hover"
+                          :content="scope.row.organNameList | joinArray(',')">
                 <!-- <el-button slot="reference">hover 激活</el-button> -->
                 <span slot="reference">{{ scope.row.organNameList | joinArray(',') }}</span>
               </el-popover>
-              
+
             </span>
           </el-table-column>
           <el-table-column align='center'
-                           label="状态" :formatter="formatLockFlag">
+                           label="状态"
+                           :formatter="formatLockFlag">
           </el-table-column>
           <el-table-column align='center'
                            label="入职时间">
@@ -68,13 +79,18 @@
               {{ scope.row.demissionDate | formatTimer }}
             </template>
           </el-table-column>
-          <el-table-column align='center' width="250px"
+          <el-table-column align='center'
+                           width="250px"
                            label="操作">
             <template slot-scope="scope">
-              <el-button @click="roleOperation('update', scope.row)" type="text">修改</el-button>
-              <el-button @click="onStaffOperation('RESET_PASSWORD', scope.row)" type="text">重置密码</el-button>
-              <el-button @click="onStaffOperation('LOCK_UNLOCK', scope.row)" type="text">{{ scope.row.lockFlag == 1 ? '解冻' : '冻结' }}</el-button> 
-              <el-button @click="onStaffOperation('DEMISSION', scope.row)" type="text">{{ scope.row.demissionDate ? '复职' : '离职' }}</el-button>
+              <el-button @click="roleOperation('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button @click="onStaffOperation('RESET_PASSWORD', scope.row)"
+                         type="text">重置密码</el-button>
+              <el-button @click="onStaffOperation('LOCK_UNLOCK', scope.row)"
+                         type="text">{{ scope.row.lockFlag == 1 ? '解冻' : '冻结' }}</el-button>
+              <el-button @click="onStaffOperation('DEMISSION', scope.row)"
+                         type="text">{{ scope.row.demissionDate ? '复职' : '离职' }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -86,51 +102,87 @@
       </div>
     </div>
 
-    <el-dialog :title="formTitle[formActionTitle]" :visible.sync="roleStatus" @close="onFormClose('ruleForm')" width="500px">
-      <el-form :model="form" :rules="rules" ref="ruleForm">
-        <el-form-item label="姓名" prop="realName" :label-width="formLabelWidth">
-          <el-input v-model="form.realName" autocomplete="off"></el-input>
+    <el-dialog :title="formTitle[formActionTitle]"
+               :visible.sync="roleStatus"
+               @close="onFormClose('ruleForm')"
+               width="500px">
+      <el-form :model="form"
+               :rules="rules"
+               ref="ruleForm">
+        <el-form-item label="姓名"
+                      prop="realName"
+                      :label-width="formLabelWidth">
+          <el-input v-model="form.realName"
+                    autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="性别" prop="gender" :label-width="formLabelWidth">
+        <el-form-item label="性别"
+                      prop="gender"
+                      :label-width="formLabelWidth">
           <el-select v-model="form.gender">
-            <el-option label="男" :value="1"></el-option>
-            <el-option label="女" :value="0"></el-option>
+            <el-option label="男"
+                       :value="1"></el-option>
+            <el-option label="女"
+                       :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="手机号" prop="phone" :label-width="formLabelWidth">
-          <el-input v-model.number="form.phone" autocomplete="off"></el-input>
+        <el-form-item label="手机号"
+                      prop="phone"
+                      :label-width="formLabelWidth">
+          <el-input v-model.number="form.phone"
+                    autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="角色分类" prop="roleIds" :label-width="formLabelWidth">
-          <el-select v-model="form.roleIds" multiple >
-            <el-option v-for="item in roleList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        <el-form-item label="角色分类"
+                      prop="roleIds"
+                      :label-width="formLabelWidth">
+          <el-select v-model="form.roleIds"
+                     multiple>
+            <el-option v-for="item in roleList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
           <!-- collapse-tags -->
         </el-form-item>
-        <el-form-item label="所属部门" prop="organIdLists" :label-width="formLabelWidth">
-          <el-select style="width: calc(100% - 75px) !important;" v-model="form.organIdLists" multiple>
-            <el-option v-for="item in branchList" :key="item.value" 
-              :label="item.label" :value="item.value"></el-option>
+        <el-form-item label="所属部门"
+                      prop="organIdLists"
+                      :label-width="formLabelWidth">
+          <el-select style="width: calc(100% - 75px) !important;"
+                     v-model="form.organIdLists"
+                     multiple>
+            <el-option v-for="item in branchList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
           <el-button @click="onBranchCheckAll">全选</el-button>
         </el-form-item>
-        <el-form-item label="工作类型" prop="jobNature" :label-width="formLabelWidth">
+        <el-form-item label="工作类型"
+                      prop="jobNature"
+                      :label-width="formLabelWidth">
           <el-select v-model="form.jobNature">
-            <el-option label="全职" value="FULL_TIME"></el-option>
-            <el-option label="兼职" value="PART_TIME"></el-option>
-            <el-option label="临时" value="TEMPORARY"></el-option>
+            <el-option label="全职"
+                       value="FULL_TIME"></el-option>
+            <el-option label="兼职"
+                       value="PART_TIME"></el-option>
+            <el-option label="临时"
+                       value="TEMPORARY"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="入职时间" prop="entryDate" :label-width="formLabelWidth">
-          <el-date-picker
-            v-model="form.entryDate"
-            type="date" value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择日期">
+        <el-form-item label="入职时间"
+                      prop="entryDate"
+                      :label-width="formLabelWidth">
+          <el-date-picker v-model="form.entryDate"
+                          type="date"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="roleStatus = false">取 消</el-button>
-        <el-button @click="onRoleSubmit('ruleForm')" type="primary">确 定</el-button>
+        <el-button @click="onRoleSubmit('ruleForm')"
+                   type="primary">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -141,14 +193,14 @@ import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employ
 import { branchQueryPage } from '@/api/specialSetting'
 import store from '@/store'
 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()
-    }
+let validPhone = (rule, value, callback) => {
+  if (!value) {
+    callback(new Error('请输入电话号码'))
+  } else if (!isvalidPhone(value)) {
+    callback(new Error('请输入正确的11位手机号码'))
+  } else {
+    callback()
+  }
 }
 export default {
   components: { pagination },
@@ -183,43 +235,43 @@ export default {
       },
       rules: {
         realName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-        gender: [{required: true, message: '请选择性别', trigger: 'change'}],
-        phone: [{ type: 'number', required: true, validator: validPhone, trigger: 'blur'}],
-        roleIds: [{type: 'array', required: true, message: '请选择分类', trigger: 'change'}],
-        organIdLists: [{type: 'array', required: true, message: '请选择所属部门', trigger: 'change'}],
-        jobNature: [{required: true, message: '请选择工作类型', trigger: 'change'}],
-        entryDate: [{ required: true, message: '请选择入职时间', trigger: 'blur'}],
+        gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
+        phone: [{ type: 'number', required: true, validator: validPhone, trigger: 'blur' }],
+        roleIds: [{ type: 'array', required: true, message: '请选择分类', trigger: 'change' }],
+        organIdLists: [{ type: 'array', required: true, message: '请选择所属部门', trigger: 'change' }],
+        jobNature: [{ required: true, message: '请选择工作类型', trigger: 'change' }],
+        entryDate: [{ required: true, message: '请选择入职时间', trigger: 'blur' }],
       },
       searchForm: {
         search: null
       }
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
     this.getRoleList()
 
-    
+
   },
   methods: {
-    onBranchCheckAll() {
+    onBranchCheckAll () {
       this.form.organIdLists = []
       this.branchList.forEach(item => {
         this.form.organIdLists.push(item.value)
       })
     },
-    onRoleSubmit(formName) {
+    onRoleSubmit (formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.form.organIdList = this.form.organIdLists.join(',')
-          if(this.formActionTitle == 'create') {
-            if(this.form.id) { // 判断有没有Id，如果有则删除
+          if (this.formActionTitle == 'create') {
+            if (this.form.id) { // 判断有没有Id，如果有则删除
               delete this.form.id
             }
             employeeAdd(this.form).then(res => {
               this.messageTips('添加', res)
             })
-          } else if(this.formActionTitle == 'update') {
+          } else if (this.formActionTitle == 'update') {
             employeeUpdate(this.form).then(res => {
               this.messageTips('修改', res)
             })
@@ -229,8 +281,8 @@ export default {
         }
       })
     },
-    messageTips(title, res) {
-      if(res.code == 200) {
+    messageTips (title, res) {
+      if (res.code == 200) {
         this.$message.success(title + '成功')
         this.roleStatus = false
         this.getList()
@@ -238,7 +290,7 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    search() {
+    search () {
       this.pageInfo.page = 1
       this.getList()
     },
@@ -247,16 +299,16 @@ export default {
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
       queryEmployByOrganId(params).then(res => {
-        if(res.code == 200 && res.data) {
+        if (res.code == 200 && res.data) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
     },
-    getRoleList() { // 获取角色
+    getRoleList () { // 获取角色
       getUserRole({ delFlag: 0, rows: 9999 }).then(res => {
         let result = res.data
-        if(res.code == 200 && result && result.rows.length > 0) {
+        if (res.code == 200 && result && result.rows.length > 0) {
           result.rows.forEach(item => {
             this.roleList.push({
               label: item.roleName,
@@ -269,7 +321,7 @@ export default {
         delFlag: 0,
         rows: 9999
       }).then(res => {
-        if(res.code == 200 && res.data && res.data.rows) {
+        if (res.code == 200 && res.data && res.data.rows) {
           res.data.rows.forEach(item => {
             this.branchList.push({
               label: item.name,
@@ -278,13 +330,13 @@ export default {
           })
         }
       })
-      
+
     },
-    roleOperation(type, data) {
+    roleOperation (type, data) {
       this.formActionTitle = type
       this.roleStatus = true
       // 修改的时候
-      if(type == 'update') {
+      if (type == 'update') {
         this.form = {
           id: data.id,
           realName: data.realName,
@@ -297,7 +349,7 @@ export default {
         }
       }
     },
-    onFormClose(formName) { // 关闭弹窗重置验证
+    onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
         realName: null,
         gender: null,
@@ -309,20 +361,20 @@ export default {
       }
       this.$refs[formName].resetFields()
     },
-    formatLockFlag(row) {
+    formatLockFlag (row) {
       let reuslt = ['正常', '冻结']
-      if(row.demissionDate) {
+      if (row.demissionDate) {
         return '离职'
       } else {
         return reuslt[row.lockFlag]
       }
     },
-    onStaffOperation(type, data) {
-      employeeOperate({ 
+    onStaffOperation (type, data) {
+      employeeOperate({
         employeeId: data.id,
         operate: type
       }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.$message.success('更改成功')
           this.roleStatus = false
           this.getList()
@@ -339,16 +391,19 @@ export default {
   background: #14928a;
   border-color: #14928a;
   color: #fff;
-  &:hover, &:active, &:focus {
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
-    color: #FFF;
+    color: #fff;
   }
 }
 .el-dialog__body {
   padding: 0 20px;
 }
-.el-select, .el-date-editor.el-input{
+.el-select,
+.el-date-editor.el-input {
   width: 100% !important;
 }
 </style>

src/views/login/index.vue

@@ -331,7 +331,7 @@ $light_gray: #eee;
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 90px 0;
+    padding: 20% 0;
     img {
       width: 48%;
     }

src/views/resetTeaming/components/resetSound.vue

@@ -168,7 +168,8 @@
          style="margin-top:30px">
       <div class="closeBtn"
            @click="getSound">取消</div>
-      <div class="okBtn" v-permission="{child: 'musicGroup/updateSubjectInfo', parent: '/resetTeaming/resetSound'}"
+      <div class="okBtn"
+           v-permission="{child: 'musicGroup/updateSubjectInfo', parent: '/resetTeaming/resetSound'}"
            @click="saveInfo">保存</div>
     </div>
   </div>
@@ -244,6 +245,10 @@ export default {
         }
       })
     },
+    // 添加教辅
+    addMark (row) {
+      row.markList.push({ 'name': '', 'goods': [], 'price': '' })
+    },
     saveInfo () {
       // 只提交第二页的数据
       let obj = {};

src/views/studentManager/studentList.vue

@@ -26,6 +26,7 @@
         </el-form-item>
         <el-form-item>
           <el-input placeholder="家长联系电话"
+                    @keyup.enter.native='getList'
                     v-model="searchForm.search"></el-input>
         </el-form-item>
         <el-form-item>

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -329,6 +329,7 @@ export default {
             })
           })
         }
+
       })
       subjectListTree({ // 声部
         delFlag: 0,
@@ -364,7 +365,7 @@ export default {
             birthdate: result.birthdate,
             entryDate: result.entryDate,
             jobNature: result.jobNature,
-            organId: result.organId,
+            organId: parseInt(result.organId),
             flowOrganRange: result.flowOrganRangeId ? result.flowOrganRangeId.split(',') : null,
             introduction: result.introduction,
             phone: result.phone,

src/views/teamBuild/teamSeting/components/improvementClass.vue

@@ -81,6 +81,8 @@
          style="margin-top:40px;">
       <div class="nextBtn"
            @click='gotoNext'>{{ permission('/teamSetting/salarySet') ? '确定' : '下一步' }}</div>
+      <div class="nextBtn"
+           @click='gotoskip'>跳过</div>
       <!-- <div class="okBtn">返回</div> -->
     </div>
     <el-dialog title="基础技能班"
@@ -174,7 +176,7 @@
   </div>
 </template>
 <script>
-import { findSound, findMusicGroupClassTeacher, getTeacher, getTeamDetail, addHighClass, highClassGroups } from '@/api/buildTeam'
+import { findSound, findMusicGroupClassTeacher, getTeacher, getTeamDetail, addHighClass, highClassGroups, removeSingleClass } from '@/api/buildTeam'
 let that;
 import { permission } from '@/utils/directivePage'
 export default {
@@ -257,18 +259,21 @@ export default {
         this.topForm.improventClassesNum = res.data.improventClassesNum;
       }
     });
-    // 获取提高班列表
-    highClassGroups({ musicGroupId: this.teamid }).then(res => {
-      if (res.code == 200) {
-        this.tableList = res.data;
-        // for (let i in this.tableList) {
-        //   this.tableList[i].endClassTime = this.tableList[i].endClassTime.substring(0, this.tableList[i].endClassTime.length - 3);
-        //   this.tableList[i].startClassTime = this.tableList[i].startClassTime.substring(0, this.tableList[i].startClassTime.length - 3);
-        // }
-      }
-    })
+    this.getList();
   },
   methods: {
+    getList () {
+      // 获取提高班列表
+      highClassGroups({ musicGroupId: this.teamid }).then(res => {
+        if (res.code == 200) {
+          this.tableList = res.data;
+          // for (let i in this.tableList) {
+          //   this.tableList[i].endClassTime = this.tableList[i].endClassTime.substring(0, this.tableList[i].endClassTime.length - 3);
+          //   this.tableList[i].startClassTime = this.tableList[i].startClassTime.substring(0, this.tableList[i].startClassTime.length - 3);
+          // }
+        }
+      })
+    },
     permission (str) {
       return permission(str)
     },
@@ -304,23 +309,40 @@ export default {
 
     },
     removeClass (row) {
-      console.log(row.moid)
-      if (row.moid) {
-        for (let i in this.tableList) {
-          if (this.tableList[i].moid == row.moid) {
-            this.tableList.splice(i, 1);
-            return
-          }
-        }
-      } else {
-        for (let i in this.tableList) {
-          if (this.tableList[i].id == row.id) {
-            this.tableList.splice(i, 1);
-            return
+      this.$confirm('是否删除该基础技能班?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 成功
+        if (row.moid) {
+          for (let i in this.tableList) {
+            if (this.tableList[i].moid == row.moid) {
+              this.tableList.splice(i, 1);
+              this.$message.success('删除成功')
+              return
+            }
           }
+        } else {
+          // 说明是服务器数据  调接口
+          removeSingleClass({ classGroupId: row.id }).then(res => {
+            if (res.code == 200) {
+              // for (let i in this.tableList) {
+              //   if (this.tableList[i].id == row.id) {
+              //     this.tableList.splice(i, 1);
+
+              //     return
+              //   }
+              // }
+              this.$message.success('删除成功')
+              this.getList();
+            }
+          })
+
         }
-      }
+      }).catch(() => {
 
+      });
     },
     addClass () {
       if (this.isSetSalary) {
@@ -330,6 +352,17 @@ export default {
       this.raiseVisible = true;
 
     },
+    gotoskip () {
+      if (this.isSetSalary) {
+        this.$message.error('课酬确认后无法编辑')
+        return;
+      }
+      if (this.permission('/teamSetting/salarySet')) {
+        this.$router.push({ path: '/business/teamDetail' })
+      } else {
+        this.$emit('gotoNav', 4)
+      }
+    },
     gotoNext () {
       if (this.isSetSalary) {
         this.$message.error('课酬确认后无法编辑')

src/views/teamDetail/components/courseList.vue

@@ -140,9 +140,9 @@
                label-width="80px;"
                :inline="true">
         <el-form-item label="主教老师"
-                      filterable
                       prop="teacher">
-          <el-select v-model="maskForm.teacher">
+          <el-select v-model="maskForm.teacher"
+                     filterable>
             <el-option v-for="(item,index) in teacherList"
                        :key="index"
                        :value="item.id"

src/views/teamDetail/components/resetClass.vue

@@ -81,7 +81,8 @@
                                @click="removeClass(scope)">确定</el-button>
                   </div>
                   <el-button type="text"
-                             slot="reference">删除</el-button>
+                             slot="reference"
+                             v-if="scope.row.type !='MIX'">删除</el-button>
                 </el-popover>
                 <el-button type="text"
                            @click="resetClass(scope.row)">修改</el-button>

src/views/teamDetail/teamList.vue

@@ -55,8 +55,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <div class='searchBtn'
-               @click="search">搜索</div>
+          <!-- <div class='searchBtn'
+               @click="search"></div> -->
+          <el-button type='danger'
+                     @click="search">搜索</el-button>
+        </el-form-item>
+        <el-form-item>
+          <!-- <div class='searchBtn'
+               @click="search"></div> -->
+          <el-button type='primary'
+                     @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
@@ -286,6 +294,11 @@ export default {
     // })
   },
   methods: {
+    reset () {
+      this.rules.page = 1;
+      this.$refs['topForm'].resetFields();
+      this.getList()
+    },
     search () {
       this.rules.page = 1;
       this.getList();

src/views/vipClass/vipList.vue

@@ -45,6 +45,7 @@
         </el-form-item>
         <el-form-item>
           <el-input v-model="searchForm.search"
+                    @keyup.enter.native='getList'
                     placeholder="课程名称"></el-input>
         </el-form-item>
         <el-form-item>