Merge branch '01/21VipReset' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 01/21VipReset

src/views/main/teamSchedule/index.vue

@@ -164,11 +164,11 @@ export default {
         userId: "",
         organId: "",
         month: "",
-        ids:''
+        searchType:''
       },
       handleForm: {
         memo: "",
-        id: "",
+        searchType: "",
       },
       tableList: [],
       handleVisible: false,
@@ -203,7 +203,7 @@ export default {
           ...this.searchForm,
           page: this.rules.page,
           rows: this.rules.limit,
-          ids: this.$route.query.ids,
+          searchType: this.$route.query.searchType,
         });
         this.tableList = res.data.rows;
         this.rules.total = res.data.total;

src/views/teamBuild/forecastName.vue

@@ -214,7 +214,7 @@
             :close-on-click-modal="false"
             :visible.sync="visitVisible"
         >
-            <visit-model v-if="visitVisible" @close="visitVisible = false" :visitDetail="visitDetail" />
+            <visit-model v-if="visitVisible" @close="visitVisible = false" :detail="visitDetail" @submited="getList"/>
         </el-dialog>
     </div>
 </template>
@@ -224,7 +224,7 @@ import pagination from "@/components/Pagination/index";
 import qrCode from '@/components/QrCode/index';
 import { permission } from "@/utils/directivePage";
 import { vaildStudentUrl } from '@/utils/validate'
-import visitModel from './modals/visit'
+import visitModel from '@/views/withdrawal-application/modals/visit'
 import { queryPreApplyList, finishPreApply, sendParentMeetingNotice } from './api'
 export default {
     name: 'forecastName',
@@ -309,7 +309,7 @@ export default {
                         path: '/business/teamDetail'
                     })
                 })
-                
+
             } catch(error) {}
         },
         addVisited(rows) {
@@ -319,12 +319,12 @@ export default {
                 musicGroupId: rows.musicGroupId,
                 overview: "",
                 purpose: "",
-                studentId: rows.userId,
+                userId: rows.userId,
                 type: "",
                 visitTime: "",
                 visitType: "",
                 feedback: "",
-                studentName: rows.userName,
+                realName: rows.userName,
             }
             // this.visitDetail = rows
         },

src/views/teamBuild/signupList.vue

@@ -569,12 +569,18 @@
     <!-- 回访记录 -->
     <el-dialog
       title="新增回访"
-      width="600px"
+      width="500px"
       destroy-on-close
       :close-on-click-modal="false"
       :visible.sync="visitVisiable"
     >
-      <el-form
+      <visit
+        v-if="visitVisiable && detail"
+        :detail="detail"
+        @close="visitVisiable = false"
+        @submited="getList"
+      />
+      <!-- <el-form
         :model="visitForm"
         label-width="120px"
         label-position="right"
@@ -631,7 +637,7 @@
       <span slot="footer" class="dialog-footer">
         <el-button @click="visitVisiable = false">取 消</el-button>
         <el-button type="primary" @click="submitAddVisit">确 定</el-button>
-      </span>
+      </span> -->
     </el-dialog>
     <el-dialog
       title="更改声部"
@@ -681,6 +687,7 @@ import qs from "qs";
 import { permission } from "@/utils/directivePage";
 import cleanDeep from "clean-deep";
 import changeVoice from "./modals/change-voice";
