修复

src/router/modules/finance.js

@@ -59,13 +59,13 @@ const financeRouter = {
       path: 'paycents-list',
       name: 'PaycentsList',
       component: () => import('@/views/finance/paycents-list'),
-      meta: { title: '子订单手动分账', noCache: true, icon: 'el-icon-stopwatch' }
+      meta: { title: '子订单手动分账', noCache: true, icon: 'el-icon-set-up' }
     },
     {
       path: 'paysettle-list',
       name: 'PaysettleList',
       component: () => import('@/views/finance/paysettle-list'),
-      meta: { title: '子订单手动结算', noCache: true, icon: 'el-icon-odometer' }
+      meta: { title: '子订单手动结算', noCache: true, icon: 'el-icon-set-up' }
     },
     {
       path: 'paysettle-edit',

src/views/centralized/list.vue

@@ -62,6 +62,7 @@
       <el-table-column label="联系人" width="100" align="center" prop="linkMan" />
       <el-table-column label="手机号" width="140" align="center" prop="mobile" />
       <el-table-column label="参与机构数" width="100" align="center" prop="clubCount" />
+      <el-table-column label="需求数量" width="100" align="center" prop="needNum" />
       <el-table-column label="状态" width="150" align="center" prop="status">
         <template slot-scope="{ row }">
           <span

src/views/finance/payapply-edit.vue

@@ -148,7 +148,7 @@
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-table :data="shopOrder.newOrderProducts" border fit highlight-current-row :header-cell-style="{background:'#eef1f6',color:'#606266'}">
-              <el-table-column label="商品名" align="center" prop="name" />
+              <el-table-column label="商品名" align="center" prop="name" width="500" />
               <el-table-column label="规格" align="center" prop="unit" />
               <el-table-column label="数量" align="center" prop="num" />
               <el-table-column label="退货" align="center" prop="returnedPurchaseProductNum">

src/views/finance/payapply-list.vue

@@ -182,7 +182,7 @@
         </template>
       </el-table-column>
       <el-table-column label="机构名称" align="center" prop="clubName" />
-      <el-table-column label="机构运费" align="center" prop="freight">
+      <el-table-column label="机构运费" align="center" prop="postageInfo">
         <template slot-scope="{row}">
           <span>{{ row.postageInfo }}</span>
         </template>

src/views/finance/payfinance-remit-record.vue

@@ -46,7 +46,7 @@
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>订单金额：</b> ¥{{ dataOrder.order.payTotalFee | amountfilters }}</el-col>
             <el-col :span="4"><b>应收金额：</b> ¥{{ dataOrder.order.payableAmount | amountfilters }}</el-col>
-            <el-col :span="4">
+            <el-col :span="5">
               <b>运费：</b>
               <span>{{ dataOrder.order.postageInfo }}</span>
             </el-col>

src/views/finance/payment-details.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="app-container">
-    <div class="filter-container" style="text-align: right;">
-      <el-button v-if="detailsType === 'verify' && payRepacts.status === 0" type="primary" @click="handlePayCheck(1)">审核通过</el-button>
-      <el-button v-if="detailsType === 'verify' && payRepacts.status === 0" type="danger" @click="dialogVisible = true">审核不通过</el-button>
-      <el-button v-if="payRepacts.status === 1 && detailsType === 'print'" v-print="printObj" type="primary">打印</el-button>
+    <div v-if="payRepacts.status === 1 && detailsType === 'print'" class="filter-container" style="text-align: right;">
+      <el-button v-print="printObj" type="primary">打印</el-button>
     </div>
     <div id="printBox">
       <el-card ref="print" class="box-card" style="margin: 0 auto;">
@@ -45,7 +43,7 @@
                 />
               </el-col>
               <el-col :span="4"><b>账户类型：</b>
-                <span>{{ payRepacts.type === 0 ?'公账':'私账' }}</span>
+                <span>{{ payRepacts.cmType === 0 ?'公账':'私账' }}</span>
               </el-col>
             </el-row>
             <h1 style="font-size: 14px;"><span style="color: red;">*</span>供应商账号：</h1>
@@ -151,7 +149,7 @@
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-table :data="shopOrder.newOrderProducts" border fit highlight-current-row :header-cell-style="{background:'#eef1f6',color:'#606266'}">
-              <el-table-column label="商品名" align="center" prop="name" />
+              <el-table-column label="商品名" align="center" prop="name" width="500" />
               <el-table-column label="规格" align="center" prop="unit" />
               <el-table-column label="数量" align="center" prop="num" />
               <el-table-column label="退货" align="center" prop="returnedPurchaseProductNum">
@@ -190,7 +188,7 @@
               </el-col>
             </template>
             <template v-else>
-              <el-col :span="6"><b>付款银行：</b>{{ payTypeFilters(payRepacts.payType) }} </el-col>
+              <el-col :span="6"><b>付款银行：</b>{{ payRepacts.bankNameType ? payRepacts.bankNameType : '--' }} </el-col>
             </template>
             <template v-if="detailsType === 'edit'">
               <el-col :span="6"><b>付款时间：</b>
@@ -233,6 +231,11 @@
           </el-row>
         </div>
       </el-card>
+      <div v-if="detailsType === 'verify' && payRepacts.status === 0" class="filter-container" style="text-align: center;margin-top: 20px;">
+        <el-button v-if="detailsType === 'verify' && payRepacts.status === 0" type="primary" @click="handlePayCheck(1)">审核通过</el-button>
+        <el-button v-if="detailsType === 'verify' && payRepacts.status === 0" type="danger" @click="dialogVisible = true">审核不通过</el-button>
+        <el-button plain @click="backToList">返回</el-button>
+      </div>
       <div v-if="detailsType === 'edit'" class="filter-container" style="text-align: center;margin-top: 20px;">
         <el-button type="primary" @click="hanldeConfirm">保存编辑</el-button>
         <el-button plain @click="backToList">返回</el-button>
@@ -339,7 +342,6 @@ export default {
         id: 0,
         passCode: 1,
         payType: ''
-
       },
       rules: {
         reason: [{ required: true, message: '请填写不通过原因', trigger: 'blur' }]
@@ -380,6 +382,7 @@ export default {
     },
     payTypeFilters(value) {
       // 收款账号
+      console.log('valueText', value)
       let valueText = ''
       this.receiptTypeList.forEach(type => {
         if (value === type.id) { valueText = type.name } else { valueText = '---' }

src/views/finance/payment-record.vue

@@ -35,11 +35,11 @@
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="6"><b>供应商名称：</b> {{ shopOrder.shopName }}</el-col>
-            <el-col :span="6"><b>供应商运费：</b> {{ shopOrder.shopPostFee | amountfilters }}</el-col>
-            <el-col :span="6">
+            <el-col :span="6"><b>供应商运费：</b> ¥{{ shopOrder.shopPostFee | amountfilters }}</el-col>
+            <el-col :span="12">
               <b>付供应商：</b>
-              <b style="margin-left: 10px;">已付采美:</b>¥{{ shopOrder.payTotalFee | amountfilters }}
-              <b style="margin-left: 10px;">已付供应商:</b>¥{{ shopOrder.payTotalFee | amountfilters }}
+              <b style="margin-left: 10px;">已付采美:</b>¥{{ shopOrder.payCmAmount | amountfilters }}
+              <b style="margin-left: 10px;">已付供应商:</b>¥{{ shopOrder.payedShopAmount | amountfilters }}
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
@@ -56,17 +56,25 @@
         <div class="refund-item">
           <h1 class="refund-item-title">付款记录</h1>
           <el-table :data="pays" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
-            <el-table-column label="序号" align="center" prop="productName" />
-            <el-table-column label="付款单ID" align="center" prop="unit" />
-            <el-table-column label="付款时间" align="center" prop="num" />
-            <el-table-column label="付款方式" align="center" prop="returnNum" />
-            <el-table-column label="付款金额" align="center" prop="price" />
+            <el-table-column label="序号" align="center" width="50">
+              <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+            </el-table-column>
+            <el-table-column label="付款单ID" align="center" prop="payShopId" />
+            <el-table-column label="付款时间" align="center" prop="payTime" />
+            <el-table-column label="付款方式" align="center" prop="bankNameType" />
+            <el-table-column label="付款金额" align="center" prop="payAmount">
+              <template slot-scope="{row}">
+                ¥{{ row.payAmount | amountfilters }}
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <div class="refund-item">
           <h1 class="refund-item-title">退款记录</h1>
           <el-table :data="returns" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
-            <el-table-column label="序号" align="center" prop="productName" />
+            <el-table-column label="序号" align="center" width="50">
+              <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+            </el-table-column>
             <el-table-column label="退款记录ID" align="center" prop="unit" />
             <el-table-column label="退款时间" align="center" prop="num" />
             <el-table-column label="退款方式" align="center" prop="returnNum" />
@@ -113,6 +121,7 @@ export default {
         const res = await organizeReturnAndPay(this.shopOrderId)
         this.shopOrder = res.data.shopOrder
         this.pays = res.data.pays
+        console.log('pays', this.pays)
         this.returns = res.data.returns
       } catch (error) {
         console.log('error', error)

src/views/finance/paysettle-list.vue

@@ -10,7 +10,7 @@
           clearable
           @keyup.enter.native="getList"
           @clear="getList"
-          @input="e => (listQuery.orderId = checkedInput(e))"
+          @input="e => (listQuery.shopOrderId = checkedInput(e))"
         />
       </div>
       <div class="filter-control">

src/views/order/deliver-record.vue

@@ -6,43 +6,39 @@
     </div>
     <el-card v-for="(record,index) in recordList" :key="index" class="box-card" style="margin: 0 auto;">
       <div class="refund-item">
-        <el-row :gutter="24" class="box-row">
-          <el-table :data="record.logisticsRecordList" border fit highlight-current-row :show-header="false">
-            <el-table-column label="商品图片" align="center" prop="image" width="140">
-              <template slot-scope="{row}">
-                <el-popover
-                  placement="top-start"
-                  title=""
-                  width="120"
-                  trigger="hover"
-                >
-                  <img :src="row.image" alt="" style="width:100px;height:100px;">
-                  <img slot="reference" :src="row.image" alt="" style="width:50px;height:50px;">
-                </el-popover>
-              </template>
-            </el-table-column>
-            <el-table-column label="商品名" align="center" prop="productName" />
-            <el-table-column label="规格" align="center" prop="unit" />
-            <el-table-column label="购买数量" align="center" prop="buyNum" />
-            <el-table-column label="发货数量" align="center" prop="num" />
-          </el-table>
-        </el-row>
+        <el-table :data="record.logisticsRecordList" border fit highlight-current-row :show-header="false">
+          <el-table-column label="商品图片" align="center" prop="image" width="140">
+            <template slot-scope="{row}">
+              <el-popover
+                placement="top-start"
+                title=""
+                width="120"
+                trigger="hover"
+              >
+                <img :src="row.image" alt="" style="width:100px;height:100px;">
+                <img slot="reference" :src="row.image" alt="" style="width:50px;height:50px;">
+              </el-popover>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品名" align="center" prop="productName" />
+          <el-table-column label="规格" align="center" prop="unit" />
+          <el-table-column label="购买数量" align="center" prop="buyNum" />
+          <el-table-column label="发货数量" align="center" prop="num" />
+        </el-table>
         <h1 class="refund-item-title">物流详情</h1>
-        <el-row :gutter="24" class="box-row">
-          <el-collapse accordion>
-            <el-collapse-item
-              v-for="(express,exIndex) in record.logisticsInformationList"
-              :key="exIndex"
-              :title="`快递公司：${express.logisticsCompanyName} 物流单号： ${express.nu}`
-              "
-              name="1"
-            >
-              <p v-for="(text,textIndex) in hanldeExpress(express.info)" :key="textIndex">
-                {{ text.time }}{{ text.context }}
-              </p>
-            </el-collapse-item>
-          </el-collapse>
-        </el-row>
+        <el-collapse accordion>
+          <el-collapse-item
+            v-for="(express,exIndex) in record.logisticsInformationList"
+            :key="exIndex"
+            :title="`快递公司：${express.logisticsCompanyName} 物流单号： ${express.nu}`
+            "
+            name="1"
+          >
+            <p v-for="(text,textIndex) in hanldeExpress(express.info)" :key="textIndex">
+              {{ text.time }}{{ text.context }}
+            </p>
+          </el-collapse-item>
+        </el-collapse>
       </div>
     </el-card>
   </div>