no message

src/views/mallManagement/settleManagElecpay/index.vue

@@ -137,6 +137,35 @@
                 <el-table-column prop="transcationId" label="分账明细单号"> </el-table-column>
               </el-table>
             </el-card>
+            <el-card size="mini">
+              <div slot="header" class="clearfix">
+                <span>其他费用信息</span>
+              </div>
+              <el-table
+                :data="[
+                  {
+                    chargeType: 'SERV',
+                    amountName: '服务费用',
+                    normAmount: formData.servicePrice || 0,
+                    sfsxf: Math.ceil((formData.servicePrice || 0) * 0.6) / 100,
+                    sffzje: formData.servicePrice - Math.ceil((formData.servicePrice || 0) * 0.6) / 100
+                  },
+                  {
+                    chargeType: 'SERV',
+                    amountName: '其他费用',
+                    normAmount: formData.otherPrice || 0,
+                    sfsxf: Math.ceil((formData.otherPrice || 0) * 0.6) / 100,
+                    sffzje: formData.otherPrice - Math.ceil((formData.otherPrice || 0) * 0.6) / 100
+                  }
+                ]"
+                border
+              >
+                <el-table-column prop="amountName" label="费用名称"> </el-table-column>
+                <el-table-column prop="normAmount" label="费用金额"> </el-table-column>
+                <el-table-column prop="sffzje" label="师傅分账金额"> </el-table-column>
+                <el-table-column prop="sfsxf" label="师傅手续费"> </el-table-column>
+              </el-table>
+            </el-card>
           </div>
         </zj-page-fill>
         <div style="box-sizing: border-box; padding: 10px 20px; text-align: right">

