修改

src/components/sale/orderlist.vue

@@ -297,9 +297,14 @@
                       <q-item-label @click="showContinueClass(item)">续课</q-item-label>
                     </q-item-section>
                   </q-item>
-                  <q-item clickable v-close-popup v-close-popup v-if="AuthorityObj.isShowTransOrder">
+                  <q-item clickable v-close-popup v-close-popup v-if="AuthorityObj.isShowTransClassOrder">
                     <q-item-section>
-                      <q-item-label @click="transferClass(item)">转班</q-item-label>
+                      <q-item-label @click="transferClass(item,1)">转班</q-item-label>
+                    </q-item-section>
+                  </q-item>
+                  <q-item clickable v-close-popup v-if="AuthorityObj.isShowSeparater">
+                    <q-item-section>
+                      <q-item-label @click="transferClass(item,2)">分拆</q-item-label>
                     </q-item-section>
                   </q-item>
                 </q-list>
@@ -812,7 +817,7 @@
       @success="refreshOrder"></continueclass-form>
 
     <!-- 转班申请 -->
-    <transferclass-form v-if="isShowTransferClass" :save-obj="orderObj" @close="closeTransferClassForm"
+    <transferclass-form v-if="isShowTransferClass" :save-obj="orderObj" :ChangeType="ChangeType" @close="closeTransferClassForm"
       @success="refreshOrder"></transferclass-form>
 
     <!-- 查看报价单 -->
@@ -936,6 +941,7 @@
           isShowContract: true, //是否显示合同
           isShowEdit: true, //是否显示修改订单按钮
           isShowTransClassOrder: false, //是否显示转班按钮
+          isShowSeparater:false //是否显示分拆
         },
 
         isShowEduForm: false, //是否显示新增修改合同弹窗
@@ -947,7 +953,8 @@
         isEditOrder: false, //是否有【总经理】修改订单但权限
         newModityOrderType: 0,
         isChaBan: 0, //是否插班(0-正常报入，1-插班报入)
-        isShowTransferClass: false //是否显示转班
+        isShowTransferClass: false, //是否显示转班
+        ChangeType:1 //1-转班 2-分拆
       }
     },
     created() {
@@ -1038,6 +1045,9 @@
           if (this.authObj.isShowTransClassOrder != null && this.authObj.isShowTransClassOrder) {
             this.AuthorityObj.isShowTransClassOrder = this.authObj.isShowTransClassOrder;
           }
+          if (this.authObj.isShowSeparater !=null && this.authObj.isShowSeparater){
+            this.AuthorityObj.isShowSeparater = this.authObj.isShowSeparater;
+          }
         }
       },
       //关闭报价单
@@ -1090,8 +1100,9 @@
       },
 
       //转班