+import visit from '@/views/withdrawal-application/modals/visit'
 export default {
   name: "signupList",
   components: {
@@ -688,6 +695,7 @@ export default {
     changeVoice,
     mergeMusic,
     forecastList,
+    visit
   },
   data() {
     return {
@@ -809,6 +817,7 @@ export default {
       },
       isPay: false,
       applyDates: this.applyDate(),
+      detail:null
     };
   },
   created() {
@@ -1337,9 +1346,10 @@ export default {
       // row.typeVisible = false;
     },
     addVisit(row) {
-      this.visitForm.studentName = row.studentName;
-      this.visitForm.musicGroupId = this.teamid;
-      this.visitForm.studentId = row.studentId;
+      // this.visitForm.studentName = row.studentName;
+      // this.visitForm.musicGroupId = this.teamid;
+      // this.visitForm.studentId = row.studentId;
+      this.detail = row
       this.visitVisiable = true;
     },
     openChangeVoice(row) {
@@ -1473,11 +1483,11 @@ export default {
         this.$refs["quitForm"].resetFields();
       }
     },
-    visitVisiable(val) {
-      if (!val) {
-        this.$refs["visitForm"].resetFields();
-      }
-    },
+    // visitVisiable(val) {
+    //   if (!val) {
+    //     this.$refs["visitForm"].resetFields();
+    //   }
+    // },
   },
 };
 </script>

src/views/teamDetail/components/studentList.vue

@@ -56,7 +56,7 @@
     <save-form
     ref='searchForm'
       :inline="true"
-      save-key="teamDetails-studentList"
+      :save-key="saveKey"
       class="searchForm"
       @submit="search"
       @reset="onReSet"
@@ -305,7 +305,7 @@
         </el-table-column>
       </el-table>
       <pagination
-       save-key="teamDetails-studentList"
+       :save-key="saveKey"
         sync
         :total.sync="rules.total"
         :page.sync="rules.page"
@@ -580,69 +580,17 @@
     </el-dialog>
     <el-dialog
       title="新增回访"
-      width="600px"
+      width="500px"
       destroy-on-close
       :close-on-click-modal="false"
       :visible.sync="visitVisiable"
     >
-      <el-form
-        :model="visitForm"
-        label-width="120px"
-        label-position="right"
-        ref="visitForm"
-        :rules="visitRules"
-      >
-        <el-form-item label="学生姓名">
-          <p>{{ visitForm.studentName }}</p>
-        </el-form-item>
-        <el-form-item label="回访类型" prop="visitType">
-          <el-cascader
-            expand-trigger="hover"
-            clearable
-            placeholder="请选择回访类型"
-            :options="visitChiose"
-            @change="handleChange"
-            style="width: 220px !important"
-            v-model="visitForm.visitType"
-          >
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="回访日期" prop="visitTime">
-          <el-date-picker
-            v-model.trim="visitForm.visitTime"
-            align="right"
-            style="width: 220px !important"
-            type="date"
-            placeholder="选择日期"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="学员情况" prop="overview">
-          <el-input
-            type="textarea"
-            v-model="visitForm.overview"
-            style="width: 80% !important"
-            :rows="3"
-            maxlength="50"
-            show-word-limit
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="家长反馈" prop="feedback">
-          <el-input
-            type="textarea"
-            v-model="visitForm.feedback"
-            style="width: 80% !important"
-            :rows="3"
-            maxlength="50"
-            show-word-limit
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="visitVisiable = false">取 消</el-button>
-        <el-button type="primary" @click="submitAddVisit">确 定</el-button>
-      </span>
+       <visit
+        v-if="visitVisiable && detail"
+        :detail="detail"
+        @close="visitVisiable = false"
+        @submited="getList"
+      />
     </el-dialog>
     <el-dialog
       title="选择班级"
@@ -714,10 +662,12 @@ import TimesView from './modals/course-time-detail'
 import paymentCycle from '../../resetTeaming/modals/payment-cycle'
 import paymentList from './modals/payment-list'
 import Tooltip from '@/components/Tooltip/index'
+import visit from '@/views/withdrawal-application/modals/visit'
 export default {
   name: "tstudentList",
   data() {
     return {
+      detail:null,
       teamid: "",
       paymentDetailVisible: false,
       paymentDetail: {},
@@ -888,7 +838,8 @@ export default {
     createUserPay,
     Tooltip,
     'times-view': TimesView,
-    paymentList
+    paymentList,
+    visit
   },
   created() {
     // 判断是否带缓存参数
@@ -899,12 +850,6 @@ export default {
       this.Frules = this.$route.query.rules;
     }
   },
-  /**  <el-option label="已开启缴费"
-                     value="1"></el-option>
-          <el-option label="未缴费"
-                     value="0"></el-option>
-          <el-option label="已缴费"
-                     value="2"></el-option> */
   filters: {
     studentPays(val) {
       let template = {
@@ -1469,9 +1414,10 @@ export default {
     },
     addVisit(row) {
       console.log(row);
-      this.visitForm.studentName = row.realName;
-      this.visitForm.musicGroupId = this.teamid;
-      this.visitForm.studentId = row.userId;
+      this.detail = row
+      // this.visitForm.studentName = row.realName;
+      // this.visitForm.musicGroupId = this.teamid;
+      // this.visitForm.studentId = row.userId;
       this.visitVisiable = true;
     },
     handleChange(val) {
@@ -1514,12 +1460,17 @@ export default {
         this.$refs["quitForm"].resetFields();
       }
     },
-    visitVisiable(val) {
-      if (!val) {
-        this.$refs["visitForm"].resetFields();
-      }
-    },
+    // visitVisiable(val) {
+    //   if (!val) {
+    //     this.$refs["visitForm"].resetFields();
+    //   }
+    // },
   },
+  computed:{
+    saveKey(){
+      return 'teamDetails-'+this.$route.query.id
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/withdrawal-application/modals/visit.vue

@@ -90,11 +90,15 @@ export default {
   },
   computed: {
     userName() {
-      return this.username || this.detail.user?.username
+      return this.username || this.detail.user?.username || this.detail.realName || this.detail.userName || this.detail.studentName
+    },
+    studentId(){
+      return this.detail.userId || this.detail.studentId
     }
   },
   methods: {
     submitAddVisit() {
+
       this.$refs.visitForm.validate((res) => {
         if (res) {
           const { visitType, ...rest } = this.visitForm
@@ -103,7 +107,7 @@ export default {
             objectId: this.detail.id,
             studentName: this.userName,
             musicGroupId: this.detail.musicGroupId,
-            studentId: this.detail.userId,
+            studentId: this.studentId,
             type: visitType[0],
             purpose: visitType[1],
           }