合并打包

dist/static/css/chunk-ac740030.64cf75f6.css

@@ -0,0 +1 @@
+.number-input[data-v-a288aabe]{width:100%}.number-input[data-v-5c1918b2] .el-input__inner,.number-input[data-v-a288aabe] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}

dist/static/css/chunk-commons.4411b51b.css

@@ -1 +1 @@
-.pagination-container[data-v-7e7c864b]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-7e7c864b]{display:none}.left-code .code-url{margin-top:10px;margin-bottom:10px}.left-code .code-url .link-btn{margin-top:0;margin-bottom:0;font-size:12px}.content-tooltip[data-v-a6001ff4]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}
+.pagination-container[data-v-5d1dc94e]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5d1dc94e]{display:none}.left-code .code-url{margin-top:10px;margin-bottom:10px}.left-code .code-url .link-btn{margin-top:0;margin-bottom:0;font-size:12px}.content-tooltip[data-v-a6001ff4]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}

dist/static/css/chunk-commons.f101b5cf.css

@@ -0,0 +1 @@
+.pagination-container[data-v-5d1dc94e]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-5d1dc94e]{display:none}.left-code .code-url{margin-top:10px;margin-bottom:10px}.left-code .code-url .link-btn{margin-top:0;margin-bottom:0;font-size:12px}.content-tooltip[data-v-a6001ff4]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}

dist/static/css/chunk-e26f0c40.ff1ca6ec.css

@@ -0,0 +1 @@
+.alert[data-v-0118353e]{margin:10px 0}.dialog-footer[data-v-290cb116]{margin-top:20px;display:block;text-align:right}.el-button--primary[data-v-7b09e296],.el-button--primary[data-v-7b09e296]:active,.el-button--primary[data-v-7b09e296]:focus,.el-button--primary[data-v-7b09e296]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-7b09e296] .el-date-editor.el-input,[data-v-7b09e296] .el-select{width:100%!important}[data-v-7b09e296] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-7b09e296] .el-dialog__body{padding:10px 20px}.newBand[data-v-7b09e296]{display:inline-block}

dist/static/img/empty.70d4d9a3.svg

@@ -0,0 +1 @@
+<svg t="1609119920930" class="icon" viewBox="0 0 1706 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10437" width="256" height="256"><path d="M0 851.446623a853.285929 172.553377 0 1 0 1706.571857 0 853.285929 172.553377 0 1 0-1706.571857 0Z" fill="#ECEEF2" p-id="10438"></path><path d="M304.149029 857.135196a92.534118 92.534118 0 0 1-91.775642-92.913356L151.316038 301.361628a27.494769 27.494769 0 0 1 9.480955-21.426958L439.726682 6.883173a27.874007 27.874007 0 0 1 18.961909-6.826287h793.555914a27.30515 27.30515 0 0 1 18.961909 6.067811l277.602356 273.620354a34.131437 34.131437 0 0 1 9.670574 21.806196l-61.057349 462.670593a92.534118 92.534118 0 0 1-91.775642 92.913356z" fill="#E1E5EC" p-id="10439"></path><path d="M242.143585 764.22184a61.815825 61.815825 0 0 0 62.005444 62.005444h1099.790752a60.298872 60.298872 0 0 0 60.678111-61.057349l61.057348-452.241542H1076.467604l-2.844287 18.961909a223.371294 223.371294 0 0 1-66.177064 126.096699 217.87234 217.87234 0 0 1-150.178323 60.867729 221.285484 221.285484 0 0 1-216.924245-187.343666l-3.033906-18.961909H180.32776z" fill="#F4F5F7" p-id="10440"></path><path d="M202.133956 282.02048h447.121826a11.377146 11.377146 0 0 1 9.860193 11.187527 197.203859 197.203859 0 1 0 394.407718 0 10.618669 10.618669 0 0 1 10.049812-11.187527h442.570968L1251.675648 29.827084h-792.607818z" fill="#FFFFFF" p-id="10441"></path><path d="M1117.994186 338.147733l378.290095-0.568858-56.316872 405.974483-38.871914-0.948095 53.662204-371.08457-342.831325 1.327334z" fill="#FFFFFF" p-id="10442"></path></svg>

src/components/Pagination/index.vue

