提交测试

1

src/utils/vueFilter.js

@@ -582,6 +582,14 @@ Vue.filter('paymentStatusDetall', value => {
   }
   return template[value]
 })
+Vue.filter('replacementInsFilter', value => {
+  let template = {
+    2: "已缴费",
+   1: "缴费中",
+    0: "未缴费",
+  }
+  return template[value]
+})
 
 // 课时申诉
 Vue.filter('complaintsStatusEnum', value => {
@@ -745,4 +753,4 @@ Vue.filter('downListType', value => {
 // 退团状态
 Vue.filter('withdrawalStatus', value => {
   return constant.withdrawalStatus[value]
-})
+})

src/views/reaplceMusicPlayer/index.vue

@@ -86,7 +86,7 @@
             <template slot-scope="scope">
               <div>
                 {{ scope.row.cooperationOrganName }}
-                (<copy-text> {{ scope.row.cooperationOrganId }} </copy-text>)
+                <!-- (<copy-text> {{ scope.row.cooperationOrganId }} </copy-text>) -->
               </div>
             </template>
           </el-table-column>
@@ -105,6 +105,11 @@
               <div>{{ scope.row.replaceScale }}%</div>
             </template>
           </el-table-column>
+               <el-table-column align="center" prop="replaceScale" label="缴费率">
+            <template slot-scope="scope">
+              <div>{{ scope.row.payScale }}%</div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="openPay" label="是否开启缴费">
             <template slot-scope="scope">
               <div>{{ scope.row.openPay ? "是" : "否" }}</div>

src/views/reaplceMusicPlayer/modals/detail.vue

@@ -31,9 +31,9 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="brand">
+      <el-form-item prop="specification">
         <el-select
-          v-model.trim="searchForm.brand"
+          v-model.trim="searchForm.specification"
           filterable
           clearable
           placeholder="请选择品牌型号"
@@ -60,8 +60,8 @@
       >
         <el-table-column
           align="center"
-          prop="subjectName"
-          label="声部"
+          prop="userId"
+          label="学员编号"
         ></el-table-column>
         <el-table-column
           align="center"
@@ -73,15 +73,44 @@
           prop="mobileNo"
           label="联系电话"
         ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="subjectName"
+          label="声部"
+        ></el-table-column>
         <el-table-column align="center" prop="studentId" label="品牌型号">
           <template slot-scope="scope">
             <div>{{ scope.row.brand }}{{ scope.row.specification }}</div>
           </template>
         </el-table-column>
+        <el-table-column
+          align="center"
+          prop="payStatus"
+          label="缴费状态"
+        >
+        <template  slot-scope="scope">
+          <div>
+            {{scope.row.payStatus|replacementInsFilter}}
+          </div>
+        </template>
+        </el-table-column>
+        <el-table-column align="center" label="其他建议">
+          <template slot-scope="scope">
+            <Tooltip
+              :content="
+                scope.row.otherSuggestion ? scope.row.otherSuggestion : ''
+              "
+            />
+          </template>
+        </el-table-column>
+
         <el-table-column align="center" prop="studentId" label="操作">
           <template slot-scope="scope">
             <div>
-              <el-button type="text" @click="resetMusic(scope.row)" v-if="permission('replacementInstrumentActivity/update')"
+              <el-button
+                type="text"
+                @click="resetMusic(scope.row)"
+                v-if="permission('replacementInstrumentActivity/update')"
                 >修改</el-button
               >
             </div>
@@ -104,12 +133,15 @@
       append-to-body
       v-if="dialogVisible"
     >
-      <resetInfo @close="close" :detail="resetRow" ref='resetInfo' @getList='getList'/>
+      <resetInfo
+        @close="close"
+        :detail="resetRow"
+        ref="resetInfo"
+        @getList="getList"
+      />
       <div slot="footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="updateInfo"
-          >确认修改</el-button
-        >
+        <el-button type="primary" @click="updateInfo">确认修改</el-button>
       </div>
     </el-dialog>
   </div>
@@ -119,15 +151,16 @@ import pagination from "@/components/Pagination/index";
 import resetInfo from "./resetInfo";
 import { getInstrumentSoundList, getInstrumentActivityList } from "../api";
 import ItemVue from "@/layout/components/Sidebar/Item.vue";
+import Tooltip from "@/components/Tooltip/index";
 import { permission } from "@/utils/directivePage";
 export default {
-  components: { pagination, resetInfo },
+  components: { pagination, resetInfo, Tooltip },
   props: ["detail"],
   data() {
     return {
       searchForm: {
         cooperationOrganId: "",
-        brand: "",
+        specification: "",
         search: "",
         subjectId: "",
       },
@@ -141,7 +174,7 @@ export default {
       },
       dialogVisible: false,
       branchList: [],
-      resetRow:null
+      resetRow: null,
     };
   },
   mounted() {
@@ -174,14 +207,14 @@ export default {
       this.search();
     },
     resetMusic(row) {
-      this.resetRow = row
+      this.resetRow = row;
       this.dialogVisible = true;
     },
     close() {
       this.dialogVisible = false;
     },
     async changeSound(val) {
-      this.searchForm.brand='';
+      this.searchForm.brand = "";
       if (val) {
         try {
           const res = await getInstrumentSoundList({
@@ -192,7 +225,7 @@ export default {
           this.branchList = res.data.rows.map((item) => {
             return {
               name: item.brand + item.specification,
-              id: item.brand,
+              id: item.specification,
             };
           });
           console.log(res);
@@ -201,10 +234,10 @@ export default {
         }
       }
     },
-    updateInfo(){
-      this.$refs.resetInfo.submited()
+    updateInfo() {
+      this.$refs.resetInfo.submited();
     },
-      permission(str, parent) {
+    permission(str, parent) {
       return permission(str, parent);
     },
   },