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

src/App.vue

@@ -20,7 +20,7 @@ export default {
 </script>
 
 <style>
-@import url("//at.alicdn.com/t/font_2077629_dvjvubdhonm.css");
+@import url("//at.alicdn.com/t/font_2077629_2mw9x18p9pv.css");
 .q-scrollarea__thumb {
   z-index: 999999 !important;
 }

src/components/enterprise/welcome-from.vue

@@ -342,12 +342,11 @@
             insert(type) {
                 if(type==1){
                     this.addMsg.Content = this.addMsg.Content + '##客户名称##'
+                }else if(type==2){
+                    this.addMsg.Content = this.addMsg.Content + '##员工名称##'
+                }else{
+                    this.addMsg.Content = this.addMsg.Content + '##员工别名##'
                 }
-                // else if(type==2){
-                //     this.addMsg.Content = this.addMsg.Content + '##员工名称##'
-                // }else{
-                //     this.addMsg.Content = this.addMsg.Content + '##员工别名##'
-                // }
                 this.gettrigger()
             },
             selectimg() {//素材选择 图片模式

src/components/questiontype/v-cloze.vue

@@ -37,7 +37,18 @@
   .vClozeQuestionBold {
     font-weight: bold;
   }
-
+  .chooseOptionList:before{
+      content: "-";
+      display: block;
+      line-height: 1.5em;
+      color: transparent;
+  }
+  .chooseOptionList:after{
+      content: "-";
+      display: block;
+      line-height: 1em;
+      color: transparent;
+  }
 </style>
 <template>
   <div class="vClozeQuestion">
@@ -54,7 +65,7 @@
         </thead>
         <tbody class="chooseOptionList">
           <tr v-for="(subItem,subIndex) in item.OptionList" :key="subIndex">
-            <td style="width:40px;text-align:center;">
+            <td style="width:40px;text-align:center;height:50px;">
               <template v-if="isOperate">
                 <div class="Answer_List" @click="ChangeItem(item,subItem)" :class="{'Is_Answer':subItem.IsAnswer}">
                   {{subItem.Name}}

src/components/questiontype/v-matching.vue

@@ -23,11 +23,10 @@
   .v_matchingQuestionBold {
     font-weight: bold;
   }
-
 </style>
 <template>
   <div class="v_matchingQuestion">
-    <table v-if="data&&data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable">
+    <table v-if="data&&data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable" style="width:360px;">
       <thead>
         <tr>
           <th colspan="2">第一组</th>
@@ -58,12 +57,14 @@
           <span class="line_center"></span>
         </td>
         <td>
-          <select v-model="data.QuestionContentObj[2][index].Content" class="selectBox2">
-            <template v-for="(cItem,cIndex) in data.QuestionContentObj[1]">
-              <option :key="cIndex" :label="cItem.Name" :value="cItem.Name">
-              </option>
-            </template>
-          </select>
+          <el-select v-model="data.QuestionContentObj[2][index].Content" style="width:100px" size="small" placeholder="请选择">
+            <el-option
+              v-for="(cItem,cIndex) in data.QuestionContentObj[1]"
+              :key="cIndex"
+              :label="cItem.Name"
+              :value="cItem.Name">
+            </el-option>
+          </el-select>
         </td>
       </tr>
     </table>

src/components/questiontype/v-sharingchoose.vue

@@ -14,11 +14,16 @@
   .v_sharingChooseQuestionBold {
     font-weight: bold;
   }
-
+  .shareChooseTable td{
+    vertical-align: middle!important;
+  }
+  .shareChooseTable td p{
+    margin:0!important;
+  }
 </style>
 <template>
   <div class="v_sharingChooseQuestion">
-    <table v-if="data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable">
+    <table v-if="data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable shareChooseTable">
       <thead>
         <tr>
           <th colspan="2" style="text-align:left;">
@@ -29,7 +34,7 @@
         </tr>
       </thead>
       <tr v-for="(item,index) in data.QuestionContentObj[0]" :key="index">
-        <td style="width:40px;text-align:center; ">
+        <td style="width:40px;text-align:center;height:40px; ">
           {{item.Name}}
         </td>
         <td>
@@ -37,10 +42,10 @@
         </td>
       </tr>
     </table>
-    <table v-if="data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable">
+    <table v-if="data.QuestionContentObj&&data.QuestionContentObj.length>0" class="common_TiTable shareChooseTable">
       <tbody v-for="(item,index) in data.QuestionContentObj[1]" :key="index">
         <tr>
-          <td style="width:40px;text-align:center;">
+          <td style="width:40px;text-align:center;height:40px;">
             ({{index+1}})
           </td>
           <td>
@@ -55,12 +60,14 @@
               答案: {{data.QuestionContentObj[1][index].Name}}
             </template>
             <template v-if="isOperate">
-              <select v-model="item.Name" class="selectBox" style="margin:10px 0 0 0;outline:none;">
-                <template v-for="(cItem,cIndex) in data.QuestionContentObj[0]">
-                  <option :key="cIndex" :label="cItem.Name" :value="cItem.Name">
-                  </option>
-                </template>
-              </select>
+              <el-select v-model="item.Name" style="width:100px" size="small" placeholder="请选择">
+                <el-option
+                  v-for="(cItem,cIndex) in data.QuestionContentObj[0]"
+                  :key="cIndex"
+                  :label="cItem.Name"
+                  :value="cItem.Name">
+                </el-option>
+              </el-select>
             </template>
           </td>
         </tr>

src/components/questiontype/v-sortingproblem.vue

@@ -56,12 +56,14 @@
       <tr>
         <td>
           <template v-for="(item,index) in data.QuestionContentObj[1]">
-            <select v-model="item.Name" class="selectBox" :key="index">
-              <template v-for="(cItem,cIndex) in data.QuestionContentObj[0]">
-                <option :key="cIndex" :label="cItem.Name" :value="cItem.Name">
-                </option>
-              </template>
-            </select>
+            <el-select v-model="item.Name" :key="index" style="width:100px;margin-right:20px;" size="small" placeholder="请选择">
+              <el-option
+                v-for="(cItem,cIndex) in data.QuestionContentObj[0]"
+                :key="cIndex"
+                :label="cItem.Name"
+                :value="cItem.Name">
+              </el-option>
+            </el-select>
           </template>
         </td>
       </tr>

src/pages/enterprise/addWelcome.vue

@@ -400,12 +400,11 @@
             insert(type) {
                 if(type==1){
                     this.addMsg.Content = this.addMsg.Content + '##客户名称##'
+                }else if(type==2){
+                    this.addMsg.Content = this.addMsg.Content + '##员工名称##'
+                }else{
+                    this.addMsg.Content = this.addMsg.Content + '##员工别名##'
                 }
-                // else if(type==2){
-                //     this.addMsg.Content = this.addMsg.Content + '##员工名称##'
-                // }else{
-                //     this.addMsg.Content = this.addMsg.Content + '##员工别名##'
-                // }
             },
             selectimg() {//素材选择 图片模式
                 this.materialType = 2;

src/pages/exam/examineeManager.vue

@@ -54,11 +54,11 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
-            <q-btn v-if="props.row.ExamStatus==1||props.row.ExamStatus==2" flat color="primary" size="xs"
+            <q-btn  flat color="primary" size="xs"
               style="font-weight:400;" class="q-mr-md" label="学员考试" @click="gotoExamTest(props.row)" />
-            <q-btn v-if="props.row.ExamStatus==3" flat color="primary" size="xs" style="font-weight:400;"
+            <q-btn flat color="primary" size="xs" style="font-weight:400;"
               class="q-mr-md" label="阅卷" @click="gotoExamTestReview(props.row)" />
-            <q-btn v-if="props.row.ExamStatus==5" flat color="primary" size="xs" style="font-weight:400;"
+            <q-btn  flat color="primary" size="xs" style="font-weight:400;"
               class="q-mr-md" label="详情" @click="gotoExamTestInfo(props.row)" />
           </q-td>
         </template>

src/pages/exam/examtest.vue

@@ -241,16 +241,19 @@
   .examPaperInfo_Top .vClozeQuestion .clozeTest_question_tit {
     margin: 15px 0;
   }
-
+  .Exam_PaperName{
+    font-size:20px;
+    font-weight: bold;
+    margin-bottom:5px;
+  }
 </style>
 <template>
   <div class="examPaper page-body">
     <div class="examPaperInfo_Top">
       <div>
         <div>
-          {{DataObj.PaperName}} <br />
-          题量：{{examNum}} &nbsp;&nbsp;&nbsp; 满分：{{examScore}}
-
+          <div class="Exam_PaperName">{{DataObj.PaperName}}</div>
+          <div>题量：{{examNum}} &nbsp;&nbsp;&nbsp; 满分：{{examScore}}</div>
         </div>
       </div>
       <div style="width:20%;text-align:right;">
@@ -264,11 +267,13 @@
           <div class="pGNameDiv"><span class="pGroupName">{{NoToChinese(gIndex+1)}}、{{gItem.GroupName}}</span> （共
             {{gItem.DetailsList.length}} 题，{{gItem.GScore}}分）</div>
           <div v-for="(dItem,dIndex) in gItem.DetailsList" :key="dIndex">
-            <span>{{dIndex+1}}、</span>
-            <span class="paper_Title" v-html="dItem.Title"></span>
-            <span style="margin:10px 0;display:inline-block;">
-              ({{dItem.Score}}分)
-            </span>
+            <div style="display:flex;margin:10px 0;">
+              <span>{{dIndex+1}}、</span>
+              <span class="paper_Title" v-html="dItem.Title"></span>
+              <span style="margin-left:10px;display:inline-block;">
+                ({{dItem.Score}}分)
+              </span>
+            </div>
             <!--单选题-->
             <v-single v-if="dItem.QuestionTypeKey=='single'||dItem.QuestionTypeKey=='single-number'"
               :questionObj="dItem" :isShowAnswer="isShowAnswer" :isOperate="isOperate">

src/router/routes.js

@@ -603,6 +603,11 @@ const routes = [{
     component: () =>
       import("pages/financial/reportform/activityStatistics.vue")
   },
+  {
+    path: "/financial/studyabroad/studyAbroadRules", //财务流程 留学提成规则
+    component: () =>
+      import("pages/financial/studyabroad/studyAbroadRules.vue")
+  },
 
 
   {