金额格式化设置

111

src/utils/searchArray.js

@@ -65,7 +65,8 @@ const orderStatus = [
   { value: 'PRACTICE_GROUP_RENEW', label: '网管课续费' },
   { value: 'REPAIR', label: '乐器维修' },
   { value: 'OUTORDER', label: '外部收入' },
-  { value: 'GOODS_SELL', label: '商品销售' }
+  { value: 'GOODS_SELL', label: '商品销售' },
+  { value: 'SUBJECT_CHANGE', label: '乐器更换' }
 
 ]
 

src/utils/vueFilter.js

@@ -243,7 +243,8 @@ Vue.filter('orderType', value => {
     PRACTICE_GROUP_RENEW: '网管课续费',
     REPAIR: '乐器维修',
     OUTORDER: '外部收入',
-    GOODS_SELL: '商品销售'
+    GOODS_SELL: '商品销售',
+    SUBJECT_CHANGE: '乐器更换'
 
   }
   return template[value]

src/views/businessManager/orderManager/backMoney.vue

@@ -62,10 +62,20 @@
           <el-table-column align='center'
                            prop="studentPaymentOrder.expectAmount"
                            label="应付金额">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.studentPaymentOrder.expectAmount | moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="studentPaymentOrder.actualAmount"
                            label="实付金额">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.studentPaymentOrder.actualAmount | moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="user.username"
@@ -78,10 +88,20 @@
           <el-table-column align='center'
                            prop="expectAmount"
                            label="预退费金额">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.expectAmount| moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
           <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'
                            label="退费状态">

src/views/businessManager/orderManager/expend.vue

@@ -37,11 +37,11 @@
           <el-table-column align='center'
                            prop="createTime"
                            label="申请时间">
-                            <template slot-scope="scope">
-                             <div>
-                               {{scope.row.createTime | dateForMinFormat}}
-                             </div>
-                           </template>
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.createTime | dateForMinFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="user.realName"
@@ -50,10 +50,20 @@
           <el-table-column align='center'
                            prop="amount"
                            label="提现金额">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.amount| moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="detail.balance"
                            label="账户余额(元)">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.detail.balance| moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="bankCardNo"

src/views/businessManager/orderManager/financeManager.vue

@@ -49,6 +49,18 @@
                     @mousewheel.native.prevent
                     v-model.trim="searchForm.actualAmount"></el-input>
         </el-form-item>
+        <el-form-item>
+          <el-input placeholder="余额支付小于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="searchForm.lessBalancePaymentAmount"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="现金支付小于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="searchForm.lessActualAmount"></el-input>
+        </el-form-item>
         <el-form-item prop="routingOrganId">
           <el-select class="multiple"
                      v-model.trim="searchForm.routingOrganId"
@@ -108,13 +120,13 @@
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-        营收金额：{{ totalRevenueAmount }}元
+        营收金额：{{ totalRevenueAmount|moneyFormat }}元
         <i style="width: 10px; display: inline-block"></i>
-        实收金额：{{ totalActualAmount }}元
+        实收金额：{{ totalActualAmount|moneyFormat }}元
         <i style="width: 10px; display: inline-block"></i>
-        预收金额：{{ totalAdvanceAmount }}元
+        预收金额：{{ totalAdvanceAmount |moneyFormat}}元
         <i style="width: 10px; display: inline-block"></i>
-        预收余额：{{ totalUserBalance }}元
+        预收余额：{{ totalUserBalance |moneyFormat}}元
       </div>
       <div class="tableWrap">
         <el-table :data="tableList"
@@ -138,19 +150,49 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="expectAmount"
-                           label="应付金额"></el-table-column>
+                           label="应付金额">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.expectAmount | moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="balancePaymentAmount"
-                           label="余额支付"></el-table-column>
+                           label="余额支付">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.balancePaymentAmount | moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="actualAmount"
-                           label="现金支付"></el-table-column>
+                           label="现金支付">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.actualAmount | moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="routeAmount"
-                           label="分润金额"></el-table-column>
+                           label="分润金额">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.routeAmount | moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="routeBalanceAmount"
-                           label="分润余额"></el-table-column>
+                           label="分润余额">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.routeBalanceAmount | moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            label="学员姓名">
             <template slot-scope="scope">
@@ -401,7 +443,9 @@ export default {
         balancePaymentAmount: null,
         orderNo: null,
         transNo: null,
-        merNos: null
+        merNos: null,
+        lessBalancePaymentAmount: null,
+        lessActualAmount: null
       },
       tableList: [],
       organList: [],
@@ -561,7 +605,9 @@ export default {
         balancePaymentAmount: searchForm.balancePaymentAmount,
         paymentStatus: searchForm.paymentStatus,
         paymentType: searchForm.paymentType,
-        organId: searchForm.organId
+        organId: searchForm.organId,
+        lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
+        lessActualAmount: searchForm.lessActualAmount
       };
 
       if (this.orderDate && this.orderDate.length > 0) {
@@ -683,7 +729,7 @@ export default {
         params.orderStartDate = null;
         params.orderEndDate = null;
       }
-      routeOrderFinance(params).then(res => {
+      routeOrderFinance(cleanDeep(params)).then(res => {
         let result = res.data;
         if (res.code == 200) {
           this.tableList = result.rows;
@@ -726,7 +772,9 @@ export default {
         balancePaymentAmount: null,
         orderNo: null,
         transNo: null,
-        merNos: null
+        merNos: null,
+        lessBalancePaymentAmount: null,
+        lessActualAmount: null
       };
       this.getList();
     },

src/views/businessManager/orderManager/income.vue

@@ -43,6 +43,18 @@
                     @mousewheel.native.prevent
                     v-model.trim="searchForm.actualAmount"></el-input>
         </el-form-item>
+        <el-form-item>
+          <el-input placeholder="余额支付小于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="searchForm.lessBalancePaymentAmount"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="现金支付小于等于"
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="searchForm.lessActualAmount"></el-input>
+        </el-form-item>
         <el-form-item prop="organId">
           <el-select class="multiple"
                      v-model.trim="searchForm.organId"
@@ -114,10 +126,10 @@
         实收金额=应收总额（包含余额支付）
         预收金额=充值总额（发生消费，记负数）
         预收余额=充值总余额 -->
-        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
-        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
-        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
-        预收余额：{{ totalUserBalance }}元
+        营收金额：{{ totalRevenueAmount | moneyFormat }}元<i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount | moneyFormat}}元<i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount | moneyFormat }}元<i style="width: 10px; display: inline-block"></i>
+        预收余额：{{ totalUserBalance |moneyFormat}}元
       </div>
       <div class="tableWrap">
         <el-table :data="tableList"
@@ -143,13 +155,31 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="expectAmount"
-                           label="应付金额"></el-table-column>
+                           label="应付金额">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.expectAmount | moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="balancePaymentAmount"
-                           label="余额支付"></el-table-column>
+                           label="余额支付">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.balancePaymentAmount | moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="actualAmount"
-                           label="现金支付"></el-table-column>
+                           label="现金支付">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.actualAmount | moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            label="学员姓名">
             <template slot-scope="scope">
@@ -225,7 +255,9 @@ export default {
         balancePaymentAmount: null,
         orderNo: null,
         transNo: null,
-        merNos: null
+        merNos: null,
+        lessBalancePaymentAmount: null,
+        lessActualAmount: null
       },
       tableList: [],
       organList: [],
@@ -288,7 +320,9 @@ export default {
         balancePaymentAmount: searchForm.balancePaymentAmount,
         paymentStatus: searchForm.paymentStatus,
         paymentType: searchForm.paymentType,
-        organId: searchForm.organId
+        organId: searchForm.organId,
+        lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
+        lessActualAmount: searchForm.lessActualAmount
       }
       if (this.orderDate && this.orderDate.length > 0) {
         data.orderStartDate = this.orderDate[0];
@@ -375,7 +409,7 @@ export default {
         params.orderStartDate = null;
         params.orderEndDate = null;
       }
-      orderQueryPage(params).then(res => {
+      orderQueryPage(cleanDeep(params)).then(res => {
         let result = res.data;
         if (res.code == 200) {
           this.tableList = result.rows;
@@ -421,7 +455,9 @@ export default {
         balancePaymentAmount: null,
         orderNo: null,
         transNo: null,
-        merNos: null
+        merNos: null,
+        lessBalancePaymentAmount: null,
+        lessActualAmount: null
       };
       this.getList();
     }

src/views/businessManager/orderManager/incomeOut.vue

@@ -97,8 +97,8 @@
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-        应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-        现金实收总额：{{ totalActualAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
+        应收总金额：{{ totalExpectAmount |moneyFormat}}元 &nbsp;&nbsp;&nbsp;&nbsp;
+        现金实收总额：{{ totalActualAmount| moneyFormat }}元 &nbsp;&nbsp;&nbsp;&nbsp;
         <!-- 余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元  -->
       </div>
       <div class="tableWrap">
@@ -128,11 +128,23 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="expectAmount"
-                           label="应付金额"></el-table-column>
+                           label="应付金额">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.expectAmount|moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <!-- <el-table-column align="center" prop="balancePaymentAmount" label="余额支付"></el-table-column> -->
           <el-table-column align="center"
                            prop="actualAmount"
-                           label="现金支付"></el-table-column>
+                           label="现金支付">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.actualAmount|moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            label="用户姓名">
             <template slot-scope="scope">

src/views/businessManager/orderManager/payRecord.vue

@@ -4,34 +4,49 @@
       <div class="squrt"></div>支出记录
     </h2>
     <div class="m-core">
-      <el-upload
-        v-permission="'import/downloadTemplate'"
-        style="display: inline-block;"
-        action="/api-web/import/financialExpenditure"
-        :show-file-list="false"
-        :before-upload="beforeUpload"
-        accept=".xlsx,.xls"
-        :headers="headers"
-        :on-error="handleError"
-        :on-success="handleSuccess">
+      <el-upload v-permission="'import/downloadTemplate'"
+                 style="display: inline-block;"
+                 action="/api-web/import/financialExpenditure"
+                 :show-file-list="false"
+                 :before-upload="beforeUpload"
+                 accept=".xlsx,.xls"
+                 :headers="headers"
+                 :on-error="handleError"
+                 :on-success="handleSuccess">
         <el-button class="btn-primary">导入</el-button>
       </el-upload>
-      <el-button @click="downloadFile" v-permission="'import/downloadTemplate'" class="btn-primary">模版文件下载</el-button>
+      <el-button @click="downloadFile"
+                 v-permission="'import/downloadTemplate'"
+                 class="btn-primary">模版文件下载</el-button>
       <!-- 搜索类型 -->
       <el-form :inline="true"
                class="searchForm"
                v-model.trim="searchForm">
         <el-form-item>
-          <el-input v-model.trim="searchForm.search" placeholder="批次号、申请人等" type="text"></el-input>
+          <el-input v-model.trim="searchForm.search"
+                    placeholder="批次号、申请人等"
+                    type="text"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.organId" clearable filterable placeholder="请选择所属分部">
-            <el-option v-for="(item,index) in organList" :key="index" :label="item.name" :value="item.id"></el-option>
+          <el-select v-model.trim="searchForm.organId"
+                     clearable
+                     filterable
+                     placeholder="请选择所属分部">
+            <el-option v-for="(item,index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select clearable filterable placeholder="请选择所属学校" v-model="searchForm.cooperationOrganId">
-            <el-option v-for="(item,index) in cooperations" :key="index" :label="item.name" :value="item.id"></el-option>
+          <el-select clearable
+                     filterable
+                     placeholder="请选择所属学校"
+                     v-model="searchForm.cooperationOrganId">
+            <el-option v-for="(item,index) in cooperations"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item>
@@ -62,46 +77,85 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search" type="danger">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
+          <el-button @click="search"
+                     type="danger">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <!-- 列表 -->
       <el-row>
         <el-col :span="24">
-          <el-button type="primary" v-permission="'financialExpenditure/batchDel/901'" size="medium" icon="el-icon-delete" style="background-color: #14928a; border: 1px solid #14928a; margin-bottom: 15px;" @click="onBatchDel">批量删除</el-button>
+          <el-button type="primary"
+                     v-permission="'financialExpenditure/batchDel/901'"
+                     size="medium"
+                     icon="el-icon-delete"
+                     style="background-color: #14928a; border: 1px solid #14928a; margin-bottom: 15px;"
+                     @click="onBatchDel">批量删除</el-button>
         </el-col>
       </el-row>
       <div class="tableWrap">
-        <el-table :data='tableList' style="width: 100%"
+        <el-table :data='tableList'
+                  style="width: 100%"
                   @selection-change="handleSelectionChange"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column type="selection" width="50"></el-table-column>
-          <el-table-column align='center' prop="id" label="批次号"></el-table-column>
-          <el-table-column align='center' prop="financialProcessNo" label="流程编号"></el-table-column>
-          <el-table-column align='center' prop="dingtalkProcessNo" label="钉钉流程编号"></el-table-column>
-          <el-table-column align='center' prop="organName" label="费用归属分部"></el-table-column>
-          <el-table-column align='center' prop="cooperationName" label="费用归属学校"></el-table-column>
-          <el-table-column align='center' prop="applyUser" label="申请人"></el-table-column>
+          <el-table-column type="selection"
+                           width="50"></el-table-column>
+          <el-table-column align='center'
+                           prop="id"
+                           label="批次号"></el-table-column>
+          <el-table-column align='center'
+                           prop="financialProcessNo"
+                           label="流程编号"></el-table-column>
+          <el-table-column align='center'
+                           prop="dingtalkProcessNo"
+                           label="钉钉流程编号"></el-table-column>
+          <el-table-column align='center'
+                           prop="organName"
+                           label="费用归属分部"></el-table-column>
+          <el-table-column align='center'
+                           prop="cooperationName"
+                           label="费用归属学校"></el-table-column>
+          <el-table-column align='center'
+                           prop="applyUser"
+                           label="申请人"></el-table-column>
           <!-- <el-table-column align='center' prop="itemDetail" label="费用项目"></el-table-column> -->
-          <el-table-column align='center' prop="amount" label="付款金额"></el-table-column>
-          <el-table-column align='center' prop="paymentTime" label="付款时间"></el-table-column>
-          <el-table-column align='center' prop="cause" label="事由"></el-table-column>
-          <el-table-column align='center' label="费用类型">
+          <el-table-column align='center'
+                           prop="amount"
+                           label="付款金额">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.amount|moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align='center'
+                           prop="paymentTime"
+                           label="付款时间"></el-table-column>
+          <el-table-column align='center'
+                           prop="cause"
+                           label="事由"></el-table-column>
+          <el-table-column align='center'
+                           label="费用类型">
             <template slot-scope="scope">{{ scope.row.type | feeType }}</template>
           </el-table-column>
-          <el-table-column align='center' label="费用项目">
+          <el-table-column align='center'
+                           label="费用项目">
             <template slot-scope="scope">{{ scope.row.feeProject | feeProject }}</template>
           </el-table-column>
-          <el-table-column align='center' prop="itemDetail" label="备注"></el-table-column>
-          <el-table-column align='center' width='120px' fixed="right" label="操作">
+          <el-table-column align='center'
+                           prop="itemDetail"
+                           label="备注"></el-table-column>
+          <el-table-column align='center'
+                           width='120px'
+                           fixed="right"
+                           label="操作">
             <template slot-scope="scope">
-              <el-popconfirm
-                title="确定删除该条数据吗？"
-                @onConfirm="() => removeRecord(scope.row.id)"
-                v-permission="'financialExpenditure/batchDel/902'"
-              >
-                <el-button type="text" slot="reference">删除</el-button>
+              <el-popconfirm title="确定删除该条数据吗？"
+                             @onConfirm="() => removeRecord(scope.row.id)"
+                             v-permission="'financialExpenditure/batchDel/902'">
+                <el-button type="text"
+                           slot="reference">删除</el-button>
               </el-popconfirm>
             </template>
           </el-table-column>
@@ -194,11 +248,11 @@ export default {
       }
     })
     getCooperation({ 'rows': 1000, })
-    .then(res => {
-      if (res.code == 200) {
-        this.cooperations = res.data.rows;
-      }
-    })
+      .then(res => {
+        if (res.code == 200) {
+          this.cooperations = res.data.rows;
+        }
+      })
     this.getList()
     var now = new Date();
     var startDate = dayjs().format('YYYY-MM-DD');
@@ -209,34 +263,34 @@ export default {
     this.searchOrderDate(this.orderDate)
   },
   methods: {
-    editRecord(detail) {
+    editRecord (detail) {
       this.visible = true
       this.detail = detail
     },
-    removeRecord(id) {
+    removeRecord (id) {
       removeFinancialExpenditure({
-          ids: id
-        })
-      .then(() => this.getList())
+        ids: id
+      })
+        .then(() => this.getList())
     },
-    beforeUpload(file) {
+    beforeUpload (file) {
       load.startLoading()
     },
-    handleSuccess(response, file, fileList) {
+    handleSuccess (response, file, fileList) {
       load.endLoading()
       console.log(response, file, fileList)
-      if(response.code == 200) {
+      if (response.code == 200) {
         this.$message.success('导入成功')
         this.getList()
       } else {
         this.$message.error(response.msg)
       }
     },
-    handleError(err, file, fileList) {
+    handleError (err, file, fileList) {
       load.endLoading()
       console.log(err, file, fileList)
     },
-    downloadFile() {
+    downloadFile () {
       Export(this, {
         url: '/api-web/import/downloadTemplate',
         fileName: '财务支出导入模板.xlsx',
@@ -306,10 +360,10 @@ export default {
       this.pageInfo.page = 1
       this.getList()
     },
-    onBatchDel() {
+    onBatchDel () {
       // 批量删除
       const passed = this.passed
-      if(passed.length <= 0) {
+      if (passed.length <= 0) {
         this.$message.error('请至少选择一条数据')
         return
       }
@@ -322,14 +376,14 @@ export default {
           ids: this.passed.join(',')
         })
       })
-      .then(() => this.getList())
-      .catch(() => { });
+        .then(() => this.getList())
+        .catch(() => { });
     }
   }
 }
 </script>
 <style lang="scss">
-  .newBand{
-    display: inline-block;
-  }
+.newBand {
+  display: inline-block;
+}
 </style>

src/views/businessManager/orderManager/salesList.vue

@@ -99,20 +99,38 @@
           <el-table-column align='center'
                            width="100"
                            prop="expectAmount"
-                           label="应付金额(元)"></el-table-column>
+                           label="应付金额(元)">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.expectAmount|moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align='center'
                            width="100"
                            prop="balanceAmount"
-                           label="余额支付(元)"></el-table-column>
+                           label="余额支付(元)">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.balanceAmount|moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align='center'
                            width="100"
                            prop="actualAmount"
-                           label="现金支付(元)"></el-table-column>
+                           label="现金支付(元)">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.actualAmount|moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align='center'
                            width="100"
                            prop="sellCost"
                            label="销售成本(元)">
-            <template slot-scope="scope">{{ scope.row.sellCost * scope.row.num }}</template>
+            <template slot-scope="scope">{{ (scope.row.sellCost * scope.row.num)| moneyFormat}}</template>
           </el-table-column>
           <el-table-column align='center'
                            prop="userName"

src/views/businessManager/resetList/index.vue

@@ -203,7 +203,7 @@ import { getSubjectChangeList } from "@/api/businessManager"
 import resetSound from './resetSound'
 import { saleStatus } from '@/utils/searchArray'
 import cleanDeep from 'clean-deep'
-import {getNowDateAndMonday,getNowDateAndSunday} from '@/utils/utils'
+import { getNowDateAndMonday, getNowDateAndSunday } from '@/utils/utils'
 let nowTime = new Date();
 nowTime =
   nowTime.getFullYear() +
@@ -217,9 +217,9 @@ export default {
     return {
       searchForm: {
         search: null,
-       
+
       },
-       resetDate: [],
+      resetDate: [],
       show: false,
       teacherList: [],
       tableList: [],
@@ -271,12 +271,12 @@ export default {
       let params = this.searchForm
       params.rows = this.rules.limit
       params.page = this.rules.page
-      if(this.searchForm.resetDate&&this.searchForm.resetDate.length >1){
-             params.startTime = this.searchForm.resetDate[0]
-      params.endTime = this.searchForm.resetDate[1]
+      if (this.searchForm.resetDate && this.searchForm.resetDate.length > 1) {
+        params.startTime = this.searchForm.resetDate[0]
+        params.endTime = this.searchForm.resetDate[1]
       }
- 
-     
+
+
       getSubjectChangeList(cleanDeep(params)).then(res => {
         if (res.code === 200) {
           this.rules.total = res.data.total;
@@ -286,7 +286,7 @@ export default {
     },
     reset (row) {
       console.log(row)
-      this.activeRow = row 
+      this.activeRow = row
       this.show = true
     },
     closeReset () {
@@ -301,10 +301,15 @@ export default {
       this.search()
     },
     accessoriesFormatter (accessories) {
-      let arr = accessories.map(res => {
-        return res.name
-      })
-      return arr.join(',')
+      if (accessories && accessories.length > 0) {
+        let arr = accessories.map(res => {
+          return res.name
+        })
+        return arr.join(',')
+      } else {
+        return ''
+      }
+
     }
   }
 };

src/views/businessManager/shopManager/shopList.vue

@@ -4,20 +4,23 @@
       <div class="squrt"></div>商品列表
     </h2>
     <div class="m-core">
-      <el-button class="btn-primary" @click="onShopOperation('create')" v-permission="'/shopOperation'">添加</el-button>
-      <el-upload
-        v-permission="'import/goods'"
-        style="display: inline-block;"
-        action="/api-web/import/goods"
-        :show-file-list="false"
-        :before-upload="beforeUpload"
-        accept=".xlsx,.xls"
-        :headers="headers"
-        :on-error="handleError"
-        :on-success="handleSuccess">
+      <el-button class="btn-primary"
+                 @click="onShopOperation('create')"
+                 v-permission="'/shopOperation'">添加</el-button>
+      <el-upload v-permission="'import/goods'"
+                 style="display: inline-block;"
+                 action="/api-web/import/goods"
+                 :show-file-list="false"
+                 :before-upload="beforeUpload"
+                 accept=".xlsx,.xls"
+                 :headers="headers"
+                 :on-error="handleError"
+                 :on-success="handleSuccess">
         <el-button class="btn-primary">商品导入</el-button>
       </el-upload>
-      <el-button class="btn-primary" @click="onDownload" v-permission="'import/downloadTemplate'">下载模板</el-button>
+      <el-button class="btn-primary"
+                 @click="onDownload"
+                 v-permission="'import/downloadTemplate'">下载模板</el-button>
       <!-- 搜索类型 -->
       <!-- <el-form :inline="true"
                class="searchForm"
@@ -80,18 +83,39 @@
           <el-table-column align='center'
                            prop="marketPrice"
                            label="商品价格(元)">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.marketPrice|moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="groupPurchasePrice"
                            label="商品团购价(元)">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.groupPurchasePrice|moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="discountPrice"
                            label="商品采购价1(元)">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.discountPrice|moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           </el-table-column>
           <el-table-column align='center'
                            prop="agreeCostPrice"
                            label="商品采购价2(元)">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.agreeCostPrice|moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            cell-style="padding: 0"
@@ -250,7 +274,7 @@ export default {
         query: { paramInfo, pageInfo }
       })
     },
-    beforeUpload(file) {
+    beforeUpload (file) {
       // console.log(file.type)
       // const isJPG = file.type === '.xlsx' || file.type === '.xls';
       // // const isLt2M = file.size / 1024 / 1024 < 2;
@@ -261,26 +285,26 @@ export default {
       // this.goodsLoading = true
       load.startLoading()
     },
-    handleSuccess(response, file, fileList) { // 导入商品
+    handleSuccess (response, file, fileList) { // 导入商品
       // 报表导出
       load.endLoading()
       console.log(response, file, fileList)
-      if(response.code == 200) {
+      if (response.code == 200) {
         this.$message.success('导入成功')
         this.getList()
       } else {
         this.$message.error(response.msg)
       }
     },
-    handleError(err, file, fileList) {
+    handleError (err, file, fileList) {
       load.endLoading()
       console.log(err, file, fileList)
     },
-    onDownload() { // 下载模板
+    onDownload () { // 下载模板
       // // 报表导出
       Export(this, {
         url: "/api-web/import/downloadTemplate",
-        params: {templateType: 'GOODS'},
+        params: { templateType: 'GOODS' },
         fileName: '商品导入模板.xlsx'
       })
     }

src/views/levelManager/levelManager.vue

@@ -130,12 +130,12 @@
           <el-table-column align="center"
                            prop="money"
                            label="报考级别费用">
-            <template slot-scope="scope">{{ scope.row.money }}元</template>
+            <template slot-scope="scope">{{ scope.row.money|moneyFormat }}元</template>
           </el-table-column>
           <el-table-column align="center"
                            prop="theoryMoney"
                            label="乐理级别费用">
-            <template slot-scope="scope">{{ scope.row.theoryMoney }}元</template>
+            <template slot-scope="scope">{{ scope.row.theoryMoney|moneyFormat }}元</template>
           </el-table-column>
           <el-table-column align="center"
                            label="证书">

src/views/operationalEarly/operationalList.vue

@@ -32,13 +32,12 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-            <el-date-picker
-                v-model.trim="searchForm.monthStr"
-                 @clear="onClear('monthStr')"
-                type="month"
-                value-format="yyyy-MM"
-                placeholder="选择月">
-            </el-date-picker>
+          <el-date-picker v-model.trim="searchForm.monthStr"
+                          @clear="onClear('monthStr')"
+                          type="month"
+                          value-format="yyyy-MM"
+                          placeholder="选择月">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button type="danger"
@@ -50,35 +49,60 @@
       <div class="tableWrap">
         <el-table :data='tableList'
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align='center' prop="monthStr"
-                           label="月份" >
+          <el-table-column align='center'
+                           prop="monthStr"
+                           label="月份">
           </el-table-column>
-          <el-table-column align='center' prop="organName"
-                           label="分部" >
+          <el-table-column align='center'
+                           prop="organName"
+                           label="分部">
           </el-table-column>
-          <el-table-column align='center' prop="realName"
-                           label="老师"> 
+          <el-table-column align='center'
+                           prop="realName"
+                           label="老师">
           </el-table-column>
-          <el-table-column align='center' prop="subjectListStr"
-                           label="专业" >
+          <el-table-column align='center'
+                           prop="subjectListStr"
+                           label="专业">
           </el-table-column>
-          <el-table-column align='center' prop="musicCourseNum"
-                           label="乐团节数"> 
+          <el-table-column align='center'
+                           prop="musicCourseNum"
+                           label="乐团节数">
           </el-table-column>
-          <el-table-column align='center' prop="vipCourseNum"
-                           label="小课节数" >
+          <el-table-column align='center'
+                           prop="vipCourseNum"
+                           label="小课节数">
           </el-table-column>
-          <el-table-column align='center' prop="expectMusicCourseSalary"
-                           label="预计乐团课酬"> 
+          <el-table-column align='center'
+                           prop="expectMusicCourseSalary"
+                           label="预计乐团课酬">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.expectMusicCourseSalary | moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
-          <el-table-column align='center' prop="expectVipCourseSalary"
+          <el-table-column align='center'
+                           prop="expectVipCourseSalary"
                            label="预计小课课酬">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.expectVipCourseSalary | moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
-                           label="预计课酬合计" prop="expectTotalSalary">
+                           label="预计课酬合计"
+                           prop="expectTotalSalary">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.expectTotalSalary | moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
-          <el-table-column align='center' prop="averageClassMinutes"
-                           label="平均上课时长" >
+          <el-table-column align='center'
+                           prop="averageClassMinutes"
+                           label="平均上课时长">
           </el-table-column>
         </el-table>
         <pagination :total="pageInfo.total"
@@ -96,78 +120,77 @@ import pagination from '@/components/Pagination/index'
 let nowDate = new Date()
 let nowMonth = nowDate.getFullYear() + '-' + ((nowDate.getMonth() + 1) >= 10 ? (nowDate.getMonth() + 1) : '0' + (nowDate.getMonth() + 1))
 export default {
-    name: 'operationalList',
-    components: { pagination },
-    data () {
-        return {
-            searchForm: {
-                organId: null,
-                monthStr: nowMonth,
-                userId: null
-            },
-            tableList: [{}],
-            organList: [],
-            teacherList: [],
-            pageInfo: {
-                // 分页规则
-                limit: 10, // 限制显示条数
-                page: 1, // 当前页
-                total: 0, // 总条数
-                page_size: [10, 20, 40, 50] // 选择限制显示条数
-            }
+  name: 'operationalList',
+  components: { pagination },
+  data () {
+    return {
+      searchForm: {
+        organId: null,
+        monthStr: nowMonth,
+        userId: null
+      },
+      tableList: [{}],
+      organList: [],
+      teacherList: [],
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      }
+    }
+  },
+  mounted () {
+    // 获取分部
+    getEmployeeOrgan().then(res => {
+      if (res.code == 200) {
+        this.organList = res.data;
+      }
+    })
+    // 获取老师列表
+    getTeacher({ organId: this.organId }).then(res => {
+      if (res.code == 200) {
+        this.teacherList = res.data;
+      }
+    })
+    this.getList();
+  },
+  methods: {
+    search () {
+      this.pageInfo.page = 1
+      this.getList()
+    },
+    onClear (type) {
+      if (type == 'organId') {
+        this.searchForm.organId = null
+      } else if (type == 'monthStr') {
+        this.searchForm.monthStr = null
+      } else if (type == 'userId') {
+        this.searchForm.userId = null
+      }
+    },
+    onReSet () {
+      this.searchForm = {
+        organId: null,
+        monthStr: null,
+        userId: null
+      }
+      this.getList()
+    },
+    getList () {
+      let params = this.searchForm
+      teacherCourseStatistics(params).then(res => {
+        let result = res.data
+        if (res.code == 200) {
+          this.tableList = result.rows
+          this.pageInfo.total = result.total
         }
-    }, 
-    mounted () {
-        // 获取分部
-        getEmployeeOrgan().then(res => {
-            if (res.code == 200) {
-                this.organList = res.data;
-            }
-        })
-        // 获取老师列表
-        getTeacher({ organId: this.organId }).then(res => {
-            if (res.code == 200) {
-                this.teacherList = res.data;
-            }
-        })
-        this.getList();
+      })
     },
-    methods: {
-        search () {
-            this.pageInfo.page = 1
-            this.getList()
-        },
-        onClear(type) {
-            if(type == 'organId') {
-                this.searchForm.organId = null
-            } else if(type == 'monthStr') {
-                this.searchForm.monthStr = null
-            } else if(type == 'userId') {
-                this.searchForm.userId = null
-            }
-        },
-        onReSet () {
-            this.searchForm = {
-                organId: null,
-                monthStr: null,
-                userId: null
-            }
-            this.getList()
-        },
-        getList () {
-            let params = this.searchForm
-            teacherCourseStatistics(params).then(res => {
-                let result = res.data
-                if(res.code == 200) {
-                    this.tableList = result.rows
-                    this.pageInfo.total = result.total
-                }
-            })
-        },
-    
-    }
+
+  }
 }
 </script>
 <style lang="scss" scoped>
-
 </style>

src/views/repairManager/repairList.vue

@@ -123,11 +123,13 @@
           <el-table-column align="center"
                            prop="finishTime"
                            label="完成日期">
-            <template slot-scope="scope">{{scope.row.finishTime | formatTimer}}</template></el-table-column>
+            <template slot-scope="scope">{{scope.row.finishTime | formatTimer}}</template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="repairStatus"
                            label="状态">
-            <template slot-scope="scope">{{scope.row.repairStatus?'已完成':'维修中'}}</template></el-table-column>
+            <template slot-scope="scope">{{scope.row.repairStatus?'已完成':'维修中'}}</template>
+          </el-table-column>
           <el-table-column align="center"
                            label="操作">
             <template slot-scope="scope">
@@ -147,18 +149,19 @@
                :close-on-click-modal="false"
                :visible.sync="repairVisible"
                width="600px">
-      <el-form :model="visibleForm" :inline="true">
+      <el-form :model="visibleForm"
+               :inline="true">
         <el-row>
           <el-col :span="12">
             <el-form-item label="维修单号:">
               <p v-if="activeRow"
-                class="visibleCell">{{activeRow.transNo}}</p>
+                 class="visibleCell">{{activeRow.transNo}}</p>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="乐器编号:">
               <p v-if="activeRow"
-                class="visibleCell">{{activeRow.instrumentNo}}</p>
+                 class="visibleCell">{{activeRow.instrumentNo}}</p>
             </el-form-item>
           </el-col>
         </el-row>
@@ -166,13 +169,13 @@
           <el-col :span="12">
             <el-form-item label="学生姓名:">
               <p v-if="activeRow"
-                class="visibleCell">{{activeRow.studentName}}</p>
+                 class="visibleCell">{{activeRow.studentName}}</p>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属乐团:">
               <p v-if="activeRow"
-                class="visibleCell">{{activeRow.studentSchool}}</p>
+                 class="visibleCell">{{activeRow.studentSchool}}</p>
             </el-form-item>
           </el-col>
         </el-row>
@@ -180,13 +183,13 @@
           <el-col :span="12">
             <el-form-item label="联系人:">
               <p v-if="activeRow"
-                class="visibleCell">{{activeRow.contactName}}</p>
+                 class="visibleCell">{{activeRow.contactName}}</p>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系方式:">
               <p v-if="activeRow"
-                class="visibleCell">{{activeRow.contactMobile}}</p>
+                 class="visibleCell">{{activeRow.contactMobile}}</p>
             </el-form-item>
           </el-col>
         </el-row>
@@ -194,13 +197,13 @@
           <el-col :span="12">
             <el-form-item label="邮寄地址:">
               <p v-if="activeRow"
-                class="visibleCell">{{activeRow.address}}</p>
+                 class="visibleCell">{{activeRow.address}}</p>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="取件方式:">
               <p v-if="activeRow"
-                class="visibleCell">{{activeRow.sendType=='0'?'自取':'邮寄'}}</p>
+                 class="visibleCell">{{activeRow.sendType=='0'?'自取':'邮寄'}}</p>
             </el-form-item>
           </el-col>
         </el-row>
@@ -208,30 +211,45 @@
           <el-col :span="12">
             <el-form-item label="维修服务费:">
               <p v-if="activeRow"
-                class="visibleCell">{{activeRow.amount}}元</p>
+                 class="visibleCell">{{activeRow.amount | moneyFormat}}元</p>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="问题描述及解决方案:" style="width: 100%; margin-bottom: 0"></el-form-item>
+        <el-form-item label="问题描述及解决方案:"
+                      style="width: 100%; margin-bottom: 0"></el-form-item>
         <el-input type='textarea'
                   v-if="activeRow"
                   style="width: 100%"
                   :rows="3"
                   v-model="activeRow.description"
                   :disabled="activeRow&&Boolean(activeRow.finishTime)"></el-input>
-        <el-form-item label="收费组成:" style="width: 100%; margin-bottom: 0" v-if="activeRow && activeRow.feeList"></el-form-item>
+        <el-form-item label="收费组成:"
+                      style="width: 100%; margin-bottom: 0"
+                      v-if="activeRow && activeRow.feeList"></el-form-item>
         <el-input type='textarea'
-                    v-if="activeRow && activeRow.feeList"
-                    style="width: 100%"
-                    :rows="3"
-                    v-model="activeRow.feeList"
-                    :disabled="true"></el-input>
-        <el-form-item label="商品列表:" style="width: 100%; margin-bottom: 0"></el-form-item>
-        <el-table style="width: 100%" v-if="activeRow"
+                  v-if="activeRow && activeRow.feeList"
+                  style="width: 100%"
+                  :rows="3"
+                  v-model="activeRow.feeList"
+                  :disabled="true"></el-input>
+        <el-form-item label="商品列表:"
+                      style="width: 100%; margin-bottom: 0"></el-form-item>
+        <el-table style="width: 100%"
+                  v-if="activeRow"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                   :data="activeRow.goodsList">
-            <el-table-column align="center" prop="name" label="商品名"></el-table-column>
-            <el-table-column align="center" prop="groupPurchasePrice" label="商品价格（元）" ></el-table-column>
+          <el-table-column align="center"
+                           prop="name"
+                           label="商品名"></el-table-column>
+          <el-table-column align="center"
+                           prop="groupPurchasePrice"
+                           label="商品价格（元）">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.groupPurchasePrice|moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
         </el-table>
       </el-form>
       <span slot="footer"

src/views/resetTeaming/components/resetSound.vue

@@ -62,6 +62,7 @@
 
       </el-table-column>
       <el-table-column label="乐器提供方式"
+                       width="300"
                        align="center"
                        prop="fangshi">
         <template slot-scope="scope">

src/views/settlementManager/settlementList.vue

@@ -91,7 +91,7 @@
           <el-table-column align="center"
                            label="结转金额">
             <template slot-scope="scope">
-              <div>{{ scope.row.expectRewardAmount + '元'}}</div>
+              <div>{{ scope.row.expectRewardAmount | moneyFormat}}元</div>
             </template>
           </el-table-column>
           <el-table-column align="center"

src/views/sporadicManager/sporadicList.vue

@@ -99,6 +99,11 @@
           <el-table-column align='center'
                            label="金额"
                            prop="amount">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.amount | moneyFormat}}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            label="时间">
@@ -562,7 +567,7 @@ export default {
       maskForm.money = row.amount
       maskForm.subMoney = row.discountAmount
       maskForm.musicGroupId = row.musicGroupId ? row.musicGroupId : null
-      this.$refs['maskForm'].clearValidate()
+      // this.$refs['maskForm'].clearValidate()
       if (row.userId) {
         queryUserMusicInfos({ userId: row.userId }).then(studentInfo => {
           if (studentInfo.code == 200) {

src/views/studentManager/components/studentCashout.vue

@@ -8,15 +8,25 @@
         </el-table-column>
         <el-table-column label=申请时间
                          prop="createTime">
-                          <template slot-scope="scope">
+          <template slot-scope="scope">
             {{ scope.row.createTime | dateForMinFormat }}
           </template>
         </el-table-column>
         <el-table-column label=提现金额
                          prop="amount">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.amount | moneyFormat }}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column label=账户余额
                          prop="balance">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.balance | moneyFormat }}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column label=账户号
                          prop="bankCardNo">
@@ -66,7 +76,7 @@ export default {
   mounted () {
     this.getList()
   },
-  activated() {
+  activated () {
     this.getList()
   },
   methods: {

src/views/studentManager/components/studentOrder.vue

@@ -5,7 +5,7 @@
         <div class="headItem">
           <p>
             账户余额:
-            <span>{{ dataInfo.balance?(dataInfo.balance).toFixed(2):0.00 }}</span>
+            <span>{{ dataInfo.balance | moneyFormat}}</span>
           </p>
           <el-button type="text"
                      v-permission="'userCashAccount/updateBalance'"
@@ -15,7 +15,7 @@
           <!-- v-if="amountStatus" -->
           <p>
             课程余额:
-            <span>{{ dataInfo.courseBalance?(dataInfo.courseBalance).toFixed(2):0.00 }}</span>
+            <span>{{ dataInfo.courseBalance| moneyFormat }}</span>
           </p>
           <!-- <p v-else>课程余额:<span>
               <el-input style="width: 130px;"
@@ -107,15 +107,33 @@
         <el-table-column width="180px"
                          align="center"
                          label="应付金额"
-                         prop="expectAmount"></el-table-column>
+                         prop="expectAmount">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.expectAmount | moneyFormat }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column width="180px"
                          align="center"
                          label="余额支付"
-                         prop="balancePaymentAmount"></el-table-column>
+                         prop="balancePaymentAmount">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.balancePaymentAmount | moneyFormat }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column width="180px"
                          align="center"
                          label="实际金额"
-                         prop="actualAmount"></el-table-column>
+                         prop="actualAmount">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.actualAmount | moneyFormat }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column width="180px"
                          align="center"
                          label="订单状态"
@@ -140,32 +158,32 @@
       <el-row>
         <el-col :span="24">
           <el-tabs v-model="activeName"
-               type="border-card">
+                   type="border-card">
             <el-tab-pane label="账户余额明细"
-                        name="first">
+                         name="first">
               <el-table :data="cashAccount.gridData">
                 <!-- 交易金额，账户可用余额，交易状态，交易类型，操作时间，备注 -->
                 <el-table-column align="center"
-                                property="amount"
-                                label="交易金额"></el-table-column>
+                                 property="amount"
+                                 label="交易金额"></el-table-column>
                 <el-table-column align="center"
-                                property="balance"
-                                label="账户可用余额"></el-table-column>
+                                 property="balance"
+                                 label="账户可用余额"></el-table-column>
                 <el-table-column align="center"
-                                label="交易状态">
+                                 label="交易状态">
                   <template slot-scope="scope">{{ scope.row.status | payStatus }}</template>
                 </el-table-column>
                 <el-table-column align="center"
-                                label="交易类型">
+                                 label="交易类型">
                   <template slot-scope="scope">{{ scope.row.type | payType }}</template>
                 </el-table-column>
                 <el-table-column align="center"
-                                width="160px"
-                                property="createTime"
-                                label="交易时间"></el-table-column>
+                                 width="160px"
+                                 property="createTime"
+                                 label="交易时间"></el-table-column>
                 <el-table-column align="center"
-                                width="140px"
-                                label="备注">
+                                 width="140px"
+                                 label="备注">
                   <template slot-scope="scope">
                     <span :title="scope.row.comment">{{ scope.row.comment }}</span>
                   </template>
@@ -178,30 +196,30 @@
                           @pagination="getCashAccount" />
             </el-tab-pane>
             <el-tab-pane label="课程余额明细"
-                        name="second">
+                         name="second">
               <el-table :data="courseAccount.gridData">
                 <!-- 交易金额，账户可用余额，交易状态，交易类型，操作时间，备注 -->
                 <el-table-column align="center"
-                                property="amount"
-                                label="交易金额"></el-table-column>
+                                 property="amount"
+                                 label="交易金额"></el-table-column>
                 <el-table-column align="center"
-                                property="balance"
-                                label="课程可用余额"></el-table-column>
+                                 property="balance"
+                                 label="课程可用余额"></el-table-column>
                 <el-table-column align="center"
-                                label="交易状态">
+                                 label="交易状态">
                   <template slot-scope="scope">{{ scope.row.status | payStatus }}</template>
                 </el-table-column>
                 <el-table-column align="center"
-                                label="交易类型">
+                                 label="交易类型">
                   <template slot-scope="scope">{{ scope.row.type | payType }}</template>
                 </el-table-column>
                 <el-table-column align="center"
-                                width="160px"
-                                property="createTime"
-                                label="交易时间"></el-table-column>
+                                 width="160px"
+                                 property="createTime"
+                                 label="交易时间"></el-table-column>
                 <el-table-column align="center"
-                                width="140px"
-                                label="备注">
+                                 width="140px"
+                                 label="备注">
                   <template slot-scope="scope">
                     <span :title="scope.row.comment">{{ scope.row.comment }}</span>
                   </template>

src/views/studentManager/components/studentPayList.vue

@@ -60,10 +60,20 @@
         <el-table-column align='center'
                          prop="expectPrice"
                          label="预计扣费">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.expectPrice | moneyFormat}}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          prop="actualPrice"
                          label="实际扣费">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.actualPrice | moneyFormat}}
+            </div>
+          </template>
         </el-table-column>
       </el-table>
       <pagination :total="pageInfo.total"
@@ -104,7 +114,7 @@ export default {
     this.searchForm.studentId = this.$route.query.userId
     this.getList()
   },
-  activated() {
+  activated () {
     this.searchForm.studentId = this.$route.query.userId
     this.getList()
   },

src/views/studentManager/studentList.vue

@@ -171,7 +171,13 @@
 
           <el-table-column align="center"
                            prop="courseBalance"
-                           label="课程余额(元)"></el-table-column>
+                           label="课程余额(元)">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.courseBalance | moneyFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            fixed="right"
                            width="180px"

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -3,7 +3,7 @@
     <div class="headWrap">
       <div class="left">
         <div class="headItem">
-          <p>未结算总额:<span>{{ teacherNoPay }}</span></p>
+          <p>未结算总额:<span>{{ teacherNoPay| moneyFormat}}</span></p>
         </div>
       </div>
     </div>
@@ -95,12 +95,27 @@
         </el-table-column>
         <el-table-column label="预计发放"
                          prop="expectSalary">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.expectSalary|moneyFormat}}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column label="实际发放"
                          prop="actualSalary">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.actualSalary|moneyFormat}}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column label="课时补贴"
                          prop="subsidy">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.subsidy|moneyFormat}}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column label="结算状态">
           <template slot-scope="scope">

src/views/teamBuild/components/teamSoundMoney.vue

@@ -94,9 +94,9 @@
                          prop="fangshi">
           <template slot-scope="scope">
             <div>
-              <!-- <div class="chiose"
+              <!-- <div class="chiose" white-space:pre;
               >选择</div>-->
-              <div style="white-space:pre"
+              <div style="width:300px"
                    v-if="scope.row.fangshi.length >0">{{scope.row.fangshi | fangshiFilter(scope.row)}}</div>
               <i class="el-icon-edit"
                  @click="setGiveMode(scope.row)"></i>

src/views/vipClass/vipDetail/components/fnanceInfo.vue

@@ -6,7 +6,7 @@
         <div class="headItem">
           <p>
             课程总价:
-            <span>{{ totalPrice }}</span>
+            <span>{{ totalPrice|moneyFormat }}</span>
           </p>
         </div>
         <div class="headItem">
@@ -18,25 +18,25 @@
         <div class="headItem">
           <p>
             线上课课酬:
-            <span>{{ onlineClassesUnitPrice }}</span>
+            <span>{{ onlineClassesUnitPrice|moneyFormat }}</span>
           </p>
         </div>
         <div class="headItem">
           <p>
             课酬总额:
-            <span>{{ totalSalary }}</span>
+            <span>{{ totalSalary|moneyFormat }}</span>
           </p>
         </div>
         <div class="headItem">
           <p>
             实收总额:
-            <span>{{ totalFeeDeduction }}</span>
+            <span>{{ totalFeeDeduction|moneyFormat }}</span>
           </p>
         </div>
         <div class="headItem">
           <p>
             线下课课酬:
-            <span>{{offlineClassesUnitPrice}}</span>
+            <span>{{offlineClassesUnitPrice |moneyFormat}}</span>
           </p>
         </div>
       </div>
@@ -80,10 +80,23 @@
         </el-table-column>
         <el-table-column label="实收总额"
                          align="center"
-                         prop="deductionFee"></el-table-column>
+                         prop="deductionFee">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.deductionFee|moneyFormat}}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="老师课酬"
                          align="center"
-                         prop="actualSalary"></el-table-column>
+                         prop="actualSalary">
+
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.actualSalary|moneyFormat}}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="结算状态"
                          align="center"
                          prop="isSalary">

src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -27,7 +27,13 @@
         </el-table-column>
         <el-table-column prop="courseSalary"
                          align="center"
-                         label="课程余额"></el-table-column>
+                         label="课程余额">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.courseSalary|moneyFormat}}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column prop="applyDate"
                          align="center"
                          label="报名时间">