Merge branch 'online' into LAO_MO

dist/static/css/chunk-0153131e.063619f0.css → dist/static/css/chunk-1434801a.0ea7ef83.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}.el-button--primary[data-v-142ac985],.el-button--primary[data-v-142ac985]:active,.el-button--primary[data-v-142ac985]:focus,.el-button--primary[data-v-142ac985]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-142ac985] .el-image-viewer__close{color:#fff;opacity:1}[data-v-142ac985] .el-date-editor.el-input,[data-v-142ac985] .el-select{width:100%!important}[data-v-142ac985] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}
+.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}.el-button--primary[data-v-7d2610a8],.el-button--primary[data-v-7d2610a8]:active,.el-button--primary[data-v-7d2610a8]:focus,.el-button--primary[data-v-7d2610a8]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-7d2610a8] .el-image-viewer__close{color:#fff;opacity:1}[data-v-7d2610a8] .el-date-editor.el-input,[data-v-7d2610a8] .el-select{width:100%!important}[data-v-7d2610a8] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}

dist/static/css/chunk-3d701485.98838bd4.css

@@ -1 +0,0 @@
-.m-container .m-core[data-v-6538e75d]{margin-top:20px}.m-container .m-core .m-wrap[data-v-6538e75d]{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;width:100%}.m-container .m-core .m-wrap .newBand[data-v-6538e75d]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-6538e75d]{width:120px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-6538e75d]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-6538e75d]{width:20px;height:20px;position:relative;top:12px}[data-v-6538e75d] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-0cc36373.892c1348.css → dist/static/css/chunk-4ef2b97d.0153c224.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}.m-container[data-v-b2bcd56e]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-b2bcd56e]{display:inline-block}
+.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}.m-container[data-v-24687f50]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-24687f50]{display:inline-block}

dist/static/css/chunk-b0b6e1f0.fca98c3a.css → dist/static/css/chunk-502096dc.4bd74aad.css

@@ -1 +1 @@
-.m-core[data-v-02986b01]{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-02986b01]{width:180px}.m-core h4[data-v-02986b01]{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-02986b01],.m-core .right[data-v-02986b01],.m-core .vipLeft[data-v-02986b01]{width:400px}.planList[data-v-02986b01]{padding:0 25px}.planList .planTop[data-v-02986b01]{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-02986b01]{font-size:14px}.planList .planCore .row[data-v-02986b01]{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-02986b01]{width:87px}.okBtn[data-v-02986b01]{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-26ea7cb0]{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-26ea7cb0]{width:180px}.m-core h4[data-v-26ea7cb0]{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-26ea7cb0],.m-core .right[data-v-26ea7cb0],.m-core .vipLeft[data-v-26ea7cb0]{width:400px}.planList[data-v-26ea7cb0]{padding:0 25px}.planList .planTop[data-v-26ea7cb0]{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-26ea7cb0]{font-size:14px}.planList .planCore .row[data-v-26ea7cb0]{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-26ea7cb0]{width:87px}.okBtn[data-v-26ea7cb0]{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-70f24304.b9822a7a.css

@@ -0,0 +1 @@
+.m-container .m-core[data-v-7d472107]{margin-top:20px}.m-container .m-core .m-wrap[data-v-7d472107]{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;width:100%}.m-container .m-core .m-wrap .newBand[data-v-7d472107]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-7d472107]{width:120px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-7d472107]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-7d472107]{width:20px;height:20px;position:relative;top:12px}[data-v-7d472107] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-6cb6556b.39b3b013.css → dist/static/css/chunk-7d63f23d.ee0d91eb.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-0d9e1fa5]{font-size:14px}.btnList[data-v-0d9e1fa5]{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-0d9e1fa5]{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-7ab52a6d]{font-size:14px}.btnList[data-v-7ab52a6d]{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-7ab52a6d]{margin-right:15px}

package.json

