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

src/components/stuMan/subscribe/detail.vue

@@ -54,7 +54,7 @@
     <q-field filled label="进度" stack-label class="col-6">
       <template v-slot:control>
         <div>
-          {{ saveObj.CompleteProgress > 0 ? saveObj.CompleteProgress : 0 }}%
+          {{ saveObj.Ranks}}/{{saveObj.TotalPlanNum}}
         </div>
       </template>
     </q-field>
@@ -127,9 +127,10 @@
               v-for="(item, index) in saveObj.GuestList"
               :key="index"
               :label="item.GuestName"
-              :val="item.StuId"
+              :val="item.AppointmentId"
             />
           </div>
+          {{checkStuType2}}
         </div>
         <div v-else>
           {{ saveObj.GuestList.map(e => e.GuestName).toString() }}
@@ -178,7 +179,7 @@ export default {
       const msg = {
         Date: this.dateObj.date,
         TeacherId: this.saveObj.Tid,
-        StuIds: this.checkStuType2.toString()
+        AppointIds : this.checkStuType2.toString()
       };
       CancelAppointment(msg).then(res => {
         if (res.Code == 1) {
@@ -186,7 +187,6 @@ export default {
             message: "操作成功",
             position: "top"
           });
-          this.changeDig(false);
           this.$emit("success");
         }
       });

src/components/stuMan/subscribe/subscribeForm.vue

@@ -22,9 +22,8 @@
             </q-field>
             <!-- 详情显示内容 start-->
             <div class="col-12" v-if="editType==2">
-              <Detail :dateObj="dateObj" :saveObj="saveObj"/>
+              <Detail :dateObj="dateObj" :saveObj="saveObj" @success="detailSuccessHandle"/>
             </div>
-              
             <!-- 详情显示内容 end -->
             <q-select
               filled
@@ -511,6 +510,10 @@ export default {
       } else {
         return true;
       }
+    },
+    detailSuccessHandle(){
+      this.changeDig(false);
+      this.$emit("success");
     }
   }
 };

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -900,7 +900,10 @@
         <!-- <p>附加说明</p> -->
         <div>
           <p v-if="GetDetail.Type!==7">费用归属部门：<span>{{GetDetail.DepartName}}</span></p>
-          <div>
+          <div style="display:flex;">
+            <div style="margin-right:20px;text-decoration:underline;cursor:pointer;" v-if="GetDetail.OtherType==53" @click="goFinDetail(GetDetail)">
+              单据详情
+            </div>
             <el-popover popper-class="detailsIT_Journal_bdm" width="250" trigger="click">
               <div class="InfoChangeLog">
                 <div class="changLog">
@@ -3489,6 +3492,17 @@
       getSJstate(){
         this.ishowSJ = false
       },
+      //跳转至详情
+      goFinDetail(obj){
+        this.$router.push({
+          path: '/financial/returnPassbook/ReturnUserList',
+          query: {
+            id: obj.ReFinanceId,
+            ReFinanceId2: obj.ReFinanceId2,
+            CommissionType: 1
+          }
+        })
+      }
     },
     created() {
       if (this.$route.query.pageIndex) {

src/pages/studyAbroad/subscribe.vue

@@ -220,11 +220,7 @@
                       <div class="flex no-wrap">
                         <span class="detailLabel">进度：</span
                         ><span
-                          >{{
-                            __item.CompleteProgress > 0
-                              ? __item.CompleteProgress
-                              : 0
-                          }}%</span
+                          >{{__item.Ranks}}/{{__item.TotalPlanNum}}</span
                         >
                       </div>
                       <div class="flex no-wrap">
@@ -297,11 +293,7 @@
                     <div class="flex no-wrap">
                       <span class="detailLabel">进度：</span
                       ><span
-                        >{{
-                          __item.CompleteProgress > 0
-                            ? __item.CompleteProgress
-                            : 0
-                        }}%</span
+                        >{{__item.Ranks}}/{{__item.TotalPlanNum}}</span
                       >
                     </div>
                     <div class="flex no-wrap">