ソースを参照

合班查看

1
mo 3 年 前
コミット
b3659bdad1
2 ファイル変更31 行追加31 行削除
  1. 13 14
      src/views/auditList/index.vue
  2. 18 17
      src/views/resetTeaming/modals/review-detail.vue

+ 13 - 14
src/views/auditList/index.vue

@@ -212,24 +212,23 @@
             </template>
           </el-table-column>
           <!--  -->
-          <el-table-column
-            align="center"
-            label="操作"
-            fixed="right"
-          >
+          <el-table-column align="center" label="操作" fixed="right">
             <template slot-scope="scope">
+              <!--     'musicGroupPaymentCalender/auditListDetail/update'
+                       'musicGroupPaymentCalender/auditListDetail/look' -->
+              <el-button
+                @click="lookDetail(scope.row)"
+                type="text"
+                v-if="scope.row.status == 'AUDITING' && $helpers.permission('musicGroupPaymentCalender/auditListDetail/update')"
+              >
+                审核
+              </el-button>
               <el-button
                 @click="lookDetail(scope.row)"
                 type="text"
-                v-if="
-                  $helpers.permission(
-                    scope.row.status === 'AUDITING'
-                      ? 'musicGroupPaymentCalender/auditListDetail/update'
-                      : 'musicGroupPaymentCalender/auditListDetail/look'
-                  )
-                "
+                v-if="scope.row.status != 'AUDITING' && $helpers.permission('musicGroupPaymentCalender/getDetail/look')"
               >
-                {{ scope.row.status === "AUDITING" ? "审核" : "查看" }}
+                查看
               </el-button>
             </template>
           </el-table-column>
@@ -348,7 +347,7 @@ export default {
         id: row.id,
         musicGroupId: row.musicGroupId,
         status: row.status,
-        batchNo:row.batchNo
+        batchNo: row.batchNo,
       };
       this.typeStatus = true;
     },

+ 18 - 17
src/views/resetTeaming/modals/review-detail.vue

@@ -70,7 +70,10 @@
       v-if="course && course.length > 0"
     >
     </el-alert>
-    <descriptions :column="3" v-if="course && course.length > 0&&course[0].name">
+    <descriptions
+      :column="3"
+      v-if="course && course.length > 0 && course[0].name"
+    >
       <descriptions-item :span="2" label="收费标准:" v-if="course[0].name">{{
         course[0].name
       }}</descriptions-item>
@@ -112,7 +115,11 @@
           </p>
         </template>
       </el-table-column>
-            <el-table-column prop="courseOriginalPrice" label="原价(元)" width="100px"></el-table-column>
+      <el-table-column
+        prop="courseOriginalPrice"
+        label="原价(元)"
+        width="100px"
+      ></el-table-column>
 
       <el-table-column> </el-table-column>
     </el-table>
@@ -158,13 +165,7 @@
       <el-table-column prop="courseOriginalPrice" label="原价(元)">
         <template slot-scope="scope">
           <div>
-            {{
-              (musicGroupPaymentCalenders[0] &&
-              musicGroupPaymentCalenders[0].paymentType ===
-                "SPAN_GROUP_CLASS_ADJUST"
-                ? scope.row.masterSubCoursePrice
-                : scope.row.courseOriginalPrice) | moneyFormat
-            }}
+            {{ scope.row.courseOriginalPrice | moneyFormat }}
           </div>
         </template>
       </el-table-column>
@@ -213,7 +214,7 @@
           </p>
         </template>
       </el-table-column>
-       <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
+      <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
       <el-table-column> </el-table-column>
     </el-table>
     <el-alert
@@ -221,13 +222,13 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="repair&&repair.calenderId"
+      v-if="repair && repair.calenderId"
     >
     </el-alert>
     <el-table
       :data="[{ ...repair }]"
       stripe
-      v-if="repair&&repair.calenderId"
+      v-if="repair && repair.calenderId"
       style="width: 100%; margin-top: 10px"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
@@ -241,7 +242,7 @@
       </el-table-column>
 
       <el-table-column prop="num" label="数量" width="100px"> </el-table-column>
-      <el-table-column prop="actualAmount" label="售价(元)"  width="100px">
+      <el-table-column prop="actualAmount" label="售价(元)" width="100px">
         <template slot="header">
           <p style="position: relative">
             售价(元)
@@ -255,7 +256,7 @@
           </p>
         </template>
       </el-table-column>
-             <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
+      <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
     </el-table>
     <el-alert
       title="乐团活动"
@@ -268,7 +269,7 @@
     <el-table
       :data="activity"
       stripe
-      v-if="activity&&activity.length>0"
+      v-if="activity && activity.length > 0"
       style="width: 100%; margin-top: 10px"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
@@ -279,7 +280,7 @@
           scope.row.optionalFlag ? "是" : "否"
         }}</template>
       </el-table-column>
-      <el-table-column label="活动课程"  prop="categoryName" width="100px">
+      <el-table-column label="活动课程" prop="categoryName" width="100px">
         <template slot-scope="scope">{{ scope.row.categoryName }}</template>
       </el-table-column>
 
@@ -298,7 +299,7 @@
           </p>
         </template>
       </el-table-column>
-       <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
+      <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
     </el-table>
 
     <!-- 会员信息 -->