@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "axios": "0.18.1",
-    "browserslist": "^4.8.3",
-    "caniuse-lite": "^1.0.30001021",
+    "browserslist": "^4.13.0",
+    "caniuse-lite": "^1.0.30001109",
     "clean-deep": "^3.3.0",
     "default-passive-events": "^1.0.10",
     "element-ui": "^2.12.0",

src/views/categroyManager/vipNewActive.vue

@@ -22,6 +22,7 @@
                      multiple
                      filterable
                      @visible-change="$forceUpdate()"
+                     @change="onOrganChange"
                      clearable>
             <el-option v-for="(item,index) in organList"
                        :key="index"
@@ -36,7 +37,7 @@
                      @visible-change="$forceUpdate()"
                      clearable
                      multiple>
-            <el-option v-for="(item,index) in courseStatusList"
+            <el-option v-for="item in courseStatusList"
                        :key="item.id"
                        :value="item.id"
                        :label="item.name"></el-option>
@@ -399,12 +400,17 @@ export default {
       // 线上线下课 勾选就传不勾选就不传
       // addVipActive().then(res => { })
     },
+    onOrganChange() {
+      this.$forceUpdate()
+    },
     onCheckAllBranch () {
       // 选择所有分部
-      this.vipform.organ = [];
+      let vipform = this.vipform
+      vipform.organ = [];
       this.organList.forEach(item => {
-        this.vipform.organ.push(item.id);
+        vipform.organ.push(item.id);
       });
+      this.$forceUpdate()
     },
     onCancel () {
       this.$router.push({

src/views/chargeManager/two.vue

@@ -97,14 +97,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="金额(元)" prop="minReceipt" :label-width="formLabelWidth2">
-          <el-input-number
+          <el-input
             style="width: 100%;"
-            v-model="formSporadic.minReceipt"
-            :precision="0"
-            controls-position="right"
-            :min="1"
-            :max="999999999"
-          ></el-input-number>
+            @mousewheel.native.prevent
+            v-model.number="formSporadic.minReceipt"
+          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -170,15 +167,15 @@ export default {
       sporadicId: null, // 零星收费编号
       formSporadic: {
         organId: null,
-        minReceipt: 0
+        minReceipt: null
       },
       rulesSporadic: {
         organId: [
           { required: true, message: "请选择所属分部", trigger: "change" }
         ],
         minReceipt: [
-          { required: true, message: "请输入金额", trigger: "blur" }
-        ]
+        { required: true, validator: validAmount, trigger: 'blur' },
+        { type: 'number', message: '金额必须为数字值' }],
       }
     };
   },
@@ -269,7 +266,7 @@ export default {
             if (item.paramName === "sporadic_channel") {
               this.formSporadic = item.paranValue
                 ? JSON.parse(item.paranValue)
-                : { organId: null, minReceipt: 0 };
+                : { organId: null, minReceipt: null };
               this.sporadicId = item.id;
             }
           });

src/views/levelManager/levelManager.vue

@@ -1,287 +1,318 @@
 
 <template>
