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

src/components/schedul/schedul-orderlist.vue

@@ -298,7 +298,7 @@
         <div style="min-height:135px;">
           <div style="margin:10px 20px 0 20px">
             <el-tabs v-model="WorkActive">
-              <el-tab-pane label="规则" name="1"></el-tab-pane>
+              <el-tab-pane label="工作清单规则" name="1"></el-tab-pane>
               <el-tab-pane label="工作清单" name="2"></el-tab-pane>
             </el-tabs>
             <template v-if="WorkActive==2">
@@ -340,8 +340,12 @@
                 <template v-if="WorkObj.ItemType==2">
                   <div style="margin:10px 0;">
                     <template v-if="workAuthObj.isShowEditAndDelete">
-                      <span v-if="!isShowSure&&WorkObj.WorkContent" title="点击进行修改"
-                        @click="isShowSure=true">{{WorkObj.WorkContent}}</span>
+                      <span v-if="!isShowSure&&WorkObj.WorkContent" style="cursor:pointer;"
+                        @click="isShowSure=true">{{WorkObj.WorkContent}}
+                         <q-tooltip :offset="[10, 10]">
+                          点击文字进行修改
+                         </q-tooltip>
+                        </span>
                       <el-input v-else v-model="WorkObj.WorkContent" @focus="isShowSure=true" placeholder="完成情况怎么样">
                       </el-input>
                     </template>
@@ -429,7 +433,7 @@
         </div>
         <div class="secondList_Bottom">
           <el-tabs v-model="TufaActive">
-            <el-tab-pane label="规则" name="1"></el-tab-pane>
+            <el-tab-pane label="突发事件规则" name="1"></el-tab-pane>
             <el-tab-pane label="突发事件" name="2"></el-tab-pane>
           </el-tabs>
           <template v-if="TufaActive==2">
@@ -540,8 +544,8 @@
         </div>
         <div class="secondList_Bottom">
           <el-tabs v-model="handActive">
-            <el-tab-pane label="规则" name="1"></el-tab-pane>
-            <el-tab-pane label="交接说明" name="2"></el-tab-pane>
+            <el-tab-pane label="交接工作规则" name="1"></el-tab-pane>
+            <el-tab-pane label="交接工作" name="2"></el-tab-pane>
           </el-tabs>
           <template v-if="handActive==2">
             <div class="tufa_List">
@@ -720,7 +724,6 @@
       getWorkList() {
         queryDutyWork_V2(this.qMsg).then(res => {
           if (res.Code == 1) {
-            console.log(res, '数据');
             this.HandoverList = res.Data.HandoverList;
             this.EmergenciesList = res.Data.EmergenciesList;
             this.WorkList = res.Data.WorkList;
@@ -864,7 +867,8 @@
           WorkContent: this.WorkObj.WorkContent,
           WorkIsFinish: this.WorkObj.IsChecked,
           ItemId: this.WorkObj.ItemId,
-          FileList: this.WorkObj.FileList
+          FileList: this.WorkObj.FileList,
+          ItemType:this.WorkObj.ItemType,
         };
         if (type == 2) {
           saveWorkMsg.WorkContent = this.WorkContent;

src/pages/sale/japaneseTrain.vue

@@ -63,7 +63,7 @@
             <div class="dline">
               <div class="d1">
                 <div class="di-title">{{item.ClassName}}</div>
-                <div class="di-c" style="margin-top: 25px;align-items:baseline">
+                <div class="di-c" style="margin-top: 8px;align-items:baseline">
                   <img src="../../assets/images/administration/kezname.png" alt=""
                     style="width: 14px;height: 14px;margin-right:5px;position:relative;top:2px;">{{item.CourseName}}
                   <template v-if="item.OtherCourseList&&item.OtherCourseList.length>0">
@@ -91,6 +91,20 @@
                     alt=""
                     style="width: 14px;height: 14px;margin-right:5px;position:relative;top:2px;">{{item.ClassHours?item.ClassHours:'0'}}课时
                 </div>
+                <div class="japanFeature">
+                  <i class="iconfont icon-tesezhuanti" style="color:#3DC5FF"></i>
+                  <span style="text-decoration:underline;margin-left:3px;">
+                    课程特色
+                    <q-popup-proxy>
+                      <q-banner>
+                        <div class="CourseFearure">
+                          {{item.CourseFeature}}
+                        </div>
+                      </q-banner>
+                    </q-popup-proxy>
+                  </span>
+                  <span class="iconfont icon-xiangxia" style="color: rgb(41, 97, 254); font-size: 10px;"></span>
+                </div>
               </div>
               <div class="d2">
                 <div class="row" style="align-items: center ;margin:0;padding:0;">
@@ -641,5 +655,15 @@
     border: none !important;
     background: transparent !important;
   }
-
+  .japanFeature{
+    font-size:14px;
+    color:#111111;
+    cursor: pointer;
+    margin-left:-1px;
+  }
+  .CourseFearure{
+    margin:10px;
+    width:500px;
+    color:#000;
+  }
 </style>

src/pages/scheduling/scheduleBoard.vue

@@ -281,12 +281,12 @@
         </q-card-section>
         <q-card-section class="q-pt-none">
           <div class="q-gutter-sm" style="width:280px;" v-if="isShowOne">
-            <span style="position:relative;top:6px;">有无突发：</span>
+            <span style="position:relative;top:6px;">突发事件：</span>
             <q-radio v-model="isHaveTufa" :val="2" label="有" />
             <q-radio v-model="isHaveTufa" :val="1" label="无" />
           </div>
           <div class="q-gutter-sm" style="width:280px;" v-if="isShowTwo">
-            <span style="position:relative;top:6px;">有无交接：</span>
+            <span style="position:relative;top:6px;">交接工作：</span>
             <q-radio v-model="isHaveHand" :val="2" label="有" />
             <q-radio v-model="isHaveHand" :val="1" label="无" />
           </div>