页面修改

src/api/finance/index.js

@@ -6,11 +6,11 @@ import request_zc from '../../utils/request_zc'
  *
  */
 export function GetClassBalanceSheet(data) {
-    return request({
-        url: '/Finance/GetClassBalanceSheet',
-        method: 'post',
-        data
-    })
+  return request({
+    url: '/Finance/GetClassBalanceSheet',
+    method: 'post',
+    data
+  })
 }
 /**
  * 根据 班级ids 获取班级信息
@@ -49,24 +49,36 @@ export function getEasyReportList(data) {
 // 财务单据 资产采购详情
 export function getPropertyProcurementInfo(data) {
   return request_zc({
-      url: '/property/GetPropertyProcurementInfo',
-      method: 'post',
-      data
+    url: '/property/GetPropertyProcurementInfo',
+    method: 'post',
+    data
   });
 }
 // 财务单据 耗材采购详情
 export function getSuppliesProcurementInfo(data) {
   return request_zc({
-      url: '/supplies/GetSuppliesProcurementInfo',
-      method: 'post',
-      data
+    url: '/supplies/GetSuppliesProcurementInfo',
+    method: 'post',
+    data
   });
 }
 // 财务单据 教育出库详情
 export function getStockOutPageList(data) {
   return request_zc({
-      url: '/Warehouse/GetStockOutPageList',
-      method: 'post',
-      data
+    url: '/Warehouse/GetStockOutPageList',
+    method: 'post',
+    data
   });
-}
+}
\ No newline at end of file
+
+/**
+ * 根据 班级编号获取插班报名配置信息
+ *
+ */
+export function queryChaClassInfo(data) {
+  return request({
+    url: '/order/GetChaClassInfo',
+    method: 'post',
+    data
+  })
+}

src/api/sale/sale.js

@@ -319,3 +319,16 @@ export function getMyStudyOrderPage(data) {
     data
   })
 }
+
+/**
+ * 根据 班级编号获取插班报名配置信息
+ *
+ */
+export function queryChaClassInfo(data) {
+  return request({
+    url: '/order/GetChaClassInfo',
+    method: 'post',
+    data
+  })
+}
+

src/components/sale/editOrder-form.vue

@@ -32,50 +32,30 @@
         <q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name"
           v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
           label="客人来源" />
-        <!--课程订单订单-->
-        <template v-if="orderType==1||OrderMsg.OrderType==1">
-          <q-select :disable="(modityOrderType==2)" v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled
-            use-input label="协助人员" option-label="EmployeeName" option-value="Id" ref="EmployeeName"
-            class="col-6 q-pb-lg" emit-value map-options @filter="filterFn">
-            <template v-slot:no-option>
-              <q-item>
-                <q-item-section class="text-grey">
-                  未找到相关数据
-                </q-item-section>
-              </q-item>
-            </template>
-          </q-select>
-          <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==3" filled stack-label :dense="false"
-            maxlength="50" v-model="OrderMsg.GeneralOccupation" class="col-12 q-pb-lg" label="一般同行" />
-          <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==7" filled stack-label :dense="false"
-            maxlength="50" v-model="OrderMsg.EduOccupation" class="col-12 q-pb-lg" label="教育同行" />
-          
-          <q-select v-if="classHour==1" v-model="OrderMsg.ClassHour" :options="CourseList" filled
-            use-input label="已上课时" option-label="Name" option-value="Id"
-            class="col-6 q-pb-lg" emit-value map-options>
-          </q-select>
 
-          <q-toggle :disable="(modityOrderType==2)" v-model="OrderMsg.IsLessPrice" :false-value="0" :true-value="1"
-            label="是否少价" class="q-mb-md" />
-
-          <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.IsLessPrice==1"
-            @keyup.native="checkPrice(OrderMsg,'LessPrice')" maxlength="10" filled stack-label :dense="false"
-            v-model="OrderMsg.LessPrice" class="col-12" label="少价金额" />
-        </template>
-        <!--留学就业订单-->
-        <template v-if="orderType==2||OrderMsg.OrderType==2">
-          <q-select standout="bg-primary text-white" option-value="Id" class="q-pb-lg" option-label="Name"
-            v-model="OrderMsg.OrderNature" :options="OrderStatus" emit-value map-options label="订单性质"
-            @input="OrderNatureChange" />
-          <template v-if="OrderMsg.OrderNature==1">
-            <q-input filled stack-label :dense="false" maxlength="10" @keyup.native="checkPrice(OrderMsg,'PreferPrice')"
-              :disable="true" v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg" label="应收" />
-          </template>
-          <template v-else>
-            <q-input filled stack-label :dense="false" maxlength="10" @keyup.native="checkPrice(OrderMsg,'PreferPrice')"
-              :disable="!isHaveModify" v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg" label="应收" />
+        <q-select :disable="(modityOrderType==2)" v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled
+          use-input label="协助人员" option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pb-lg"
+          emit-value map-options @filter="filterFn">
+          <template v-slot:no-option>
+            <q-item>
+              <q-item-section class="text-grey">
+                未找到相关数据
+              </q-item-section>
+            </q-item>
           </template>
