Merge branch '0601optimize' into test

src/views/categroyManager/insideSetting/addressManager.vue

@@ -16,6 +16,7 @@
         :inline="true"
         class="searchForm"
         @submit="search"
+        @reset="onReset"
         :model="searchForm"
       >
         <el-form-item>
@@ -42,7 +43,19 @@
           </el-select>
         </el-form-item>
         <el-form-item>
+          <el-select
+            v-model.trim="searchForm.publicFlag"
+            clearable
+            filterable
+            placeholder="可用状态"
+          >
+            <el-option label="个人" value="0"></el-option>
+            <el-option label="公用" value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           <el-button native-type="submit" type="danger">搜索</el-button>
+           <el-button native-type="reset" type="primary">重置</el-button>
         </el-form-item>
       </save-form>
       <!-- 列表 -->
@@ -67,6 +80,11 @@
               {{ scope.row.cooperationOrganId ? scope.row.cooperationOrganId : '租赁' }}
             </template>  -->
           </el-table-column>
+          <el-table-column align="center" label="可用状态" width="120px">
+            <template slot-scope="scope">
+              {{ scope.row.userId ? scope.row.realName : "公共" }}
+            </template>
+          </el-table-column>
           <el-table-column align="center" width="120px" label="租赁费用">
             <template slot-scope="scope">
               {{ scope.row.cooperationOrganId ? "免费" : scope.row.remark }}
@@ -97,13 +115,19 @@
                 >修改</el-button
               >
               <el-button
-                v-if="scope.row.delFlag == 0 && $helpers.permission('school/update/stop')"
+                v-if="
+                  scope.row.delFlag == 0 &&
+                  $helpers.permission('school/update/stop')
+                "
                 @click="onUpdateSubmit(scope.row, 2)"
                 type="text"
                 >停用</el-button
               >
               <el-button
-                v-if="scope.row.delFlag == 2 && $helpers.permission('school/update/open')"
+                v-if="
+                  scope.row.delFlag == 2 &&
+                  $helpers.permission('school/update/open')
+                "
                 @click="onUpdateSubmit(scope.row, 0)"
                 type="text"
                 >启用</el-button
@@ -193,20 +217,33 @@
           </el-select>
         </el-form-item>
         <el-form-item
+          v-if="formActionTitle == 'update'"
+          prop="user"
+          label="可用状态"
+          :label-width="formLabelWidth"
+        >
+          <el-input v-model="form.user" disabled></el-input>
+        </el-form-item>
+        <el-form-item
           v-if="form.source == 2"
           prop="remark"
           label="租赁费用"
           :label-width="formLabelWidth"
         >
-          <el-input v-model.trim="form.remark" type="number" autocomplete="off"></el-input>
+          <el-input
+            v-model.trim="form.remark"
+            type="number"
+            autocomplete="off"
+          ></el-input>
         </el-form-item>
+        <!--    v-if="form.source == 2" -->
         <el-form-item
-          v-if="form.source == 2"
           prop="organId"
           label="所属分部"
           :label-width="formLabelWidth"
         >
           <el-select
+            :disabled="form.source != 2"
             v-model.trim="form.organId"
             clearable
             style="width: 100% !important"
@@ -220,10 +257,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
-          <!-- :show-message="addressMessage" -->
+        <!-- :show-message="addressMessage" -->
         <el-form-item
           prop="address"
-
           label="上课地点"
           :label-width="formLabelWidth"
         >