-    <div class="m-container">
-        <h2>
-            <div class="squrt"></div>考级报名列表
-        </h2>
-        <div class="m-core">
-            <!-- 搜索标题 -->
-            <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
-                <el-form-item>
-                    <el-input
-                        v-model.trim="searchForm.orderNo"
-                        placeholder="请输入订单编号"
-                    ></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-input
-                        v-model.trim="searchForm.transNo"
-                        placeholder="请输入交易流水号"
-                    ></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-input
-                        v-model.trim="searchForm.city"
-                        @keyup.enter.native="city"
-                        placeholder="请输入城市名"
-                    ></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-select
-                        class="multiple"
-                        v-model.trim="searchForm.status"
-                        filterable
-                        clearable
-                        placeholder="请选择缴费状态">
-                        <el-option value="reg" label="未缴费"></el-option>
-                        <el-option value="pay" label="已缴费"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-date-picker
-                        v-model.trim="orderDate"
-                        style="width:410px;"
-                        type="daterange"
-                        value-format="yyyy-MM-dd"
-                        @change="searchOrderDate"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                    ></el-date-picker>
-                </el-form-item>
-                <el-form-item>
-                    <el-button @click="onSearch" type="danger">搜索</el-button>
-                    <!-- <el-button @click="onReSet" type="primary">重置</el-button> -->
-                    <el-button @click="onExport" v-permission="'export/degreeRegistration/825'" type="primary">导出</el-button>
-                </el-form-item>
-            </el-form>
-            <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-                报考总人数：{{ totalNumber }}人<i style="width: 10px; display: inline-block"></i>
-                实收总金额：{{ totalAmount }}元
-            </div>
-            <div class="tableWrap">
-                <el-table :data="tableList"
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}">>
-                <el-table-column width="90px" align="center" prop="id" label="编号"></el-table-column>
-                <el-table-column align="center" prop="name" label="姓名"></el-table-column>
-                <el-table-column align="center" prop="orderNo" label="订单编号"></el-table-column>
-                <el-table-column align="center" prop="transNo" label="交易流水号">
-                    <template slot-scope="scope">
-                        <el-tooltip placement="top-start">
-                            <div slot="content">{{ scope.row.transNo }}</div>
-                            <span>{{ scope.row.transNo }}</span>
-                        </el-tooltip>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="gender" label="性别">
-                    <template slot-scope="scope">
-                        {{ scope.row.gender == 1 ? '男' : '女' }}
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="idcard" label="身份证号"></el-table-column>
-                <el-table-column align="center" prop="mobile" label="联系电话"></el-table-column>
-                <el-table-column align="center" prop="city" label="城市"></el-table-column>
-                <el-table-column align="center" prop="subject" label="报考乐器"></el-table-column>
-                <el-table-column align="center" prop="level" label="报考级别"></el-table-column>
-                <el-table-column align="center" prop="theoryLevel" label="乐理级别"></el-table-column>
-                <el-table-column align="center" label="缴费状态">
-                    <template slot-scope="scope">
-                        {{ scope.row.status == 2 ? '已缴费' : '未缴费' }}
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="money" label="报考级别费用">
-                    <template slot-scope="scope">
-                        {{ scope.row.money }}元
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="theoryMoney" label="乐理级别费用">
-                    <template slot-scope="scope">
-                        {{ scope.row.theoryMoney }}元
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" label="证书">
-                    <template slot-scope="scope">
-                        <div v-if="scope.row.theoryCert">
-                            <el-image
-                                fit="cover"
-                                style="width: 100px; height: 100px"
-                                :src="scope.row.theoryCert"
-                                :preview-src-list="[scope.row.theoryCert]">
-                            </el-image>
-                        </div>
-                        <div v-else>--</div>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="createTime" label="报名时间"></el-table-column>
-                <el-table-column align="center" prop="memo" label="备注"></el-table-column>
-                <!-- <el-table-column align="center" label="操作">
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>考级报名列表
+    </h2>
+    <div class="m-core">
+      <!-- 搜索标题 -->
+      <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+        <el-form-item>
+          <el-input v-model.trim="searchForm.orderNo" placeholder="请输入订单编号"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model.trim="searchForm.transNo" placeholder="请输入交易流水号"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model.trim="searchForm.city" @keyup.enter.native="city" placeholder="请输入城市名"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model.trim="searchForm.organId" filterable clearable placeholder="请选择分部">
+            <el-option
+              v-for="item in branchList"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.status"
+            filterable
+            clearable
+            placeholder="请选择缴费状态"
+          >
+            <el-option value="reg" label="未缴费"></el-option>
+            <el-option value="pay" label="已缴费"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-date-picker
+            v-model.trim="orderDate"
+            style="width:410px;"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            @change="searchOrderDate"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="onSearch" type="danger">搜索</el-button>
+          <!-- <el-button @click="onReSet" type="primary">重置</el-button> -->
+          <el-button
+            @click="onExport"
+            v-permission="'export/degreeRegistration/825'"
+            type="primary"
+          >导出</el-button>
+        </el-form-item>
+      </el-form>
+      <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
+        报考总人数：{{ totalNumber }}人
+        <i style="width: 10px; display: inline-block"></i>
+        实收总金额：{{ totalAmount }}元
+      </div>
+      <div class="tableWrap">
+        <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          >
+          <el-table-column width="90px" align="center" prop="id" label="编号"></el-table-column>
+          <el-table-column align="center" prop="name" label="姓名"></el-table-column>
+          <el-table-column align="center" prop="orderNo" label="订单编号"></el-table-column>
+          <el-table-column align="center" prop="transNo" label="交易流水号">
+            <template slot-scope="scope">
+              <el-tooltip placement="top-start">
+                <div slot="content">{{ scope.row.transNo }}</div>
+                <span>{{ scope.row.transNo }}</span>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="gender" label="性别">
+            <template slot-scope="scope">{{ scope.row.gender == 1 ? '男' : '女' }}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="idcard" label="身份证号"></el-table-column>
+          <el-table-column align="center" prop="mobile" label="联系电话"></el-table-column>
+          <el-table-column align="center" prop="city" label="城市"></el-table-column>
+          <el-table-column align="center" prop="subject" label="报考乐器"></el-table-column>
+          <el-table-column align="center" prop="level" label="报考级别"></el-table-column>
+          <el-table-column align="center" prop="theoryLevel" label="乐理级别"></el-table-column>
+          <el-table-column align="center" label="缴费状态">
+            <template slot-scope="scope">{{ scope.row.status == 2 ? '已缴费' : '未缴费' }}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="money" label="报考级别费用">
+            <template slot-scope="scope">{{ scope.row.money }}元</template>
+          </el-table-column>
+          <el-table-column align="center" prop="theoryMoney" label="乐理级别费用">
+            <template slot-scope="scope">{{ scope.row.theoryMoney }}元</template>
+          </el-table-column>
+          <el-table-column align="center" label="证书">
+            <template slot-scope="scope">
+              <div v-if="scope.row.theoryCert">
+                <el-image
+                  fit="cover"
+                  style="width: 100px; height: 100px"
+                  :src="scope.row.theoryCert"
+                  :preview-src-list="[scope.row.theoryCert]"
+                ></el-image>
+              </div>
+              <div v-else>--</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="createTime" label="报名时间"></el-table-column>
+          <el-table-column align="center" prop="memo" label="备注"></el-table-column>
+          <!-- <el-table-column align="center" label="操作">
                     <template slot-scope="scope">
                     <el-button @click="onTypeDelOpeation(scope.row)"
                         v-permission="'helpCenterContent/delete'" 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"