-        </template>
+        </q-select>
+        <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==3" filled stack-label :dense="false"
+          maxlength="50" v-model="OrderMsg.GeneralOccupation" class="col-12 q-pb-lg" label="一般同行" />
+        <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==7" filled stack-label :dense="false"
+          maxlength="50" v-model="OrderMsg.EduOccupation" class="col-12 q-pb-lg" label="教育同行" />
+        <q-select  v-model="OrderMsg.ClassHour" :options="CourseList" filled use-input label="已上课时"
+          option-label="Name" option-value="Id" class="col-6 q-pb-lg" emit-value map-options>
+        </q-select>
+        <q-toggle :disable="(modityOrderType==2)" v-model="OrderMsg.IsLessPrice" :false-value="0" :true-value="1"
+          label="是否少价" class="q-mb-md" />
+        <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.IsLessPrice==1"
+          @keyup.native="checkPrice(OrderMsg,'LessPrice')" maxlength="10" filled stack-label :dense="false"
+          v-model="OrderMsg.LessPrice" class="col-12" label="少价金额" />
         <q-input filled stack-label :dense="false" v-model="OrderMsg.SaleRemark" style="margin-top: 20px"
           type="textarea" class="col-12" label="备注" />
         <div style="margin:30px 10px 70px 0;">
@@ -120,11 +100,6 @@
         type: Number,
         default: 0, //1-销售修改，2-OP修改，3-总经理修改
       },
-      //已上课时
-      classHour: {
-        type: Number,
-        default: 0,
-      }
     },
     data() {
       return {
@@ -147,7 +122,7 @@
           LessPrice: 0, //少价金额
           OrderNature: 1, //订单性质
           OldPreferPrice: 0, //原实际应收
-          ClassHour:1 //已上课时
+          ClassHour: 1 //已上课时
         },
         IsShowUpPrice: false, //是否显示高于定价
         StepPriceList: [],
@@ -170,12 +145,12 @@
         ],
         isHaveModify: false,
         //已上课时
-        CourseList:[{
-          Id:1,
-          Name:'第一课'
-        },{
-          Id:2,
-          Name:'第二课'
+        CourseList: [{
+          Id: 1,
+          Name: '第一课'
+        }, {
+          Id: 2,
+          Name: '第二课'
         }]
       }
     },
@@ -193,7 +168,7 @@
       }
     },
     mounted() {
-      console.log(this.modityOrderType,'modityOrderType');
+      console.log(this.modityOrderType, 'modityOrderType');
       this.initData()
     },
     methods: {

src/components/sale/orderlist.vue

@@ -700,11 +700,16 @@
         <!--取消订单-->
       </table>
     </div>
-    <!--修改订单-->
+    <!--修改课程订单-->
     <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="orderObj.OrderType"
       @close="closeOrderSaveForm" @success="refreshOrder" :modityOrderType="newModityOrderType">
     </editorder-form>
 
+    <!--修改留学就业订单-->
+    <studyorder-form v-if="isShowSttudyOrderForm" :save-obj="orderObj" :orderType="orderObj.OrderType"
+      @close="closeOrderSaveForm" @success="refreshOrder" :modityOrderType="newModityOrderType">
+    </studyorder-form>
+
     <!--修改订单备注-->
     <orderremark-form v-if="isShowRemarkOrderForm" :save-obj="orderObj" :remarkType="remarkType"
       @close="closeRemarkForm" @success="refreshOrder"></orderremark-form>
@@ -744,6 +749,7 @@
 
 <script>
   import editorderForm from '../sale/editorder-form' //修改订单
+  import studyorderForm from '../sale/studyOrder-form' //留学就业订单
   import orderremarkForm from '../sale/orderremark-form' //订单备注
   import transOrderForm from '../sale/transOrder-form' //转交订单
   import backclassForm from '../sale/backclass-form' //退课申请
@@ -777,7 +783,8 @@
       moneyForm,
       continueclassForm,
       viewquotationForm,
-      eduinfoForm
+      eduinfoForm,
+      studyorderForm
     },
     props: {
       //正常订单
@@ -803,6 +810,7 @@
     data() {
       return {
         isShowEditOrderForm: false, //是否显示订单修改
+        isShowSttudyOrderForm:false,//是否显示留学就业订单
         isShowRemarkOrderForm: false, //是否线下修改订单备注
         isShowTransOrderForm: false, //是否显示转交订单
         isShowBackClassForm: false, //是否显示退课申请
@@ -865,7 +873,6 @@
           }
         })
       }
