Browse Source

Merge branch '0601Action' into test

lex-xin 3 years ago
parent
commit
f624bda13d
1 changed files with 19 additions and 8 deletions
  1. 19 8
      src/views/levelManager/levelManager.vue

+ 19 - 8
src/views/levelManager/levelManager.vue

@@ -115,14 +115,15 @@
           :data="tableList"
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
         >
-          <el-table-column width="90px" align="center" prop="id" label="编号">
+          <!-- <el-table-column width="90px" align="center" prop="id" label="编号">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <copy-text>{{ scope.row.id }}</copy-text>
               <copy-text>{{ scope.row.id }}</copy-text>
             </template>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="center" prop="name" label="姓名">
           <el-table-column align="center" prop="name" label="姓名">
             <template slot-scope="scope">
             <template slot-scope="scope">
-              <copy-text>{{ scope.row.name }}</copy-text>
+              <copy-text>{{ scope.row.name }}</copy-text><br />
+              (<copy-text>{{ scope.row.id }}</copy-text>)
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column align="center" prop="orderNo" label="订单编号">
           <el-table-column align="center" prop="orderNo" label="订单编号">
@@ -141,7 +142,7 @@
           <el-table-column
           <el-table-column
             align="center"
             align="center"
             prop="city"
             prop="city"
-            label="分部"
+            label="所属城市"
           >
           >
               <template slot-scope="scope">
               <template slot-scope="scope">
               <copy-text>{{ scope.row.city }}</copy-text>
               <copy-text>{{ scope.row.city }}</copy-text>
@@ -182,18 +183,28 @@
             align="center"
             align="center"
             prop="level"
             prop="level"
             label="报考级别"
             label="报考级别"
-          ></el-table-column>
+            width="150px"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.level }} / {{ scope.row.money | moneyFormat }}元
+            </template>
+          </el-table-column>
           <el-table-column
           <el-table-column
             align="center"
             align="center"
             prop="theoryLevel"
             prop="theoryLevel"
+            width="150px"
             label="乐理级别"
             label="乐理级别"
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              <div v-if="scope.row.theoryLevel">{{ scope.row.theoryLevel }} / {{ scope.row.theoryMoney | moneyFormat }}元</div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="缴费状态">
           <el-table-column align="center" label="缴费状态">
             <template slot-scope="scope">{{
             <template slot-scope="scope">{{
               scope.row.status == 2 ? "已缴费" : "未缴费"
               scope.row.status == 2 ? "已缴费" : "未缴费"
             }}</template>
             }}</template>
           </el-table-column>
           </el-table-column>
-          <el-table-column align="center" prop="money" label="报考级别费用">
+          <!-- <el-table-column align="center" prop="money" label="报考级别费用">
             <template slot-scope="scope"
             <template slot-scope="scope"
               >{{ scope.row.money | moneyFormat }}元</template
               >{{ scope.row.money | moneyFormat }}元</template
             >
             >
@@ -206,7 +217,7 @@
             <template slot-scope="scope"
             <template slot-scope="scope"
               >{{ scope.row.theoryMoney | moneyFormat }}元</template
               >{{ scope.row.theoryMoney | moneyFormat }}元</template
             >
             >
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="center" label="证书">
           <el-table-column align="center" label="证书">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <div v-if="scope.row.theoryCert">
               <div v-if="scope.row.theoryCert">