-                />
-            </div>
-        </div>
+          </el-table-column>-->
+        </el-table>
+        <pagination
+          :total="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
+      </div>
     </div>
+  </div>
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
 import axios from "axios";
 // import store from '@/store'
 import { degreeQueryPage } from "./levelManageApi";
-import { getToken } from '@/utils/auth'
-import load from '@/utils/loading'
+import { getToken } from "@/utils/auth";
+import { getEmployeeOrgan } from "@/api/buildTeam";
+import load from "@/utils/loading";
 export default {
   components: { pagination },
   name: "helpCategory",
   data() {
     return {
-        orderDate: null,
-        searchForm: {
-            orderNo: null,
-            transNo: null,
-            city: null,
-            status: null,
-            startTime: null,
-            endTime: null
-        },
-        totalNumber: 0,
-        totalAmount: 0,
-        tableList: [],
-        pageInfo: {
-            // 分页规则
-            limit: 10, // 限制显示条数
-            page: 1, // 当前页
-            total: 0, // 总条数
-            page_size: [10, 20, 40, 50] // 选择限制显示条数
-        },
-        tempTreeList: []
+      orderDate: null,
+      searchForm: {
+        orderNo: null,
+        transNo: null,
+        city: null,
+        status: null,
+        startTime: null,
+        organId: null,
+        endTime: null,
+      },
+      totalNumber: 0,
+      totalAmount: 0,
+      tableList: [],
+      branchList: [], // 分部列表
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+      tempTreeList: [],
     };
   },
   activated() {
     this.getList();
+    this.__init();
   },
   mounted() {
     this.getList();
+    this.__init();
   },
   methods: {
+    __init() {
+      getEmployeeOrgan().then((res) => {
+        if (res.code == 200) {
+          this.branchList = [];
+          res.data.forEach((item) => {
+            this.branchList.push({
+              label: item.name,
+              value: item.id,
+            });
+          });
+        }
+      });
+    },
     onSearch() {
-        let pageInfo = this.pageInfo
-        pageInfo.page = 1
-        this.getList()
+      let pageInfo = this.pageInfo;
+      pageInfo.page = 1;
+      this.getList();
     },
     onReSet() {
-        // 重置搜索
-        this.orderDate = null;
-        this.searchForm = {
-            orderNo: null,
-            transNo: null,
-            city: null,
-            status: null,
-            startTime: null,
-            endTime: null
-        }
-        this.getList();
+      // 重置搜索
+      this.orderDate = null;
+      this.searchForm = {
+        orderNo: null,
+        transNo: null,
+        city: null,
+        status: null,
+        startTime: null,
+        organId: null,
+        endTime: null,
+      };
+      this.getList();
     },
     getList() {
-        let searchForm = this.searchForm
-        let params = {
-            orderNo: searchForm.orderNo ? searchForm.orderNo : null,
-            transNo: searchForm.transNo ? searchForm.transNo : null,
-            city: searchForm.city ? searchForm.city : null,
-            status: searchForm.status ? searchForm.status : null,
-            startTime: searchForm.startTime ? searchForm.startTime : null,
-            endTime: searchForm.endTime ? searchForm.endTime : null,
-            page: this.pageInfo.page,
-            rows: this.pageInfo.limit
+      let searchForm = this.searchForm;
+      let params = {
+        orderNo: searchForm.orderNo ? searchForm.orderNo : null,
+        transNo: searchForm.transNo ? searchForm.transNo : null,
+        city: searchForm.city ? searchForm.city : null,
+        status: searchForm.status ? searchForm.status : null,
+        startTime: searchForm.startTime ? searchForm.startTime : null,
+        endTime: searchForm.endTime ? searchForm.endTime : null,
+        organId: searchForm.organId ? searchForm.organId : null,
+        page: this.pageInfo.page,
+        rows: this.pageInfo.limit,
+      };
+      degreeQueryPage(params).then((res) => {
+        let result = res.data;
+        if (res.code == 200) {
+          this.totalNumber = result.total;
+          this.totalAmount = result.totalAmount;
+          this.tableList = result.rows;
+          this.pageInfo.total = result.total;
         }
-        degreeQueryPage(params).then(res => {
-            let result = res.data;
-            if (res.code == 200) {
-                this.totalNumber = result.total
-                this.totalAmount = result.totalAmount
-                this.tableList = result.rows;
-                this.pageInfo.total = result.total
-            }
-        });
+      });
     },
     searchOrderDate(value) {
-        if (value) {
-            this.searchForm.startTime = value[0];
-            this.searchForm.endTime = value[1];
-        } else {
-            this.searchForm.startTime = null;
-            this.searchForm.endTime = null;
-        }
+      if (value) {
+        this.searchForm.startTime = value[0];
+        this.searchForm.endTime = value[1];
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
     },
     // 导出
     onExport() {
-        let url = "/api-web/export/degreeRegistration";
-        let searchForm = this.searchForm
-        let params = {
-            orderNo: searchForm.orderNo ? searchForm.orderNo : null,
-            transNo: searchForm.transNo ? searchForm.transNo : null,
-            city: searchForm.city ? searchForm.city : null,
-            status: searchForm.status ? searchForm.status : null,
-            startTime: searchForm.startTime ? searchForm.startTime : null,
-            endTime: searchForm.endTime ? searchForm.endTime : null
-        }
-        const options = {
-            method: "get",
-            headers: {
-                Authorization: getToken()
-            },
-            url,
-            params: params,
-            responseType: "blob"
-        };
+      let url = "/api-web/export/degreeRegistration";
+      let searchForm = this.searchForm;
+      let params = {
+        orderNo: searchForm.orderNo ? searchForm.orderNo : null,
+        transNo: searchForm.transNo ? searchForm.transNo : null,
+        city: searchForm.city ? searchForm.city : null,
+        status: searchForm.status ? searchForm.status : null,
+        startTime: searchForm.startTime ? searchForm.startTime : null,
+        endTime: searchForm.endTime ? searchForm.endTime : null,
+      };
+      const options = {
+        method: "get",
+        headers: {
+          Authorization: getToken(),
+        },
+        url,
+        params: params,
+        responseType: "blob",
+      };
 
-        this.$confirm("您确定导出列表?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-        }).then(() => {
-            load.startLoading()
-            axios(options).then(res => {
-                let blob = new Blob([res.data], {
+      this.$confirm("您确定导出列表?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          load.startLoading();
+          axios(options)
+            .then((res) => {
+              let blob = new Blob([res.data], {
                 // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
-                type: "application/vnd.ms-excel;charset=utf-8"
+                type: "application/vnd.ms-excel;charset=utf-8",
                 //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-                });
-                let text = (new Response(blob)).text()
-                text.then(res => {
-                    // 判断是否报错
-                    if(res.indexOf('code') != -1) {
-                        let json = JSON.parse(res)
-                        this.$message.error(json.msg)
-                    } else {
-                        let objectUrl = URL.createObjectURL(blob);
-                        let link = document.createElement("a");
-                        let nowTime = new Date();
-                        let ymd = nowTime.getFullYear() + "" + (nowTime.getMonth() + 1) + "" + nowTime.getDate() + "" + nowTime.getHours() + "" + nowTime.getMinutes();
-                        let fname = ymd + "考级报名列表";
-                        link.href = objectUrl;
-                        link.setAttribute("download", fname);
-                        document.body.appendChild(link);
-                        link.click();
-                    }
-                })
-                load.endLoading();
-            }).catch(error => {
-                this.$message.error('导出数据失败，请联系管理员');
-                load.endLoading();
+              });
+              let text = new Response(blob).text();
+              text.then((res) => {
+                // 判断是否报错
+                if (res.indexOf("code") != -1) {
+                  let json = JSON.parse(res);
+                  this.$message.error(json.msg);
+                } else {
+                  let objectUrl = URL.createObjectURL(blob);
+                  let link = document.createElement("a");
+                  let nowTime = new Date();
+                  let ymd =
+                    nowTime.getFullYear() +
+                    "" +
+                    (nowTime.getMonth() + 1) +
+                    "" +
+                    nowTime.getDate() +
+                    "" +
+                    nowTime.getHours() +
+                    "" +
+                    nowTime.getMinutes();
+                  let fname = ymd + "考级报名列表";
+                  link.href = objectUrl;
+                  link.setAttribute("download", fname);
+                  document.body.appendChild(link);
+                  link.click();
+                }
+              });
+              load.endLoading();
+            })
+            .catch((error) => {
+              this.$message.error("导出数据失败，请联系管理员");
+              load.endLoading();
             });
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -298,8 +329,8 @@ export default {
   }
 }
 /deep/.el-image-viewer__close {
-    color: #fff;
-    opacity: 1;
+  color: #fff;
+  opacity: 1;
 }
 /deep/.el-date-editor.el-input {
   width: 100% !important;
@@ -308,10 +339,10 @@ export default {
   width: 100% !important;
 }
 /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;
 }
 </style>

src/views/teacherManager/teacherList.vue

@@ -134,7 +134,9 @@
           </el-table-column>
           <el-table-column align="center"
                            label="人事状态">
-            <template slot-scope="scope">{{ scope.row.isProbationPeriod | isProbationPeriod }} </template>
+            <template slot-scope="scope">
+              {{ scope.row.isProbationPeriod == 0 ? '正式' : '试用' }}
+            </template>
           </el-table-column>
           <el-table-column align="center"
                            prop="vipNum"

src/views/vipClass/vipList.vue

@@ -103,7 +103,19 @@
                            label="课程组编号"></el-table-column>
           <el-table-column align="center"
                            prop="name"
-                           label="课程名称"></el-table-column>
+                           label="课程名称">
+            <template slot-scope="scope">
+              <el-tooltip placement="top-start">
+                  <div slot="content">{{ scope.row.name }}</div>
+                  <div style="overflow: hidden; text-overflow: ellipsis;  white-space: nowrap;">
+                    <span>{{ scope.row.name }}</span>
+                  </div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="vipGroupCategoryName"
+                           label="课程形式"></el-table-column>
           <el-table-column align="center"
                            prop="status"
                            label="课程状态">
@@ -180,6 +192,10 @@
             </template>
           </el-table-column>
           <el-table-column align="center"
+                           prop="stopReason"
+                           label="备注">
+          </el-table-column>
+          <el-table-column align="center"
                            width="150px"
                            fixed="right"
                            label="操作">
@@ -198,12 +214,12 @@
                             v-if="scope.row.status < 3 && scope.row.enableDelete != 1 && permission('vipGroupManage/stopVipGroup')"
                             :ref="scope.$index">
                   <p style="margin-bottom:10px;">确定停止该vip课?</p>
-                  <el-input v-model.trim="scope.row.stopReason"
+                  <el-input v-model.trim="stopReason"
                             placeholder="请输入关闭原因"></el-input>
                   <div style="text-align: right; margin-top: 20px">
                     <el-button size="mini"
                                type="text"
-                               @click="scope._self.$refs[scope.$index].doClose()">取消</el-button>
+                               @click="onCancelVip(scope)">取消</el-button>
                     <el-button type="primary"
                                size="mini"
                                @click="closeVip(scope)">确定</el-button>
@@ -277,7 +293,8 @@ export default {
         { lable: "已结束", value: "4" },
         { lable: "取消", value: "3" },
         { lable: "暂停", value: "6" }
-      ]
+      ],
+      stopReason: null, // 停止原因
     };
   },
   created () {
@@ -344,7 +361,7 @@ export default {
       params.status = this.searchForm.status || null;
       getVipList(params).then(res => {
         if (res.code == 200) {
-          this.tableData = [];
+          // this.tableData = [];
           setTimeout(() => {
             this.tableData = res.data.rows;
           }, 50);
@@ -365,7 +382,7 @@ export default {
     },
     closeVip (scope) {
       let id = scope.row.id;
-      closeVip({ vipGroupId: id, stopReason: scope.row.stopReason }).then(
+      closeVip({ vipGroupId: id, stopReason: this.stopReason }).then(
         res => {
           if (res.code == 200) {
             this.$message.success("停止课程成功");
@@ -375,6 +392,10 @@ export default {
         }
       );
     },
+    onCancelVip(scope) {
+      this.stopReason = null
+      scope._self.$refs[scope.$index].doClose()
+    },
     gotoBuildVip () {
       let rules = JSON.stringify(this.rules);
       let searchForm = JSON.stringify(this.searchForm);

src/views/workBenchManager/journal/vipApply.vue

@@ -243,7 +243,7 @@ export default {
         if (res.code == 200) {
           this.showRight = true
           this.showMessage = res.data
-          this.reason = res.data.stopReason
+          this.reason = res.data.memo
         } else {
           this.$message.error(res.msg)
         }

vue.config.js

@@ -14,7 +14,7 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // You can change the port by the following methods:
 // port = 9528 npm run dev OR npm run dev --port = 9528
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
-// http://47.99.212.176:8000 
+// http://47.99.212.176:8000
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://dyme.utools.club' //test环境