Parcourir la source

新增是否处理异常

1
mo il y a 4 ans
Parent
commit
551be1a4ff

+ 36 - 11
src/views/indexErrDataRecord/components/errorCourse.vue

@@ -9,7 +9,7 @@
         @reset="reset"
         ref="searchForm"
         :model.sync="searchForm"
-         :saveKey="`indexErrDataRecord-${searchType}`"
+        :saveKey="`indexErrDataRecord-${searchType}`"
       >
         <el-form-item>
           <el-input
@@ -53,6 +53,18 @@
           </el-select>
         </el-form-item>
         <el-form-item>
+          <el-select
+            v-model.trim="searchForm.hasDealTime"
+            clearable
+            filterable
+            placeholder="是否处理异常"
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           <el-date-picker
             v-model.trim="searchForm.timer"
             type="daterange"
@@ -154,6 +166,12 @@
             width="110"
             label="主教老师"
           ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="educationTeacherName"
+            width="110"
+            label="乐团主管"
+          ></el-table-column>
           <el-table-column align="center" prop="schoolName" label="教学点">
             <template slot-scope="scope">
               <div>
@@ -184,7 +202,7 @@
           <el-table-column align="center" label="异常产生时间">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.generateTime | dayjsFormat}}
+                {{ scope.row.generateTime | dayjsFormat }}
               </div>
             </template>
           </el-table-column>
@@ -205,11 +223,7 @@
               scope.row.isCallNames ? "是" : "否"
             }}</template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="详情"
-            fixed="right"
-          >
+          <el-table-column align="center" label="详情" fixed="right">
             <template slot-scope="scope">
               <div>
                 <auth auths="/teamCourseList">
@@ -227,7 +241,7 @@
           :limit.sync="rules.limit"
           :page-sizes="rules.page_size"
           @pagination="getList"
-           :saveKey="`indexErrDataRecord-${searchType}`"
+          :saveKey="`indexErrDataRecord-${searchType}`"
           sync
         />
       </div>
@@ -419,9 +433,10 @@ const initSearch = {
   schoolId: null, // 教学点编号
   creatTimer: [],
   courseIdSearch: null,
+  hasDealTime:null,
 };
 export default {
-  props:['searchType'],
+  props: ["searchType"],
   data() {
     return {
       classVisible: false,
@@ -629,8 +644,10 @@ export default {
       // });
     },
     lookDetail(row) {
-
-      this.$router.push({path:'/teamCourseList',query:{courseIdSearch:row.id}})
+      this.$router.push({
+        path: "/teamCourseList",
+        query: { courseIdSearch: row.id },
+      });
       // this.maskForm = row;
       // 发请求 获取详情 row.id
       // this.maskForm = row;
@@ -674,6 +691,14 @@ export default {
         });
       }
     },
+    cancleMore() {
+      // this.$refs.searchForm2.resetFields()
+      this.showMove = false;
+    },
+    okMore() {
+      this.getList();
+      this.showMove = false;
+    },
   },
   filters: {
     isCall(val) {

+ 1 - 1
src/views/indexErrDataRecord/components/historyError.vue

@@ -25,7 +25,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item prop="educationUserId">
         <el-select
           class="multiple"
           v-model.trim="searchForm.educationUserId"

+ 20 - 3
src/views/indexErrDataRecord/components/patrol.vue

@@ -82,6 +82,17 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="hasDealTime">
+          <el-select
+            v-model.trim="searchForm.hasDealTime"
+            clearable
+            filterable
+            placeholder="是否处理异常"
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="createTimer">
           <el-date-picker
             v-model.trim="searchForm.createTimer"
@@ -177,7 +188,7 @@
           <el-table-column align="center" label="异常产生时间">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.generateTime |dayjsFormat}}
+                {{ scope.row.generateTime | dayjsFormat }}
               </div>
             </template>
           </el-table-column>
@@ -188,7 +199,12 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="250px" label="操作" v-if="searchType =='MUSIC_PATROL_ITEM'">
+          <el-table-column
+            align="center"
+            width="250px"
+            label="操作"
+            v-if="searchType == 'MUSIC_PATROL_ITEM'"
+          >
             <template slot-scope="scope">
               <auth
                 auths="inspectionItemPlanConclusion/getPlanConclusion/4403"
@@ -226,7 +242,7 @@
           </el-table-column>
         </el-table>
         <pagination
-        :saveKey="`indexErrDataRecord-${searchType}`"
+          :saveKey="`indexErrDataRecord-${searchType}`"
           :total.sync="pageInfo.total"
           sync
           :page.sync="pageInfo.page"
@@ -307,6 +323,7 @@ export default {
         conclusionStatus: null,
         cooperationOrganId: null,
         createTimer: [],
+        hasDealTime:null
       },
       tableList: [],
       pageInfo: {