src/views/partsManagement/masterAccountingManagement/components/website-parts-shop-sales-information.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="website-parts-shop-sales">
-    <div class="website-parts-shop-sales-sl">
+    <div class="website-parts-shop-sales-sl" v-if="formData">
       <el-page-header
         @back="
           () => {
@@ -23,25 +23,25 @@
               <el-descriptions-item>
                 <template slot="label"> 网点 </template>
                 <div>
-                  {{ item.websitName }}
+                  {{ formData.websitName }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"> 申请类别 </template>
                 <div>
-                  {{ { TRADE: '商用空调', ELEC: '生活电器（小家电）', HOME: '家用空调' }[item.applyCategory] }}
+                  {{ { TRADE: '商用空调', ELEC: '生活电器（小家电）', HOME: '家用空调' }[formData.applyCategory] }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"> 申请类型 </template>
                 <div>
-                  {{ { '0': '普通申请', '1': '急件申请', '2': '备件申请' }[item.applyType] }}
+                  {{ { '0': '普通申请', '1': '急件申请', '2': '备件申请' }[formData.applyType] }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"> 发货方式 </template>
                 <div>
-                  {{ { '0': '快递', '1': '自提' }[item.deliveryType] }}
+                  {{ { '0': '快递', '1': '自提' }[formData.deliveryType] }}
                 </div>
               </el-descriptions-item>
             </el-descriptions>
@@ -57,25 +57,25 @@
               <el-descriptions-item>
                 <template slot="label"> 销售类型 </template>
                 <div>
-                  {{ { CUSTOMER: '客户', WORKER: '内部师傅' }[item.buyPeople] }}
+                  {{ { CUSTOMER: '客户', WORKER: '内部师傅' }[formData.buyPeople] }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"> 申请人 </template>
                 <div>
-                  {{ item.workerName }}
+                  {{ formData.workerName }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"> 联系电话 </template>
                 <div>
-                  {{ item.mobile }}
+                  {{ formData.mobile }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"> 接收单位 </template>
                 <div>
-                  {{ item.receiveUnit }}
+                  {{ formData.receiveUnit }}
                 </div>
               </el-descriptions-item>
             </el-descriptions>
@@ -93,7 +93,7 @@
           <el-descriptions-item>
             <template slot="label"> 发货单位 </template>
             <div>
-              {{ item.websitName }}
+              {{ formData.websitName }}
             </div>
           </el-descriptions-item>
           <el-descriptions-item>
@@ -105,13 +105,13 @@
           <el-descriptions-item>
             <template slot="label"> 收件地址 </template>
             <div>
-              {{ item.receiveAddr }}
+              {{ formData.receiveAddr }}
             </div>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 详细地址 </template>
             <div>
-              {{ item.addr }}
+              {{ formData.addr }}
             </div>
           </el-descriptions-item>
         </el-descriptions>
@@ -129,25 +129,25 @@
               <el-descriptions-item>
                 <template slot="label"> 支付方式 </template>
                 <div>
-                  {{ { CASH: '现金', ALLINPAY: '通联', CREDIT: '记账' }[item.payType] }}
+                  {{ { CASH: '现金', ALLINPAY: '通联', CREDIT: '记账' }[formData.payType] }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"> 销售金额 </template>
                 <div>
-                  {{ item.totalAmount }}
+                  {{ formData.totalAmount }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"> 应收金额 </template>
                 <div>
-                  {{ item.itemTotalAmount }}
+                  {{ formData.itemTotalAmount }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"> 收款状态 </template>
                 <div>
-                  {{ item.creditStatus ? '已收款' : '未收款' }}
+                  {{ formData.creditStatus ? '已收款' : '未收款' }}
                 </div>
               </el-descriptions-item>
             </el-descriptions>
@@ -163,7 +163,7 @@
               <el-descriptions-item>
                 <template slot="label"> 下单时间 </template>
                 <div>
-                  {{ item.createTime }}
+                  {{ formData.createTime }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
@@ -175,13 +175,13 @@
               <el-descriptions-item>
                 <template slot="label"> 收款人 </template>
                 <div>
-                  {{ item.updateBy }}
+                  {{ formData.updateBy }}
                 </div>
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label"> 收款时间 </template>
                 <div>
-                  {{ item.updateTime }}
+                  {{ formData.updateTime }}
                 </div>
               </el-descriptions-item>
             </el-descriptions>
@@ -232,7 +232,7 @@
           <el-table-column prop="transactionId" label="微信流水号" show-overflow-tooltip />
         </el-table>
       </div>
-      <div style="text-align: right">
+      <div style="text-align: right" v-if="formData && !formData.creditStatus">
         <el-button size="small" type="primary" @click="shoukuan">收款</el-button>
       </div>
     </div>
@@ -249,6 +249,7 @@
         bool => {
           visible = bool
           rowData = null
+          getxiangqing()
         }
       "
     />
@@ -257,6 +258,7 @@
 
 <script>
 import PayPopupWindow from './pay-popup-window.vue'
+import { ppartsCreditDetail } from '@/api/masterAccountingManagement'
 export default {
   components: { PayPopupWindow },
   props: {
@@ -268,20 +270,29 @@ export default {
   data() {
     return {
       visible: false,
-      rowData: null
+      rowData: null,
+      formData: null
     }
   },
   computed: {
     items() {
-      return this?.item?.item ? [this?.item?.item] : []
+      return this?.formData?.item ? [this?.formData?.item] : []
     },
     payOrder() {
-      return this?.item?.payOrder ? [this?.item?.payOrder] : []
+      return this?.formData?.payOrder ? [this?.formData?.payOrder] : []
     }
   },
+  mounted() {
+    this.getxiangqing()
+  },
   methods: {
+    getxiangqing() {
+      ppartsCreditDetail({ id: this.item.id }).then(res => {
+        this.formData = res.data
+      })
+    },
     shoukuan() {
-      this.rowData = this.item
+      this.rowData = this.formData
       this.visible = true
     }
   }

src/views/partsManagement/masterAccountingManagement/index.vue

@@ -191,7 +191,6 @@ export default {
           },
           click: ({ row, index, column }) => {
             ppartsCreditDetail({ id: row.id }).then(res => {
-              console.log(res.data, '-----------------')
               this.formData = res.data
               this.$nextTick(() => {
                 this.showFromBool = true