-      transferClass(item) {
+      transferClass(item,type) {
         this.orderObj = item;
+        this.ChangeType = type;
         this.isShowTransferClass = true;
       },
 

src/components/sale/transferclass-form.vue

@@ -110,7 +110,8 @@
       <template v-if="isShowTuike">
         <q-card-section>
           <div class="text-h6">
-            转班申请<span class="Title_remark">注：找不到学员？请确认学员是否已退课或已续班</span>
+            {{transMsg.ChangeType==1?'转班申请':'分拆'}}
+            <span class="Title_remark">注：找不到学员？请确认学员是否已退课或已续班</span>
           </div>
         </q-card-section>
         <div style="margin:20px;border-bottom:1px solid #E2E2E2">
@@ -124,9 +125,13 @@
             </span>
             <span style="width:10%">{{item.GuestStateStr}}</span>
             <span style="width:20%;" class="guest_Status">
-              <span v-if="item.GuestState==1" @click="clickItem(item)">转班</span>
+              <span v-if="item.GuestState==1" @click="clickItem(item)">
+                {{transMsg.ChangeType==1?'转班':'分拆'}}
+              </span>
               <template v-if="chooseItem&&chooseItem.Id==item.Id">
-                <span style="margin-left:10px;" @click="cancelApply">取消转班</span>
+                <span style="margin-left:10px;" @click="cancelApply">
+                  取消{{transMsg.ChangeType==1?'转班':'分拆'}}
+                </span>
               </template>
             </span>
           </div>
@@ -162,33 +167,35 @@
               <td></td>
             </tr>
           </table>
-          <div class="row" style="margin-top:20px;">
-            <q-input filled v-model="transMsg.OutTime" class="col-6 q-pr-lg" mask="date" label="转出日期">
-                <template v-slot:append>
-                <q-icon name="event" class="cursor-pointer">
-                    <q-popup-proxy ref="qDateProxy1" transition-show="scale" transition-hide="scale">
-                    <q-date v-model="transMsg.OutTime" :options="optionsFn2" @input="getOutTime" />
-                    </q-popup-proxy>
-                </q-icon>
-                </template>
-            </q-input>
-            <q-input filled v-model="transMsg.EffectiveDate" class="col-6" mask="date" label="生效日期">
-                <template v-slot:append>
-                <q-icon name="event" class="cursor-pointer">
-                    <q-popup-proxy ref="qDateProxy2" transition-show="scale" transition-hide="scale">
-                    <q-date v-model="transMsg.EffectiveDate" :options="optionsFn" @input="checkEffectDate()" />
-                    </q-popup-proxy>
-                </q-icon>
-                </template>
-            </q-input>
-          </div>
+          <template v-if="transMsg.ChangeType==1">
+            <div class="row" style="margin-top:20px;">
+              <q-input filled v-model="transMsg.OutTime" class="col-6 q-pr-lg" mask="date" label="转出日期">
+                  <template v-slot:append>
+                  <q-icon name="event" class="cursor-pointer">
+                      <q-popup-proxy ref="qDateProxy1" transition-show="scale" transition-hide="scale">
+                      <q-date v-model="transMsg.OutTime" :options="optionsFn2" @input="getOutTime" />
+                      </q-popup-proxy>
+                  </q-icon>
+                  </template>
+              </q-input>
+              <q-input filled v-model="transMsg.EffectiveDate" class="col-6" mask="date" label="生效日期">
+                  <template v-slot:append>
+                  <q-icon name="event" class="cursor-pointer">
+                      <q-popup-proxy ref="qDateProxy2" transition-show="scale" transition-hide="scale">
+                      <q-date v-model="transMsg.EffectiveDate" :options="optionsFn" @input="checkEffectDate()" />
+                      </q-popup-proxy>
+                  </q-icon>
+                  </template>
+              </q-input>
+            </div>
+          </template>
           <q-input filled stack-label :dense="false" v-model="transMsg.Remarks" style="margin-top: 20px" type="textarea"
-            class="col-12" label="转班原因" />
+            class="col-12" :label="transMsg.ChangeType==1?'转班原因':'分拆原因'" />
           <q-separator />
         </div>
         <q-card-actions align="right" class="bg-white">
           <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeContinueClassForm" />
-          <q-btn label="确认转班" color="accent" class="q-px-md" style="font-weight:400 !important"
+          <q-btn :label="transMsg.ChangeType==1?'确认转班':'确认分拆'" color="accent" class="q-px-md" style="font-weight:400 !important"
             @click="setRenewOrder" />
         </q-card-actions>
       </template>
@@ -312,6 +319,10 @@
         type: Object,
         default: null,
       },
+      ChangeType: {
+        type: Number,
+        default: null
+      }
     },
     data() {
       return {
@@ -367,6 +378,7 @@
       this.continueClassMsg.OrderId = this.saveObj.OrderId;
       this.continueClassMsg.ClassId = this.saveObj.ClassId;
       this.classMsg.ClassId = this.saveObj.ClassId;
+      this.transMsg.ChangeType = this.ChangeType;
 
       this.getSchool();
       this.GetClassTypeList();

src/pages/sale/myOrder.vue

@@ -170,6 +170,7 @@
           isShowBackClass: true, //显示退课按钮
           isShowRenewClass: true, //显示续课按钮
           isShowTransClassOrder:true,//现在转班按钮
+          isShowSeparater: true //显示分拆按钮
         }
       }
     },