经营报表导出

1

src/views/reportForm/index.vue

@@ -768,6 +768,49 @@
           <template slot="title">
             <p class="wrapTitle">财务数据</p>
           </template>
+          <div class="m-wrap" v-permission="'export/EXPORT_OPERATING_REPORT_NEW'">
+            <div class="title">经营报表导出：</div>
+            <el-date-picker
+              v-model="operatingMouth"
+              type="month"
+              placeholder="选择月"
+              value-format="yyyy-MM-dd"
+              class="organSelect"
+            ></el-date-picker>
+            <!-- <el-select v-model.trim="courseScheduleType"
+                   style="marginLeft:10px"
+                   filterable
+                   clearable
+                   multiple
+                   placeholder="课程类型">
+          <el-option v-for="(item, index) in courseArray"
+                     :key="index"
+                     :label="item.label"
+                     :value="item.value"></el-option>
+        </el-select> -->
+            <!-- <el-button
+              style="margin-left: 10px"
+              type="primary"
+              @click="exportSalar"
+              >导出</el-button
+            > -->
+            <ExportChiose
+              style="margin-left: 10px"
+              ExportEnum="EXPORT_OPERATING_REPORT_NEW"
+              :exportData="exportOperating"
+              fileName="经营报表"
+              errorMsg="请选择月份"
+              :flag="!this.operatingMouth"
+            />
+            <el-tooltip placement="top" popper-class="mTooltip">
+              <div slot="content">将只导出当前选择月份的经营报表。</div>
+              <i
+                class="el-icon-question micon el-tooltip"
+                style="font-size: 18px; color: #f56c6c"
+                v-permission="'export/teacherSalary'"
+              ></i>
+            </el-tooltip>
+          </div>
           <div class="m-wrap" v-permission="'export/teacherSalary'">
             <div class="title">课酬导出：</div>
             <el-date-picker
@@ -1003,6 +1046,7 @@ export default {
       trainingOrganId: [],
       trainingTimer: [],
       visitmouth: "",
+      operatingMouth:''
     };
   },
   mounted() {
@@ -1827,6 +1871,10 @@ export default {
       let data = { date: this.mouth };
       return data;
     },
+    exportOperating(){
+      let data = { date: this.operatingMouth };
+      return data;
+    },
     exportVisit() {
       let data = { month: this.visitmouth };
       return data;

src/views/returnVisitManager/components/returnVisitList.vue

@@ -191,10 +191,20 @@
           <descriptions-item label="回访目的:">{{
             activeRow.purpose
           }}</descriptions-item>
+          <descriptions-item label="家长反馈:" v-if="activeRow.type=='小课回访'">{{
+            activeRow.feedbackType | feedbackTypeFilter
+          }}</descriptions-item>
+          <descriptions-item label="反馈详情:"  v-if="(activeRow.feedbackType == 'THINKING' ||
+          activeRow.feedbackType == 'LOST') &&activeRow.type=='小课回访'">{{
+            activeRow.feedbackTypeDesc | feedbackTypeDescFilter
+          }}</descriptions-item>
+          <descriptions-item label="问题状态:">{{
+            activeRow.probStatus?'已解决':'未解决'
+          }}</descriptions-item>
           <descriptions-item label="回访情况:" :span="6">{{
             activeRow.overview
           }}</descriptions-item>
-          <descriptions-item label="家长反馈" :span="6">{{
+          <descriptions-item :label="activeRow.type=='小课回访'?'原因':'家长反馈'" :span="6">{{
             activeRow.feedback
           }}</descriptions-item>
           <descriptions-item label="回访图片" :span="6">

src/views/teamDetail/components/modals/select-student.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form :model="form" ref="form" label-suffix=": " inline label-width="90px">
       <el-row>
-        <el-col :span="10">
+        <el-col :span="12">
           <el-form-item
             label="主教老师"
             prop="coreTeacher"
@@ -31,7 +31,7 @@
           </el-form-item>
         </el-col>
         <!-- :offset="4" -->
-        <el-col :span="10" >
+        <el-col :span="12" >
           <el-form-item
             label="助教老师"
             prop="assistant"
@@ -62,7 +62,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="10" v-if="showName">
+        <el-col :span="12" v-if="showName">
           <el-form-item
             label="班级名称"
             prop="name"

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

@@ -123,7 +123,7 @@
         :rules="[{ required: true, message: '选择问题状态' }]"
       >
         <el-radio-group v-model="visitForm.probStatus">
-          <el-radio-button :label="1" :key="index">已解决</el-radio-button>
+          <el-radio-button :label="1" >已解决</el-radio-button>
           <el-radio-button :label="0">未解决</el-radio-button>
         </el-radio-group>
       </el-form-item>