暂存

src/HDrpManagement/invoiceapp/detail/detail.vue

@@ -68,38 +68,9 @@ export default {
       let that = this
       this.mainAreaData = [
         {
-          label:'经销商',
+          label:'客户',
           value:this.mainData.agententerprisename
         },
-        {
-          label:'税号',
-          value:this.mainData.taxno
-        },
-        {
-          label:'开票单位',
-          value:this.mainData.enterprisename
-        },
-         {
-          label:'开票地址',
-          value:this.mainData.address
-        },
-        {
-          label:'联系方式',
-          value:this.mainData.phonenumber
-        },
-        {
-          label:'开户行及账号',
-          value:this.mainData.bank + this.mainData.bankcardno
-        },
-        {
-          label:'发票限额',
-          value:this.mainData.quota
-        },
-        {
-          label:'手工开票',
-          value:this.mainData.byhand === 1?'手工开票':'线上开票'
-        },
-
         {
           label:'状态',
           value:this.mainData.status,
@@ -126,9 +97,41 @@ export default {
           value:this.mainData.invoiceline === 's'?'专用发票':'普通发票(电票)'
         },
         {
-          label:'备注',
-          value:this.mainData.remarks
+          label:'开票金额',
+          value:this.mainData.suminvoiceamount
+        },
+        {
+          label:'开票方式',
+          value:this.mainData.byhand === 1?'手工开票':'线上开票'
         },
+        {
+          label:'开票单位',
+          value:this.mainData.enterprisename
+        },
+        {
+          label:'税号',
+          value:this.mainData.taxno
+        },
+
+         {
+          label:'开票地址',
+          value:this.mainData.address
+        },
+        {
+          label:'联系方式',
+          value:this.mainData.phonenumber
+        },
+
+        {
+          label:'开户行及账号',
+          value:this.mainData.bank + this.mainData.bankcardno
+        },
+        {
+          label:'发票限额',
+          value:this.mainData.quota
+        },
+
+
         {
           label:'复核人',
           value:this.mainData.invoicechecker
@@ -141,6 +144,10 @@ export default {
           label:'收款人',
           value:this.mainData.invoicepayee
         },
+        {
+          label:'备注',
+          value:this.mainData.remarks
+        },
         
       ]
     },

src/HDrpManagement/orderManage/details/index.vue

@@ -286,6 +286,14 @@ export default {
         {
           label:'退回原因',
           value:this.mainData.backreason
+        },
+        {
+          label:'核销状态',
+          value:this.mainData.writeoffstatus
+        },
+        {
+          label:'开票状态',
+          value:this.mainData.invoicestatus
         }
       ]
     },

src/HDrpManagement/recvoucher/details/index.vue

@@ -116,13 +116,8 @@ export default {
           value:this.mainData.enterprisename
         },
         {
-<<<<<<< HEAD
-          label:'核销金额',
-          value:this.tool.formatAmount(this.mainData.amount,2)
-=======
           label:'单据日期',
           value:this.mainData.createdate
->>>>>>> c772bf5f04ebec0989b1edb76ea41107f2bfa4bd
         },
         {
           label:'分类',
@@ -144,14 +139,13 @@ export default {
           label:'备注',
           value:this.mainData.remarks
         },
-
         {
-          label:'核销金额',
-          value:this.mainData.amount
+          label: '核销金额',
+          value: this.tool.formatAmount(this.mainData.amount, 2)
         },
         {
           label:'未核销金额',
-          value:this.mainData.unwriteoffamount
+          value:this.tool.formatAmount(this.mainData.unwriteoffamount,2)
         },
       ]
     },

src/SDrpManagement/agentOrder/details/index.vue

@@ -188,6 +188,14 @@ export default {
         {
           label:'备注',
           value:this.mainData.remarks
+        },
+        {
+          label:'核销状态',
+          value:this.mainData.writeoffstatus
+        },
+        {
+          label:'开票状态',
+          value:this.mainData.invoicestatus
         }
       ]
     },

src/SDrpManagement/salerOrder/details/index.vue

@@ -249,6 +249,14 @@ export default {
         {
           label:'退回原因',
           value:this.mainData.backreason
+        },
+        {
+          label:'核销状态',
+          value:this.mainData.writeoffstatus
+        },
+        {
+          label:'开票状态',
+          value:this.mainData.invoicestatus
         }
       ]
     },