lex 2 years ago
parent
commit
ad2feb12f7

+ 3 - 3
src/views/levelManager/gradeManager.vue

@@ -65,7 +65,7 @@
       </save-form>
 
       <el-button
-        v-permission="'/teacherOperationAdd'"
+        v-permission="'degree/save'"
         type="primary"
         @click="onGradeOperation('create')"
         style="margin-bottom:20px"
@@ -122,7 +122,7 @@
           <el-table-column align="center" label="操作" fixed="right">
             <template slot-scope="scope">
               <el-button
-                v-if="$helpers.permission('degree/refund')"
+                v-if="$helpers.permission('/levelManager')"
                 type="text"
                 @click="
                   () => {
@@ -138,7 +138,7 @@
                 >详情</el-button
               >
               <el-button
-                v-if="$helpers.permission('degree/refund')"
+                v-if="$helpers.permission('degree/update')"
                 type="text"
                 @click="onGradeOperation('update', scope.row)"
                 >修改</el-button

+ 26 - 9
src/views/levelManager/levelManager.vue

@@ -45,7 +45,7 @@
           <el-input
             v-model.trim="searchForm.name"
             clearable
-            placeholder="姓名/编号/手机号"
+            placeholder="姓名"
             @keyup.enter.native="
               e => {
                 e.target.blur();
@@ -71,10 +71,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="degreeType">
+        <el-form-item prop="type">
           <el-select
             class="multiple"
-            v-model.trim="searchForm.degreeType"
+            v-model.trim="searchForm.type"
             filterable
             clearable
             placeholder="报考项目"
@@ -205,9 +205,9 @@
               <copy-text>{{ scope.row.orderNo }}</copy-text>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="city" label="所属城市">
+          <el-table-column align="center" prop="organName" label="所属城市">
             <template slot-scope="scope">
-              <copy-text>{{ scope.row.city }}</copy-text>
+              <copy-text>{{ scope.row.organName }}</copy-text>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="subject" label="报考专业">
@@ -241,13 +241,14 @@
           </el-table-column>
           <el-table-column align="center" label="证书">
             <template slot-scope="scope">
-              <div v-if="scope.row.theoryCert">
+              <div v-if="scope.row.theoryCert" class="scopeCert">
                 <el-image
                   fit="cover"
                   style="width: 80px; height: 80px; border-radius: 5px"
-                  :src="scope.row.theoryCert"
-                  :preview-src-list="[scope.row.theoryCert]"
+                  :src="scope.row.theoryCert.split(',')[0]"
+                  :preview-src-list="[...scope.row.theoryCert.split(',')]"
                 ></el-image>
+                <span>共{{ scope.row.theoryCert.split(",").length }}张</span>
               </div>
               <div v-else>--</div>
             </template>
@@ -312,7 +313,7 @@ export default {
         name: null,
         city: null,
         status: 2,
-        degreeType: null,
+        type: null,
         level: null,
         startTime: null,
         organId: null,
@@ -368,6 +369,7 @@ export default {
         ...rest,
         page: this.pageInfo.page,
         rows: this.pageInfo.limit,
+        degreeId: this.id,
         ...getTimes(orderDate, ["startTime", "endTime"])
       };
       degreeQueryPage(params).then(res => {
@@ -539,4 +541,19 @@ export default {
 ::v-deep .el-table__expanded-cell[class*="cell"] {
   padding: 20px 0 20px 60px;
 }
+
+.scopeCert {
+  position: relative;
+  span {
+    position: absolute;
+    bottom: 11px;
+    right: 15px;
+    background: rgba(0, 0, 0, 0.5);
+    border-radius: 10px;
+    line-height: 16px;
+    color: #fff;
+    padding: 0 8px;
+    font-size: 12px;
+  }
+}
 </style>

+ 1 - 1
src/views/levelManager/model/grade-operation.vue

@@ -160,7 +160,7 @@ export default {
         const params = {
           ...forms,
           organIds: forms.organIds ? forms.organIds.join(",") : "",
-          endTime: forms.endTime + " 23:59:59"
+          endTime: dayjs(forms.endTime).format("YYYY-MM-DD") + " 23:59:59"
         };
 
         try {