codeMan 2 years ago
parent
commit
0a4a29d2d6

+ 6 - 1
src/HDrpManagement/AccountMoney/modules/detail.vue

@@ -6,7 +6,12 @@
         <el-input type="text" size="small" class="inline-16" style="width:200px;margin-bottom:10px" clearable @clear="getList" v-model="params.content.where.condition" placeholder="请输入搜索内容" @keyup.native.enter="getList(params.content.pageNumber=1)"></el-input>
         <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="600px">
           <template v-slot:customcol="scope">
-            <p>{{scope.column.data[scope.column.columnname]}}</p>
+            <div v-if="scope.column.columnname == 'type'">
+              <span>{{scope.column.data[[scope.column.columnname]] ? '收入' : '支出'}}</span>
+            </div>
+            <div v-else>
+              {{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]]:'--'}}
+            </div>
           </template>
           <template v-slot:opreation="scope">
             <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data"/>

+ 1 - 2
src/HDrpManagement/invoiceapp/index.vue

@@ -49,9 +49,8 @@
           <span>{{scope.data.column.data.byhand == 1?'手工':'线上'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'suminvoiceamount'">
-          <span>{{this.tool.formatAmount(scope.data.column.data.suminvoiceamount,2)}}</span>
+          <span>{{tool.formatAmount(scope.data.column.data.suminvoiceamount,2)}}</span>
         </div>
-        
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

+ 2 - 2
src/SDrpManagement/shopCart/modules/list.vue

@@ -68,7 +68,7 @@
         label="单价"
         width="90">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.gradeprice,2)}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.oldprice,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column
@@ -89,7 +89,7 @@
         label="金额"
         width="80">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.gradeprice * scope.row.qty,2)}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.oldprice * scope.row.qty,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column width="90" label="操作">

+ 1 - 1
src/SDrpManagement/shopCart/modules/total.vue

@@ -32,7 +32,7 @@ export default {
     totalPrice (val) {
       this.total = 0
       val.forEach(element => {
-        this.total += element.gradeprice * element.qty
+        this.total += element.oldprice * element.qty
       });
 
     },