Selaa lähdekoodia

Merge branch 'Inspection' into online

mo 4 vuotta sitten
vanhempi
commit
642067ac50
2 muutettua tiedostoa jossa 5 lisäystä ja 4 poistoa
  1. 2 1
      src/layout/components/TagsView.vue
  2. 3 3
      src/views/musicInspection/index.vue

+ 2 - 1
src/layout/components/TagsView.vue

@@ -164,7 +164,8 @@ export default {
     border-bottom: 1px solid #d8dce5;
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
     .tags-view-item {
-      width: 120px;
+
+      min-width: 120px;
       .icon {
         font-size: 20px;
         position: relative;

+ 3 - 3
src/views/musicInspection/index.vue

@@ -144,7 +144,7 @@
                 <el-table-column align="center"
                                 width="250px"
                                 label="操作">
-                    <template slot-scope="scope">
+                    <template slot-scope="scope" v-if="scope.row.status != 0">
                         <auth auths="inspectionItemPlanConclusion/getPlanConclusion">
                             <el-button type="text" @click="onLook(scope.row)">查看</el-button>
                         </auth>
@@ -202,10 +202,9 @@
 
 <script>
 import pagination from "@/components/Pagination/index";
-import cleanDeep from 'clean-deep'
 import LookDetail from './modals/lookDetail'
 import dayjs from 'dayjs'
-import { inspectionItemPlan, inspectionItemPlanUpdate, updateMemo } from './api'
+import { inspectionItemPlan, updateMemo } from './api'
 import { findEducationUsers } from '@/api/buildTeam'
 import { queryByOrganId } from '@/api/systemManage'
 import { getTeamList } from '@/api/teamServer'
@@ -271,6 +270,7 @@ export default {
             try {
                 let { createTimer, ...rest } = this.searchForm
                 let params = {
+                    ids: this.$route.query.ids,
                     ...rest,
                     page: this.pageInfo.page,
                     rows: this.pageInfo.limit,