-
     },
     watch: {
       modityOrderType: {

src/pages/sale/japaneseTrain.vue

@@ -143,9 +143,7 @@
                           </div>
                           <div v-if="item.ClassStyle==3">
                             <el-calendar v-model="elvalue" id="calendar" style="width: 500px;">
-                              <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
                               <template slot="dateCell" slot-scope="{date, data}" class="row" style="height: 45px">
-                                <!--自定义内容-->
                                 <div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div>
                                 <div v-for="x in item.ClassPlanList">
                                   <div v-if="x.ClassDate == data.day"
@@ -201,15 +199,6 @@
                               </template>
                             </tbody>
                           </table>
-                          <!-- <div
-                            style="font-size: 12px;color: #2D2D2D;font-weight: bold;height: 40px;width: 454px;line-height: 40px;display: flex;border-bottom: 1px solid rgba(138, 138, 138, 0.09);"
-                            >
-
-                            <div style="width: 50%;padding-left: 20px">
-                              第{{zi+1}}节
-                            </div>
-                            <div>{{zx.StartTime}}-{{zx.EndTime}}</div>
-                          </div> -->
                         </div>
                       </div>
                     </q-banner>
@@ -250,7 +239,7 @@
               <div class="d7">
                 <div>
                   <q-btn style="margin-top:20px;" color="primary" size="sm" label="立即下单" v-if="item.IsCanApply==1"
-                    @click="placeAnorder(item,-1)" />
+                    @click="placeAnorder(item,1)" />
                 </div>
                 <div v-if="item.IsCanApply==0">
                   <img src="../../assets/images/administration/bmym.png" alt=""
@@ -261,8 +250,10 @@
                 <div>
                   <q-btn style="margin-top:10px;" size="sm" color="primary" label="订单中心" @click="goclassorder(item)" />
                 </div>
-                <div>
-                  <q-btn style="margin-top:10px;" size="sm" color="primary" label="插班报名" @click="placeAnorder(item,1)" />
+                <!--插班报入-->
+                <div v-if="item.IsChaBan==1">
+                  <q-btn style="margin-top:10px;" size="sm" color="primary" label="插班报名"
+                    @click="placeAnorder(item,3)" />
                 </div>
               </div>
             </div>
@@ -283,8 +274,8 @@
         </ul>
         <div v-else style="width: 100%;color: #999999;text-align: center;font-size: 15px">暂无数据</div>
       </div>
-      <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="1" :classHour="classHour" @close="closeOrderSaveForm"
-        @success="refreshOrder">
+      <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="orderType" :modityOrderType="1"
+        @close="closeOrderSaveForm" @success="refreshOrder">
       </editorder-form>
     </div>
   </div>
@@ -342,7 +333,7 @@
           ClassId: 0,
           Unit_Price: 0,
         },
-        classHour:-1
+        orderType: 1, //订单类型(1-正常报入，3-插班报入)
       }
     },
     created() {
@@ -355,7 +346,7 @@
       var month = nowDay.getMonth() + 1; //月
       var day = nowDay.getDate(); //日
       var currentDay = year + '-' + month + '-' + day;
-      this.msg.StartTime = currentDay
+      // this.msg.StartTime = currentDay
     },
     mounted() {
       this.getList();
@@ -504,8 +495,8 @@
         })
       },
       //立即报名和插班报名
-      placeAnorder(item,type) {
-        this.classHour=type;
+      placeAnorder(item, type) {
+        this.orderType = type;
         this.orderObj.ClassId = item.ClassId;
         this.orderObj.Unit_Price = item.SellPrice;
         this.isShowEditOrderForm = true;

src/pages/sale/studyjob.vue

@@ -120,8 +120,8 @@
       <q-dialog v-model="showForm" persistent>
         <quotationstudy-form :obj="null" @save="showForm=false"></quotationstudy-form>
       </q-dialog>
-      <editorderForm v-if="isShowOrderForm" :save-obj="studyObj" :orderType="2" @close="cloStudyform"
-        @save="refreshPage()"></editorderForm>
+      <studyorderForm v-if="isShowOrderForm" :save-obj="studyObj" :orderType="2" @close="cloStudyform"
+        @save="refreshPage()"></studyorderForm>
     </div>
   </div>
 </template>
@@ -131,7 +131,7 @@
     queryStudyAbroadPage
   } from '../../api/studyabroad/index'
   import quotationstudyForm from '../../components/sale/quotationstudy-form'
-  import editorderForm from '../../components/sale/editorder-form'
+  import studyorderForm from '../../components/sale/studyOrder-form'
   import {
     mapState
   } from "vuex";
@@ -142,7 +142,7 @@
     },
     components: {
       quotationstudyForm,
-      editorderForm
+      studyorderForm
     },
     data() {
       return {