暂存

src/HDrpManagement/cashcouponPay/component/detailed.vue

@@ -11,7 +11,7 @@
         <el-descriptions-item label="支出金额">{{ data.amount?data.amount:"--" }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ data.remarks?data.remarks:"--" }}</el-descriptions-item>
         <el-descriptions-item :style="style(data.status)" label="状态">
-          <sapn :style="colorStyle">{{ data.status?data.status:"--" }}</sapn>
+          <span :style="colorStyle">{{ data.status?data.status:"--" }}</span>
         </el-descriptions-item>
       </el-descriptions>
     </div>

src/HDrpManagement/orderManage/details/index.vue

@@ -223,7 +223,7 @@ export default {
         },
         {
           label:'订单总金额',
-          value:this.mainData.defaultamount,
+          value:this.tool.formatAmount(this.mainData.defaultamount),
           style:function () {
             let style = {color:"#ff0000"}
             return style
@@ -231,7 +231,7 @@ export default {
         },
         {
           label:'折后总金额',
-          value:this.mainData.amount,
+          value:this.tool.formatAmount(this.mainData.amount),
           style:function () {
             let style = {color:"#ff0000"}
             return style

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -143,11 +143,17 @@
           prop="marketprice"
           label="牌价"
           width="100">
+          <template slot-scope="scope">
+            <p>¥&nbsp;{{tool.formatAmount(scope.row.marketprice,2)}}</p>
+          </template>
         </el-table-column>
         <el-table-column
           prop="defaultprice"
           label="折前价格"
           width="100">
+          <template slot-scope="scope">
+            <p>¥&nbsp;{{tool.formatAmount(scope.row.defaultprice,2)}}</p>
+          </template>
         </el-table-column>
         <el-table-column
           prop="defaultamount"

src/HDrpManagement/payvoucher/details/modules/detailedData.vue

@@ -11,7 +11,7 @@
         <el-descriptions-item label="分类">{{ detailData.class?detailData.class:"--" }}</el-descriptions-item>
         <el-descriptions-item label="分类明细">{{ detailData.subclass?detailData.subclass:"--" }}</el-descriptions-item>
         <el-descriptions-item :style="style(detailData.status)" label="状态">
-          <sapn :style="colorStyle">{{ detailData.status?detailData.status:"--" }}</sapn>
+          <span :style="colorStyle">{{ detailData.status?detailData.status:"--" }}</span>
         </el-descriptions-item>
         <el-descriptions-item label="凭证来源">{{ detailData.source?detailData.source:"--" }}</el-descriptions-item>
         <el-descriptions-item label="凭证来源说明">{{ detailData.sourcenote?detailData.sourcenote:"--" }}</el-descriptions-item>

src/HDrpManagement/recvoucher/details/modules/detailedData.vue

@@ -11,7 +11,7 @@
         <el-descriptions-item label="分类">{{ detailData.class?detailData.class:"--" }}</el-descriptions-item>
         <el-descriptions-item label="分类明细">{{ detailData.subclass?detailData.subclass:"--" }}</el-descriptions-item>
         <el-descriptions-item :style="style(detailData.status)" label="状态">
-          <sapn :style="colorStyle">{{ detailData.status?detailData.status:"--" }}</sapn>
+          <span :style="colorStyle">{{ detailData.status?detailData.status:"--" }}</span>
         </el-descriptions-item>
         <el-descriptions-item label="已核销金额">{{ "--" }}</el-descriptions-item>
         <el-descriptions-item label="凭证来源">{{ detailData.source?detailData.source:"--" }}</el-descriptions-item>

src/HDrpManagement/recvoucher/index.vue

@@ -8,7 +8,7 @@
         :apiId="{query:20221009102903,del:20221009103203}"
         :options="options"
         :detailPath="{
-        path:'/recvoucherDetails'
+          path:'/recvoucherDetails'
         }"
         @listCreate="list">
       <div slot="custom" style="display:flex">

src/HManagement/archives_ad/dataAnalysis/index.vue

@@ -10,7 +10,7 @@
         <downloadData type="agency" />
 
       </el-tab-pane>
-      <el-tab-pane label="团队内部分析" name="second">
+      <el-tab-pane label="企业内部分析" name="second">
         <!-- 浏览数据 -->
         <read-data type='team' />
         <!-- 下载数据 -->
@@ -29,7 +29,7 @@ export default {
   components: { shareData, readData, downloadData },
   data() {
     return {
-      activeName: "first",
+      activeName: "second",
     }
   },
   methods: {

src/SDrpManagement/agentOrder/details/index.vue

@@ -161,8 +161,9 @@ export default {
 
         },
         {
+          // {{tool.formatAmount(scope.row.marketprice,2)}}
           label:'合计金额',
-          value:this.mainData.defaultamount,
+          value:this.tool.formatAmount(this.mainData.defaultamount),
           style:function () {
             let style = {color:"#ff0000"}
             return style
@@ -170,7 +171,7 @@ export default {
         },
         {
           label:'折后金额',
-          value:this.mainData.amount,
+          value:this.tool.formatAmount(this.mainData.amount),
           style:function () {
             let style = {color:"#ff0000"}
             return style

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -51,11 +51,17 @@
         prop="marketprice"
         label="牌价"
         width="100">
+        <template slot-scope="scope">
+          <p>¥&nbsp;{{tool.formatAmount(scope.row.marketprice,2)}}</p>
+        </template>
       </el-table-column>
       <el-table-column
         prop="defaultprice"
         label="折前价格"
         width="100">
+        <template slot-scope="scope">
+          <p>¥&nbsp;{{tool.formatAmount(scope.row.defaultprice,2)}}</p>
+        </template>
       </el-table-column>
       <el-table-column
         prop="defaultamount"

src/SDrpManagement/salerOrder/details/index.vue

@@ -168,7 +168,7 @@ export default {
         },
         {
           label:'折后总金额',
-          value:this.mainData.amount,
+          value:this.tool.formatAmount(this.mainData.amount),
           style:function () {
             let style = {color:"#ff0000"}
             return style
@@ -176,7 +176,7 @@ export default {
         },
         {
           label:'合计数量',
-          value:this.mainData.qty,
+          value:this.tool.formatAmount(this.mainData.qty),
           style:function () {
             let style = {color:"#ff0000"}
             return style

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -112,11 +112,17 @@
         prop="marketprice"
         label="牌价"
         width="100">
+        <template slot-scope="scope">
+          <p>¥&nbsp;{{tool.formatAmount(scope.row.marketprice,2)}}</p>
+        </template>
       </el-table-column>
       <el-table-column
         prop="defaultprice"
         label="折前价格"
         width="100">
+        <template slot-scope="scope">
+          <p>¥&nbsp;{{tool.formatAmount(scope.row.defaultprice,2)}}</p>
+        </template>
       </el-table-column>
       <el-table-column
         prop="defaultamount"
@@ -129,9 +135,9 @@
       <el-table-column
         label="折后价格"
         prop="price">
-        <template slot-scope="scope">
-          <p>¥&nbsp;{{scope.row.price}}</p>
-        </template>
+         <template slot-scope="scope">
+            <p>¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
+          </template>
       </el-table-column>
       <el-table-column
         label="折后金额"

src/components/normal-basic-layout/details/index.vue

@@ -31,7 +31,12 @@
       </div>
       <div>
         <el-descriptions :column="5" size="mini">
-          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" v-for="item in mainAreaData" :key="item.index" :label="item.label"><span :style="item.style?item.style():''">{{item.value !== ''?item.value:'--'}}</span></el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" v-for="item in mainAData" :key="item.index" :label="item.label"><span :style="item.style?item.style():''">{{item.value !== ''?item.value:'--'}}</span></el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="1" size="mini">
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" v-for="item in mainAData2" :key="item.index" :label="item.label">
+            <span :style="item.style?item.style():''">{{item.value !== ''?item.value:'--'}}</span>
+          </el-descriptions-item>
         </el-descriptions>
       </div>
     </div>
@@ -102,6 +107,32 @@ export default {
     }
   },
   computed:{
+    mainAData () {
+      try {
+        let data = this.mainAreaData.filter(e=>{
+          if(e.label !== '备注') {
+            return e
+          }
+        })
+        return data
+      } catch (error) {
+        
+      }
+      
+    },
+    mainAData2 () {
+      try {
+        let data = this.mainAreaData.filter(e=>{
+          if(e.label == '备注') {
+            return e
+          }
+        })
+        return data
+      } catch (error) {
+        
+      }
+      
+    },
     ...mapGetters({
       activeApp:"activeApp"
     })
@@ -237,6 +268,7 @@ export default {
   },
   watch:{
     mainAreaData () {
+      // console.log(this.mainAData,'mainAData')
     }
   }
 }