首页修改

src/views/main/abnormal/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="container">
     <save-form inline :model="search" @submit="FetchList" @reset="FetchList">
       <el-form-item prop="organIds">
         <el-select
@@ -32,7 +32,32 @@
       </el-badge>
     </div>
     <empty desc="暂无需要处理异常" v-if="!activeList.length"/>
-    <title-item
+    <el-button @click="$router.push({
+        path: item[0].url,
+        query: {
+          ...item[0].query,
+          tag: $route.query.tag,
+          filter_type: item[0].errorType,
+          [item[0].resultKey]: item[0].resultKey ? (item[0].result || []).join(',') : undefined
+        }
+      })"
+      style="width: 100%;color: #303133;margin-left: 0;"
+      v-else
+      v-for="(item, index) in activeList"
+      :key="index"
+      :disabled="!item[0].result.length && !item[0].always" type="text"
+    >
+      <title-item
+        :type="item[0].isError ? 'error' : 'warning'"
+        :data="item.map(title => ({name: title.desc, num: title.num}))"
+      >
+        <span
+          v-if="item[0].url && item[0].result || item[0].always"
+          style="color: #14928A;"
+        >立即处理<i class="el-icon-d-arrow-right"/></span>
+      </title-item>
+    </el-button>
+    <!-- <title-item
       v-else
       :type="item[0].isError ? 'error' : 'warning'"
       v-for="(item, index) in activeList"
@@ -52,7 +77,7 @@
           }
         })" :disabled="!item[0].result.length && !item[0].always"
       >立即处理<i class="el-icon-d-arrow-right"/></el-button>
-    </title-item>
+    </title-item> -->
   </div>
 </template>
 <script>
@@ -157,4 +182,13 @@ export default {
       cursor: pointer;
     }
   }
+  .container{
+    /deep/ .is-disabled {
+      .title{
+        >span{
+          color: #C0C4CC!important;
+        }
+      }
+    }
+  }
 </style>

src/views/main/abnormal/title.vue

@@ -29,12 +29,12 @@ export default {
   line-height: 48px;
   background-color: rgba(0, 0, 0, .02);
   overflow: hidden;
-  margin-bottom: 20px;
   display: flex;
   justify-content: space-between;
   padding-right: 10px;
   font-weight: bold;
   transition: all .3s;
+  width: 100%;
   b{
     font-size: 18px;
   }

src/views/main/api.js

@@ -95,3 +95,11 @@ export const inspectionUpdate = data => request2({
   data: data,
   method: 'post',
 })
+
+// 获取乐团主管
+
+export const getMusicGroupEduTeacher = data => request2({
+  url: '/api-web/inspection/getMusicGroupEduTeacher',
+  params: data,
+  method: 'get'
+})

src/views/main/reminders/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="container">
     <save-form inline :model="search" @submit="FetchList" @reset="FetchList">
       <el-form-item prop="organIds">
         <el-select
@@ -19,20 +19,26 @@
       <el-button native-type="reset" type="danger">重置</el-button>
     </save-form>
     <empty desc="暂无需要处理异常" v-if="!list.length"/>
-    <title-item
-      v-else
-      type="warning"
-      v-for="(item, index) in list"
-      :key="index"
-      :data="[{name: item.desc, num: item.num}]"
-    >
-      <el-button @click="$router.push({
+    <el-button @click="$router.push({
         path: '/business/teamDetail',
         query: {
+          filter_type: item.errorType,
           search: (item.result || []).join(',')
         }
-      })" :disabled="item.result ?  !item.result.length : !item.result" type="text">立即处理<i class="el-icon-d-arrow-right"/></el-button>
-    </title-item>
+      })"
+      style="width: 100%;color: #303133;"
+      v-else
+      v-for="(item, index) in list"
+      :key="index"
+      :disabled="item.result ?  !item.result.length : !item.result" type="text"
+    >
+      <title-item
+        type="warning"
+        :data="[{name: item.desc, num: item.num}]"
+      >
+        <span style="color: #14928A;">立即处理<i class="el-icon-d-arrow-right"/></span>
+      </title-item>
+    </el-button>
   </div>
 </template>
 <script>
@@ -63,3 +69,14 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+  .container{
+    /deep/ .is-disabled {
+      .title{
+        >span{
+          color: #C0C4CC!important;
+        }
+      }
+    }
+  }
+</style>

src/views/main/schedule-branch/modals/create.vue

@@ -69,6 +69,7 @@
                 clearable
                 filterable
                 v-model="matterItem.item"
+                :disabled="!isCreate"
                 placeholder="请选择任务事项"
               >
                 <el-option v-for="(item,index) in matterTypesOptions"
@@ -132,11 +133,10 @@
   </div>
 </template>
 <script>
-import { queryEmployByOrganId } from '@/api/systemManage'
 import { matterTypes } from '@/views/main/constant'
 import { objectToOptions } from '@/utils'
 import { createRandom } from '@/helpers/uuidv4'
-import { inspectionAdd, inspectionGetInfo, inspectionUpdate } from '@/views/main/api'
+import { inspectionAdd, inspectionGetInfo, inspectionUpdate, getMusicGroupEduTeacher } from '@/views/main/api'
 const emptyMatter = {
   item: '',
   times: ''
@@ -168,12 +168,11 @@ export default {
     async 'form.organId'() {
       if (this.form.organId) {
         try {
-          const res = await queryEmployByOrganId({
+          const res = await getMusicGroupEduTeacher({
             organId: this.form.organId,
             rows: 999
           })
-          this.technicians = res.data.rows
-          console.log(this.form.group.map(item => ({...item, userId: ''})))
+          this.technicians = res.data
           this.$set(this.form, 'group', this.form.group.map(item => ({...item, userId: ''})))
         } catch (error) {}
       }

src/views/operationalEarly/operationalList.vue

@@ -207,7 +207,7 @@ export default {
     //   }
     // })
     const { lowSalary } = this.$route.query
-    let string = String(lowSalary)
+    let string = lowSalary == 1 || lowSalary == 0 ? String(lowSalary) : ''
     if (string) {
       this.$set(this.searchForm, 'lowSalary', string)
     }