@@ -353,6 +389,7 @@ export default {
       searchForm: {
         search: null,
         organId: null,
+        publicFlag:null,
       },
       searchLsit: [],
       tableList: [],
@@ -388,7 +425,9 @@ export default {
         source: [
           { required: true, message: "请选择教学点来源", trigger: "change" },
         ],
-        remark: [{ required: true, message: "请输入租赁费用", trigger: "blur" }],
+        remark: [
+          { required: true, message: "请输入租赁费用", trigger: "blur" },
+        ],
         address: [
           { required: true, message: "请选择上课地点", trigger: "blur" },
         ],
@@ -481,8 +520,8 @@ export default {
       this.mapStatus = true;
       // let poi = this.addressDetail.poi
       // let address = this.addressDetail.address
-      this.addressDetail.address =  this.form.address
-      this.addressDetail.poi = this.form.longitudeLatitude
+      this.addressDetail.address = this.form.address;
+      this.addressDetail.poi = this.form.longitudeLatitude;
       let poi = this.form.longitudeLatitude;
       let address = this.form.address;
       // 获取经纬度
@@ -509,6 +548,7 @@ export default {
       }
     },
     onCooperationChange(value) {
+      this.form.organId = null;
       this.cooperationList.forEach((item) => {
         if (item.value == value) {
           // this.selectOrganId = item.organId
@@ -537,10 +577,10 @@ export default {
     },
     getpoient(e) {
       // let geocoder = new AMap.Geocoder()
-      let geocoder = null
-      AMap.plugin(["AMap.Geocoder"], function() {
-        geocoder = new AMap.Geocoder()
-      })
+      let geocoder = null;
+      AMap.plugin(["AMap.Geocoder"], function () {
+        geocoder = new AMap.Geocoder();
+      });
       let that = this;
       geocoder.getAddress(e.lnglat, function (status, result) {
         if (status === "complete" && result.regeocode) {
@@ -559,7 +599,7 @@ export default {
               ct.streetNumber,
             poi: e.lnglat.lng + "," + e.lnglat.lat,
           };
-          that.onSearchResult([{lng:e.lnglat.lng,lat:e.lnglat.lat}])
+          that.onSearchResult([{ lng: e.lnglat.lng, lat: e.lnglat.lat }]);
           // console.log(that.form.address,that.form.longitudeLatitude)
           // that.form.address = result.regeocode.formattedAddress;
           // that.mapStatus = false
@@ -589,6 +629,7 @@ export default {
       let params = {
         search: searchForm.search ? searchForm.search : null,
         organId: searchForm.organId ? searchForm.organId : null,
+        publicFlag:searchForm.publicFlag ? searchForm.publicFlag : null,
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
       };
@@ -651,7 +692,8 @@ export default {
           address: row.address.split(",").join(""), // 上课地点
           subsidy: row.subsidy, // 课酬补贴
           organId: row.organId,
-          longitudeLatitude:row.longitudeLatitude
+          longitudeLatitude: row.longitudeLatitude,
+          user: row.realName ? row.realName : "公共",
         };
       }
     },
@@ -717,6 +759,14 @@ export default {
       this.pageInfo.page = 1;
       this.getList();
     },
+    onReset(){
+      this.searchForm = {
+        search: null,
+        organId: null,
+        publicFlag:null,
+      }
+      this.search()
+    }
   },
 };
 </script>

src/views/main/constant.js

@@ -47,7 +47,7 @@ export const descs = {
   NO_CLASS_MUSIC_GROUP_STUDENT_INFO: '进行中乐团不在班级中的在读学员提醒',
   COURSE_TIME_ERROR: '上课时间在00:00~06:00时间段内为时间安排异常',
   TOTAL_AMOUNT:'总收入：现金收入 + 余额收入',
-  STUDENT_ERROR_LEAVE: '近两个月单月请假2次及以上',
+  STUDENT_ERROR_LEAVE: '当月请假2次及以上',
   STUDENT_ARREARAGE: '缴费项目中的学员未缴费'
 }
 

src/views/reaplceMusicPlayer/modals/detail.vue

@@ -96,18 +96,24 @@
           prop="mobileNo"
           label="联系电话"
         ></el-table-column>
-        <!-- <el-table-column
-          align="center"
-          prop="question1"
-          label="是否参加市赛"
-        >
-        </el-table-column> -->
-        <el-table-column
-          align="center"
-          label="是否置换"
-        >
+        <el-table-column align="center" prop="actualAmount" label="现金">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.actualAmount | moneyFormat }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="balance" label="余额">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.balance | moneyFormat }}
+            </div>
+          </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="是否置换">
           <template slot-scope="scope">
-            {{ scope.row.instrumentsId ? '是' : '否' }}
+            {{ scope.row.instrumentsId ? "是" : "否" }}
           </template>
         </el-table-column>
         <el-table-column
@@ -144,14 +150,24 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="studentId" label="操作" width="150px">
+        <el-table-column
+          align="center"
+          prop="studentId"
+          label="操作"
+          width="150px"
+        >
           <template slot-scope="scope">
             <div>
               <el-button
                 type="text"
                 @click="openFlagMusic(scope.row)"
-                v-if="scope.row.openFlag == 0 && scope.row.instrumentsId && permission('replacementInstrumentActivity/updateOpenFlag')"
-                >开启缴费</el-button>
+                v-if="
+                  scope.row.openFlag == 0 &&
+                  scope.row.instrumentsId &&
+                  permission('replacementInstrumentActivity/updateOpenFlag')
+                "
+                >开启缴费</el-button
+              >
               <el-button
                 type="text"
                 @click="resetMusic(scope.row)"
@@ -196,7 +212,11 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import resetInfo from "./resetInfo";
-import { getInstrumentSoundList, getInstrumentActivityList, updateOpenFlag } from "../api";
+import {
+  getInstrumentSoundList,
+  getInstrumentActivityList,
+  updateOpenFlag,
+} from "../api";
 import ItemVue from "@/layout/components/Sidebar/Item.vue";
 import Tooltip from "@/components/Tooltip/index";
 import { permission } from "@/utils/directivePage";
@@ -221,8 +241,8 @@ export default {
         specification: "",
         search: "",
         subjectId: "",
-        hasYesFirstAnswer: '',
-        hasInstrumentsId: ''
+        hasYesFirstAnswer: "",
+        hasInstrumentsId: "",
       },
       tableList: [],
       rules: {
@@ -235,7 +255,7 @@ export default {
       dialogVisible: false,
       branchList: [],
       resetRow: null,
-      soundList:soundList
+      soundList: soundList,
     };
   },
   mounted() {
@@ -254,11 +274,11 @@ export default {
           page: this.rules.page,
           rows: this.rules.limit,
         });
-         let temp = res.data.rows || []
-          temp.forEach(item => {
-              let questionResult = item.questionResult.split('')
-              item.question1 = questionResult[0] == 1 ? '是' : '否'
-          })
+        let temp = res.data.rows || [];
+        temp.forEach((item) => {
+          let questionResult = item.questionResult.split("");
+          item.question1 = questionResult[0] == 1 ? "是" : "否";
+        });
         this.tableList = temp;
         this.rules.total = res.data.total;
       } catch (e) {}
@@ -269,22 +289,22 @@ export default {
     },
     openFlagMusic(row) {
       // 开启缴费
-      this.$confirm('您是否开启缴费?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("您是否开启缴费?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       }).then(async () => {
         try {
           await updateOpenFlag({
             Id: row.id,
-            openFlag: 1
-          })
-          this.$message.success('开启成功')
-          this.getList()
+            openFlag: 1,
+          });
+          this.$message.success("开启成功");
+          this.getList();
         } catch {
           //
         }
-      })
+      });
     },
     onReSet() {
       this.$refs.searchForm.resetFields();
@@ -328,10 +348,10 @@ export default {
   },
   filters: {
     openFlagStatus(val) {
-      let template = ['否', '是']
-      return template[val]
-    }
-  }
+      let template = ["否", "是"];
+      return template[val];
+    },
+  },
 };
 </script>