@@ -56,6 +56,10 @@ export default {
     sync: {
       type: Boolean,
       default: false
+    },
+    saveKey: {
+      type: String,
+      default: ''
     }
   },
   computed: {
@@ -86,7 +90,7 @@ export default {
   },
   mounted() {
     if (this.sync) {
-      const searchs = new Searchs(this.$route.path)
+      const searchs = new Searchs(this.saveKey || this.$route.path)
       const active = searchs.get()
       if (active && active.page) {
         for (const key in active.page) {
@@ -101,7 +105,7 @@ export default {
   methods: {
     syncStore() {
       if (this.sync) {
-        const searchs = new Searchs(this.$route.path)
+        const searchs = new Searchs(this.saveKey || this.$route.path)
         searchs.update(this._props, undefined, 'page')
       }
     },

src/views/chargeManager/one.vue

@@ -37,6 +37,7 @@
         </el-table>
         <pagination
           sync
+          save-key="chargeManager-one"
           :total.sync="pageInfo.total"
           :page.sync="pageInfo.page"
           :limit.sync="pageInfo.limit"

src/views/chargeManager/three.vue

@@ -33,6 +33,7 @@
         </el-table>
         <pagination
           sync
+          save-key="chargeManager-three"
           :total.sync="pageInfo.total"
           :page.sync="pageInfo.page"
           :limit.sync="pageInfo.limit"

src/views/editionManager/editionList.vue

@@ -85,7 +85,7 @@
       </div>
     </div>
     <!-- v-if="sectionVisible" -->
-    <el-dialog title="版本修改"
+    <el-dialog :title="isNew ? '版本添加' : '版本修改'"
                width="400px"
                :visible.sync="sectionVisible"
                :before-close="resetForm">
@@ -148,7 +148,7 @@
       </el-form>
       <div slot="footer"
            class="dialog-footer">
-        <el-button @click="sectionVisible = false">取 消</el-button>
+        <el-button @click="resetForm">取 消</el-button>
         <el-button v-if="isNew"
                    type="primary"
                    @click="createEdition">确 定</el-button>
@@ -243,6 +243,8 @@ export default {
     createEdition () {
       this.$refs.sectionForm.validate(v => {
         if (v) {
+          console.log(this.sectionForm)
+          return
           addAppVersionInfo(this.sectionForm).then(res => {
             if (res.code == 200) {
               this.$message.success('新增成功')
@@ -257,7 +259,9 @@ export default {
     },
     resetEdit (row) {
       this.isNew = false;
-      this.sectionForm = row;
+      this.$nextTick(() => {
+        this.sectionForm = row;
+      })
       this.sectionVisible = true;
     },
     resetEdition () {
@@ -280,7 +284,6 @@ export default {
         status: '',
         id: ''
       }
-      // console.log(this.sectionForm.status)
       this.$refs.sectionForm.resetFields();
       this.sectionVisible = false;
     }

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -653,6 +653,7 @@ export default {
           }).then((res) => {
             if (res.code == 200) {
               this.$message.success(`删除成功`);
+              this.$set(this.rules, 'page', 1)
               this.getList();
             }
           });

src/views/teamDetail/componentCourse/teacherList.vue

@@ -73,6 +73,20 @@
         </template>
       </el-table-column>
       <el-table-column align='center'
+                       prop="signOutAttachments"
+                       label="签退照片">
+        <template slot-scope="scope">
+          <el-image
+            v-if="scope.row.teacherAttendance && scope.row.teacherAttendance.signOutAttachments"
+            style="width: 60px; height: 60px"
+            fit="cover"
+            :src="scope.row.teacherAttendance.signOutAttachments"
+            :previewSrcList="[scope.row.teacherAttendance.signOutAttachments]"
+          >
+          </el-image>
+        </template>
+      </el-table-column>
+      <el-table-column align='center'
                        prop="teacherPhone"
                        label="签到状态">
         <template slot-scope="scope">

src/views/workBenchManager/journal/musicGroup.vue

@@ -92,7 +92,7 @@
             </el-input>
           </el-col>
         </el-row>
-        <el-row v-permission="'musicGroupQuit/quitMusicGroup'">
+        <el-row v-permission="'vipGroupManage/applyRefundAudit'">
           <el-col :span="24"
                   v-if="showMessage.studentApplyRefunds.status == 'ING'">
             <el-button type="primary"
@@ -134,7 +134,7 @@
           <el-col :span="20"> {{ showMessage.userComment }}</el-col>
         </el-row>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-input :disabled="showMessage.status != 'PROCESSING'"
                       type="textarea"
@@ -142,8 +142,38 @@
                       placeholder="请输入内容"
                       v-model.trim="remark"> </el-input>
           </el-col>
-        </el-row>
-        <el-row v-permission="'vipGroupManage/applyRefundAudit'">
+        </el-row> -->
+        <el-form :model="quitForm"
+               ref="quitForm"
+               :rules="quitRules">
+            <el-form-item label="退还课程费用" v-if="showMessage.status == 'PROCESSING'"
+                          prop="isRefundCourseFee">
+              <el-radio v-model.trim="quitForm.isRefundCourseFee"
+                        :label="true">是</el-radio>
+              <el-radio v-model.trim="quitForm.isRefundCourseFee"
+                        :label="false">否</el-radio>
+            </el-form-item>
+            <el-form-item label="退还乐器费用" v-if="showMessage.status == 'PROCESSING'"
+                          prop="isRefundInstrumentFee">
+              <el-radio v-model.trim="quitForm.isRefundInstrumentFee"
+                        :label="true">是</el-radio>
+              <el-radio v-model.trim="quitForm.isRefundInstrumentFee"
+                        :label="false">否</el-radio>
+            </el-form-item>
+            <el-form-item label="退还教辅费用" v-if="showMessage.status == 'PROCESSING'"
+                          prop="isRefundTeachingAssistantsFee">
+              <el-radio v-model.trim="quitForm.isRefundTeachingAssistantsFee"
+                        :label="true">是</el-radio>
+              <el-radio v-model.trim="quitForm.isRefundTeachingAssistantsFee"
+                        :label="false">否</el-radio>
+            </el-form-item>
+            <el-form-item label="退团原因"
+                          prop="reason">
+              <el-input type="textarea" :disabled="showMessage.status != 'PROCESSING'"
+                        v-model.trim="quitForm.reason"></el-input>
+            </el-form-item>
+          </el-form>
+        <el-row v-permission="'musicGroupQuit/quitMusicGroup'">
           <el-col :span="24"
                   v-if="showMessage.status == 'PROCESSING'">
             <el-button type="primary"
@@ -164,6 +194,7 @@
 <script>
 import {  queryCountOfUnread, sysMessageList, setRead,
   queryApplyRefundDetail, applyRefundAudit, musicGroupQuit, quitMusicGroup} from '@/api/journal'
+import cleanDeep from 'clean-deep'
 export default {
   name: 'musicGroup',
   data () {
@@ -176,6 +207,25 @@ export default {
         boxicon: require('@/assets/images/base/boxicon.png'),
         Hboxicon: require('@/assets/images/base/boxicon-h.png')
       },
+      quitForm: {
+        // 退团信息确认
+        isRefundCourseFee: null,
+        isRefundInstrumentFee: null,
+        isRefundTeachingAssistantsFee: null,
+        reason: ""
+      },
+      quitRules: {
+        isRefundCourseFee: [
+          { required: true, message: "请选择是否退还课程费用", trigger: 'change' }
+        ],
+        isRefundInstrumentFee: [
+          { required: true, message: "选择是否退还乐器费用", trigger: 'change' }
+        ],
+        isRefundTeachingAssistantsFee: [
+          { required: true, message: "选择是否退还教辅费用", trigger: 'change' }
+        ],
+        reason: [{ required: true, message: "请填写退团退费原因" }]
+      },
       pageInfo: {
         isSinglePage: false, // 是否只有一页
         limit: 10,
@@ -275,6 +325,8 @@ export default {
             this.showMessage = res.data
             this.showMessage.type = memo.type
             this.remark = res.data.reason
+            this.$refs.quitForm.resetFields()
+            this.quitForm.reason = res.data.reason
           } else {
             this.$message.error(res.msg)
           }
@@ -282,23 +334,39 @@ export default {
       }
     },
     onSubmitGroup (params, status) {
-      if (!this.remark || this.remark == '') {
-        this.$message.error('请输入退团理由')
-        return
-      }
-
-      quitMusicGroup({
-        id: params.id,
-        status: status,
-        reason: this.remark
-      }).then(res => {
-        this.$message.success('处理成功')
-
-        this.getItemInfo({
-          Id: params.id,
-          type: params.type
+      if(status == 'DENIED') {
+        this.$refs['quitForm'].resetFields()
+        this.$refs['quitForm'].validateField('reason', res => {
+          console.log(res)
+          if(!res) {
+            this.onSubmitGroups(params, status)
+          }
         })
-      })
+      } else {
+        this.$refs["quitForm"].validate(res => {
+          if (res) {
+            this.onSubmitGroups(params, status)
+          }
+        });
+      }
+    },
+    onSubmitGroups(params, status) {
+      this.$confirm("确定此操作吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(async () => {
+            let query = this.quitForm
+            query.id = params.id,
+            query.status = status
+            await quitMusicGroup(cleanDeep(query)).then(res => {
+              this.$message.success('处理成功')
+              this.getItemInfo({
+                Id: params.id,
+                type: params.type
+              })
+            })
+        }).catch(() => { });
     },
     onSubmit (id, str, type) {
       if (!this.remark || this.remark == '') {