Merge branch 'test' into dev

dist/static/css/chunk-4e81ec6e.86fc8602.css

@@ -1 +0,0 @@
-.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-509dd159] .description-title{margin:0!important}.visible[data-v-fa357c8e]{visibility:hidden}.cl-container .topFrom[data-v-fa357c8e]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-fa357c8e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-fa357c8e]{list-style:none}.cl-container .searchForm[data-v-fa357c8e]{margin:0 30px}.btnWraps[data-v-fa357c8e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-fa357c8e]{margin-right:20px}.inputStyle[data-v-fa357c8e]{width:180px}.red[data-v-fa357c8e]{color:red}.green[data-v-fa357c8e]{color:#14928a}.exportBtn[data-v-fa357c8e]{background:#13817a}.newBand[data-v-fa357c8e]{margin-top:30px}

dist/static/css/chunk-79efab4d.f2382d8f.css → dist/static/css/chunk-5bc28020.0c3ac260.css

@@ -1 +1 @@
-.btns[data-v-7d36c199]{text-align:right}.files[data-v-7d36c199]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-7d36c199]{position:absolute;right:20px;bottom:10px}.remark[data-v-5883ea72]{display:inline;overflow:hidden;white-space:pre}
+.btns[data-v-05831223]{text-align:right}.files[data-v-05831223]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-05831223]{position:absolute;right:20px;bottom:10px}.remark[data-v-5883ea72]{display:inline;overflow:hidden;white-space:pre}

dist/static/css/chunk-7940e738.de8d15a9.css

@@ -0,0 +1 @@
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-406b46ba] .description-title{margin:0!important}.visible[data-v-e8e96ee0]{visibility:hidden}.cl-container .topFrom[data-v-e8e96ee0]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-e8e96ee0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-e8e96ee0]{list-style:none}.cl-container .searchForm[data-v-e8e96ee0]{margin:0 30px}.btnWraps[data-v-e8e96ee0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-e8e96ee0]{margin-right:20px}.inputStyle[data-v-e8e96ee0]{width:180px}.red[data-v-e8e96ee0]{color:red}.green[data-v-e8e96ee0]{color:#14928a}.exportBtn[data-v-e8e96ee0]{background:#13817a}.newBand[data-v-e8e96ee0]{margin-top:30px}

src/components/singe-file-upload/index.vue

@@ -6,11 +6,9 @@
     :on-remove="remove"
     :on-progress="progress"
     :on-error="error"
-    :limit="1"
     :file-list="filelist"
-    :accept="accept"
-    :disabled="filelist.length > 0">
-    <el-button size="small" type="primary" plain :disabled="filelist.length > 0">点击上传</el-button>
+    :accept="accept">
+    <el-button size="small" type="primary" plain >点击上传</el-button>
     <div slot="tip" v-if="tips" class="el-upload__tip">{{tips}}</div>
     <div slot="file" slot-scope="{file}">
       <div style="display: flex; align-items: center;flex: 1 auto;justify-content: space-between;">

src/views/accompaniment/modals/form.vue

@@ -202,7 +202,10 @@ export default {
     formatParentId(id, list, ids = []) {
       for (const item of list) {
         if (item.sysMusicScoreCategoriesList) {
-          return this.formatParentId(id, item.sysMusicScoreCategoriesList, [...ids, item.id])
+          const cIds = this.formatParentId(id, item.sysMusicScoreCategoriesList, [...ids, item.id])
+          if(cIds.includes(id)) {
+            return cIds
+          }
         }
         if (item.id === id) {
           return [...ids, id]

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) {

src/views/indexErrDataRecord/components/historyError.vue

@@ -15,6 +15,7 @@
           filterable
           clearable
           placeholder="请选择分部"
+          @change="changeBranch"
         >
           <el-option
             v-for="(item, index) in selects.branchs"
@@ -24,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"
@@ -98,39 +99,34 @@
         >
       </statistic-item>
       <statistic-item>
-        <span>回访任务未完成剩余/总数</span>
+        <span>课程考情异常剩余/总数</span>
         <span>
           {{
-            statInfo.studentVisitSurplus ? statInfo.studentVisitSurplus : "0"
+            statInfo.teacherExceptionAttendanceSurplus
+              ? statInfo.teacherExceptionAttendanceSurplus
+              : "0"
+          }}
+          /
+          {{
+            statInfo.teacherExceptionAttendance
+              ? statInfo.teacherExceptionAttendance
+              : "0"
           }}
-          / {{ statInfo.studentVisit ? statInfo.studentVisit : "0" }}</span
-        >
-      </statistic-item>
-      <statistic-item>
-        <span>课程考情异常剩余/总数</span>
-        <span>
-           {{
-              statInfo.teacherExceptionAttendanceSurplus
-                ? statInfo.teacherExceptionAttendanceSurplus
-                : "0"
-            }}
-            /
-            {{
-              statInfo.teacherExceptionAttendance
-                ? statInfo.teacherExceptionAttendance
-                : "0"
-            }}
         </span>
       </statistic-item>
       <statistic-item>
         <span>课程异常剩余/总数</span>
-        <span> {{
-              statInfo.teacherNotAClassSurplus
-                ? statInfo.teacherNotAClassSurplus
-                : "0"
-            }}
-            /
-            {{ statInfo.teacherNotAClass ? statInfo.teacherNotAClass : "0" }}</span>
+        <span>
+          {{
+            statInfo.teacherNotAClassSurplus
+              ? statInfo.teacherNotAClassSurplus
+              : "0"
+          }}
+          /
+          {{
+            statInfo.teacherNotAClass ? statInfo.teacherNotAClass : "0"
+          }}</span
+        >
       </statistic-item>
     </statistic>
     <el-table
@@ -196,7 +192,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         align="center"
         prop="times"
         label="回访任务未完成剩余/总数"
@@ -211,7 +207,7 @@
             / {{ scope.row.studentVisit ? scope.row.studentVisit : "0" }}
           </div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column
         align="center"
@@ -332,6 +328,13 @@ export default {
       this.rules.page = 1;
       this.getList();
     },
+    async changeBranch(val) {
+      this.searchForm.educationUserId = null;
+      try {
+        const res = await getAllEducationUsers({ organIds: val });
+        this.educationList = res.data;
+      } catch (e) {}
+    },
     async getList() {
       let { timer, ...rest } = this.searchForm;
       let params = {

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: {

src/views/indexErrDataRecord/index.vue

@@ -36,14 +36,14 @@
         >
         <patrol v-if="activeKey === 'inspection'"  searchType='INSPECTION_ITEM_PLAN'/>
         </el-tab-pane>
-        <el-tab-pane
+        <!-- <el-tab-pane
           v-if="permission('/indexErrDataRecord/studentvisit')"
           lazy
           label="回访任务未完成"
           name="studentvisit"
         >
           <visitError v-if="activeKey === 'studentvisit'" searchType='STUDENT_VISIT'/>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane
           v-if="permission('/indexErrDataRecord/errattendance')"
           lazy