Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/finance/marketCommissionfrom.vue

@@ -123,7 +123,7 @@
                      <q-checkbox v-model="personnel" label="全选" @input='getallpersonnel(1)'/>
                 </div>
             </div>
-            <div style="display: flex;align-items: center;margin-bottom: 15px;">
+            <!-- <div style="display: flex;align-items: center;margin-bottom: 15px;">
                 <q-select
                     filled
                     stack-label
@@ -147,7 +147,7 @@
                  <div class="q-gutter-sm" style="margin-right: 18px;">
                      <q-checkbox v-model="branch" label="全选" @input='getallpersonnel(2)'/>
                 </div>
-            </div>
+            </div> -->
 
 
             <div>

src/pages/financial/market/commissionRule.vue

@@ -73,8 +73,8 @@
             <th width="">课程</th>
             <th width="7%">首次发放比例</th>
             <th width="10%">课程比例</th>
-            <th width="10%">提成人员</th>
-            <th width="10%">部门人员</th>
+            <th width="10%">参与人员</th>
+            <!-- <th width="10%">部门人员</th> -->
             <th width="10%">操作</th>
           </tr>
           <tr>
@@ -129,7 +129,7 @@
               </el-popover>
             </td>
 
-            <td style="padding: 0 10px;">
+            <!-- <td style="padding: 0 10px;">
               <span v-for="( son , sIndex ) in item.ChildEmpList" :key="sIndex">
                 <span v-if="sIndex<8">{{ son.EmployeeName }}{{item.ChildEmpList.length==sIndex+1?'':'、'}}</span>
               </span>
@@ -142,7 +142,7 @@
                 :content="item.ChildEmpListtext">
                 <el-button slot="reference" style="border: none;" type="text">查看更多</el-button>
               </el-popover>
-            </td>
+            </td> -->
             <td>
               <q-btn
                 flat
@@ -229,7 +229,7 @@
               >{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<=人头<=':'<=人头'}}</span><span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span></th>
             </tr>
             <tr style="">
-              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.ZGAwardList" :key="sIndex">{{ son.Rate }}</td>
+              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.ZGAwardList" :key="sIndex">{{ son.Rate }}/人</td>
 
             </tr>
           </table>

src/pages/stuMan/stuClassManage.vue

@@ -68,13 +68,19 @@
             label="学习课程" @clear="getClassList" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-input v-model="msg.StartTime" mask="date" label="开班时间" standout="bg-primary text-white"
-            @update:model-value="()=>getClassList">
+          <!-- <q-field filled dense label="开始时间" standout="bg-primary text-white">
+            <template v-slot:control>
+              <el-date-picker type="date" style="width:100%" v-model="msg.StartTime" value-format="yyyy-MM-dd"
+                placeholder="开班时间" @change="getClassList">
+              </el-date-picker>
+            </template>
+          </q-field> -->
+          <q-input v-model="msg.StartTime" mask="date" label="开班时间" standout="bg-primary text-white" clearable
+            @clear="getClassList">
             <template v-slot:append>
               <q-icon name="event" class="cursor-pointer">
                 <q-popup-proxy ref="qCStartTime" transition-show="scale" transition-hide="scale">
-                  <q-date v-model="msg.StartTime" mask="YYYY-MM-DD" @input="() =>changeDate()"
-                    @update:model-value="()=>getClassList" />
+                  <q-date v-model="msg.StartTime" mask="YYYY-MM-DD" @input="() =>changeDate()" />
                 </q-popup-proxy>
               </q-icon>
             </template>