Merge branch 'online' into LAO_MO

dist/static/css/chunk-0790736e.cc6abe72.css → dist/static/css/chunk-60939714.14e6e9b0.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{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-31cb099a]{display:none}.point[data-v-31dc8938]{font-weight:700;color:#13817a}
+.pagination-container[data-v-31cb099a]{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-31cb099a]{display:none}.point[data-v-81291b6a]{font-weight:700;color:#13817a}

dist/static/css/chunk-96b2ff4c.be1e4525.css → dist/static/css/chunk-78687725.70ac2296.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{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-31cb099a]{display:none}.point[data-v-530a056e]{font-weight:700;color:#13817a}
+.pagination-container[data-v-31cb099a]{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-31cb099a]{display:none}.newBand[data-v-2d578c0d]{display:inline-block}.noWrap[data-v-2d578c0d]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}

dist/static/css/chunk-2b42b68a.aaafb295.css → dist/static/css/chunk-bb96cef4.8afa4d26.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{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-31cb099a]{display:none}.newBand{display:inline-block}
+.pagination-container[data-v-31cb099a]{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-31cb099a]{display:none}.point[data-v-545b269e]{font-weight:700;color:#13817a}

src/views/businessManager/orderManager/businessStatement.vue

@@ -94,7 +94,7 @@
           <el-table-column align='center'
                            prop="otherIncome"
                            width="150px"
-                           label="不确定收入(元)">
+                           label="其它收入(元)">
             <template slot-scope="scope">
               <div>
                 {{scope.row.otherIncome | moneyFormat}}

src/views/businessManager/orderManager/businessStatementDetail.vue

@@ -96,7 +96,7 @@
           <el-table-column align='center'
                            prop="otherIncome"
                            width="150px"
-                           label="不确定收入(元)">
+                           label="其它收入(元)">
             <template slot-scope="scope">
               <div>
                 {{scope.row.otherIncome | moneyFormat}}

src/views/businessManager/orderManager/financeManager.vue

@@ -488,9 +488,9 @@ export default {
         organId: [
           { required: true, message: "请选择所属分部", trigger: "change" }
         ],
-        schoolId: [
-          { required: true, message: "请选择学校", trigger: "change" }
-        ],
+        // schoolId: [
+        //   { required: true, message: "请选择学校", trigger: "change" }
+        // ],
         actualAmount: [
           { required: true, message: "请输入金额", trigger: "blur" }
         ],

src/views/businessManager/orderManager/payRecord.vue

@@ -131,10 +131,27 @@
           </el-table-column>
           <el-table-column align='center'
                            prop="paymentTime"
-                           label="付款时间"></el-table-column>
+                           label="付款时间">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.paymentTime|dayjsFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align='center'
                            prop="cause"
-                           label="事由"></el-table-column>
+                           label="事由">
+            <template slot-scope="scope">
+              <div>
+                <el-tooltip class="item"
+                            effect="dark"
+                            :content="scope.row.cause"
+                            placement="top">
+                  <div class="noWrap">{{scope.row.cause}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align='center'
                            label="费用类型">
             <template slot-scope="scope">{{ scope.row.type | feeType }}</template>
@@ -382,8 +399,13 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .newBand {
   display: inline-block;
 }
+.noWrap {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>

src/views/teamBuild/signupList.vue

@@ -210,15 +210,15 @@
                            v-if='scope.row.paymentStatus==2'
                            @click='lookdetail(scope.row)'>查看</el-button>
                 <el-button type='text'
-                           v-permission="'studentRegistration/queryFeeDetail'"
+                           v-permission="'musicGroupQuit/directQuitMusicGroup2'"
                            v-if='scope.row.paymentStatus==2'
                            @click='quitTeam(scope.row)'>退团</el-button>
                 <el-button type="text"
                            v-if="permission('visit/add')"
                            @click="addVisit(scope.row)">新增回访</el-button>
                 <el-button type="text"
-                            v-if="scope.row.paymentStatus==2"
-                            v-permission="'subjectChange/getStudentOriginal'"
+                           v-if="scope.row.paymentStatus==2"
+                           v-permission="'subjectChange/getStudentOriginal'"
                            @click="openChangeVoice(scope.row)">更改声部</el-button>
               </div>
             </template>
@@ -509,20 +509,16 @@
                    @click="submitAddVisit">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      title="更改声部"
-      :visible.sync="changeVoiceVisible"
-      @close="closeChangeVoice"
-      :destroy-on-close="true"
-      width="500px"
-    >
-      <changeVoice
-        @close="closeChangeVoice"
-        @submited="getList"
-        :detail.sync="rowDetail"
-        :musicGroupId="id"
-        :voiceList="leftList"
-      />
+    <el-dialog title="更改声部"
+               :visible.sync="changeVoiceVisible"
+               @close="closeChangeVoice"
+               :destroy-on-close="true"
+               width="500px">
+      <changeVoice @close="closeChangeVoice"
+                   @submited="getList"
+                   :detail.sync="rowDetail"
+                   :musicGroupId="id"
+                   :voiceList="leftList" />
     </el-dialog>
   </div>
 </template>
@@ -1108,18 +1104,18 @@ export default {
       this.visitForm.studentId = row.studentId
       this.visitVisiable = true;
     },
-    openChangeVoice(row) {
+    openChangeVoice (row) {
       this.getList()
-      .then(res => {
-        for (const item of res.data.rows) {
-          if (item.id === row.id) {
-            this.rowDetail = {...item}
-            this.changeVoiceVisible = true
+        .then(res => {
+          for (const item of res.data.rows) {
+            if (item.id === row.id) {
+              this.rowDetail = { ...item }
+              this.changeVoiceVisible = true
+            }
           }
-        }
-      })
+        })
     },
-    closeChangeVoice() {
+    closeChangeVoice () {
       this.changeVoiceVisible = false
       // this.rowDetail = null
     },