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

src/components/sale/editOrder-form.vue

@@ -20,7 +20,7 @@
         </div>
       </div>
       <div style="padding:20px 15px;">
-        <q-input filled stack-label maxlength="100" :dense="false" @keyup.native="checkInteger(OrderMsg,'GuestNum')"
+        <q-input filled stack-label maxlength="3" :dense="false" @keyup.native="checkInteger(OrderMsg,'GuestNum')"
           v-model="OrderMsg.GuestNum" @input="calcPrice()" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']"
           :disable="modityOrderType==2" />
         <template v-if="isChaBan==1">

src/components/sale/offertransorder-form.vue

@@ -95,7 +95,7 @@
                                 <q-item-label v-html="opt.ClassName"></q-item-label>
                               </q-item-section>
                               <q-item-section side>
-                                 <q-item-label v-html="opt.OpenTime"></q-item-label>
+                                 <q-item-label v-html="opt.OpenTime+'【'+opt.ClassNo+'】'"></q-item-label>
                               </q-item-section>
                             </q-item>
                           </template>

src/components/schedul/exorder-form.vue

@@ -27,7 +27,18 @@
 
         <q-select filled v-model="OrderMsg.ClassId" class="q-pb-lg" ref="ClassId" :options="classList"
           option-label="ClassName" option-value="ClassId" emit-value map-options :rules="[val => !!val || '请选择班级']"
-          label="选择班级" @input="getClassList(OrderMsg.ClassId)" />
+          label="选择班级" @input="getClassList(OrderMsg.ClassId)">
+          <template v-slot:option="{ itemProps, itemEvents, opt, selected, toggleOption }">
+            <q-item v-bind="itemProps" v-on="itemEvents">
+              <q-item-section>
+                <q-item-label v-html="opt.ClassName"></q-item-label>
+              </q-item-section>
+              <q-item-section side>
+                <q-item-label v-html="opt.OpenTime+'【'+opt.ClassNo+'】'"></q-item-label>
+              </q-item-section>
+            </q-item>
+          </template>
+        </q-select>
 
         <q-select filled option-value="CourseId" option-label="CourseName" ref="CourseId" v-model="OrderMsg.CourseId"
           :options="CourseList" emit-value map-options class="q-pb-lg" :rules="[val => !!val || '请选择课程']" label="选择课程"
@@ -64,7 +75,7 @@
         <q-input v-if="OrderMsg.IsLessPrice==1" @input="calcPrice()" @keyup.native="checkPrice(OrderMsg,'PerLessMoney')"
           maxlength="10" filled stack-label :dense="false" v-model="OrderMsg.PerLessMoney" class="col-12"
           label="少价金额(每人)" :hint="'总少价金额：'+(OrderMsg.PerLessMoney*OrderMsg.GuestNum)" />
-          
+
         <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;">
@@ -198,7 +209,9 @@
             }
             tempArray.unshift({
               ClassId: 0,
-              ClassName: "不限"
+              ClassName: "不限",
+              ClassNo:'',
+              OpenTime:'',
             })
             this.classList = tempArray;
           }

src/pages/exam/examEdit.vue

@@ -208,10 +208,10 @@
   <div class="examPaper page-body">
     <div class="examPaper_Top">
       <div style="width:80%;display:flex;">
-        <div style="width:40%;margin:0 20px;">
+        <div style="width:36%;margin:0 20px;">
           <q-input filled label="标题" v-model="DataObj.PaperName" />
         </div>
-        <div style="width:20%;">
+        <div style="width:24%;">
           <q-select filled option-value="Id" option-label="Name" :options="questionDifficultyTypeList" emit-value
             map-options label="难度" use-input clearable v-model="DataObj.DifficultyType" />
         </div>
@@ -224,8 +224,8 @@
     <div class="Exam-main">
       <div class="Exam-left f1">
         <p class="Left-ptitel">
-          <span>题量：<i>10</i></span>
-          <span>  总分：<i>50.0</i></span>
+          <span>题量：<i>{{examNum}}</i></span>
+          <span>  总分：<i>{{examScore}}</i></span>
         </p>
         <div class="Left-list" style="height:740px;overflow:auto;">
           <template v-if="DataObj&&DataObj.GroupList&&DataObj.GroupList.length>0">
@@ -250,7 +250,7 @@
                   <span class="exam_ListSHow">
                     <i class="iconfont icon-shangyi2" @click.stop="MoveChildItem(gIndex,dIndex,0)" style="margin-right:5px;" v-if="dIndex!=0"></i>
                     <i class="iconfont icon-xiayi" @click.stop="MoveChildItem(gIndex,dIndex,1)" v-if="dIndex!=gItem.DetailsList.length-1"></i>
-                    <i class="iconfont icon-shanchu2" style="margin-left:5px;font-size:17px;"></i> 
+                    <i class="iconfont icon-shanchu2" @click.stop="delExam(gItem.DetailsList,dIndex)" style="margin-left:5px;font-size:17px;"></i> 
                   </span>
                 </li>
               </ul>
@@ -436,7 +436,9 @@
         firstTypeList: [], //第一类题型
         secondTypeList: [], //第二类题型
         isShowQuestion: false,
-        commonIndex: -1
+        commonIndex: -1,
+        examNum:0, //题量
+        examScore:0 //总分
       }
     },
     created() {
@@ -494,6 +496,10 @@
           }
         }
       },
+      //删除题目
+      delExam(item,index){
+        item.splice(index,1);
+      },
       //点击修改标题名字和分数
       getNameEdit(item,index){
         item.forEach(x=>{
@@ -566,8 +572,14 @@
           if (res.Code == 1) {
             this.DataObj = res.Data;
           }
+          this.examScore = 0;
+          this.examNum = 0;
           this.DataObj.GroupList.forEach(x=>{
             x.isShowEdit = false;
+            this.examNum += x.DetailsList.length;
+            x.DetailsList.forEach(y=>{
+              this.examScore += y.Score;
+            })
           })
         })
       },