订单

src/api/finance.js

@@ -117,7 +117,7 @@ export function organizePayInfos(params) {
   })
 }
 /**
- * 订单首付款记录
+ * 订单收付款记录
  */
 export function organizeReceiptRecord(id) {
   return request({
@@ -125,6 +125,15 @@ export function organizeReceiptRecord(id) {
     method: 'get'
   })
 }
+/**
+ * 订单结算记录
+ */
+export function organizeSettleRecord(id) {
+  return request({
+    url: '/order/organize/settle/record/' + id,
+    method: 'get'
+  })
+}
 /**
  * 申请分账
  */

src/components/UploadImage/index.vue

@@ -13,9 +13,9 @@
       :multiple="multiple"
       :accept="accept"
     >
-      <div v-loading="loadImgLoading" class="avatar">
-        <img v-if="dialogImageUrl" :src="dialogImageUrl" @error="reloadImage" @load="loadSucess">
-        <i v-else class="el-icon-plus avatar-uploader-icon" />
+      <div v-loading="loadImgLoading" class="avatar" :style="{width:domWidth,height:domHeight,display: 'block'}">
+        <img v-if="dialogImageUrl" :src="dialogImageUrl" :style="{width:domWidth,height:domHeight,display: 'block'}" @error="reloadImage" @load="loadSucess">
+        <i v-else class="el-icon-plus avatar-uploader-icon" :style="{width:domWidth,height:domHeight,lineHeight:domHeight}" />
       </div>
       <button v-if="trigger" ref="trigger" slot="trigger" size="small" type="primary">选取文件</button>
     </el-upload>
@@ -23,6 +23,7 @@
 </template>
 
 <script>
+import { string } from 'clipboard'
 import { mapGetters } from 'vuex'
 export default {
   name: 'UploadImage',
@@ -31,6 +32,14 @@ export default {
       type: Number,
       default: 0
     },
+    domWidth: {
+      type: string,
+      default: '148px'
+    },
+    domHeight: {
+      type: string,
+      default: '148px'
+    },
     dialogImageUrl: {
       type: String,
       default: ''
@@ -119,3 +128,9 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+  .el-upload--picture-card{
+    width: 100% !important;
+    height: 100% !important;
+  }
+</style>

src/router/modules/finance.js

@@ -35,13 +35,6 @@ const financeRouter = {
       meta: { title: '付款详情', noCache: true, icon: 'el-icon-bank-card' },
       hidden: true
     },
-    {
-      path: 'payment-edit',
-      name: 'PaymentEdit',
-      component: () => import('@/views/finance/payment-edit'),
-      meta: { title: '编辑', noCache: true, icon: 'el-icon-bank-card' },
-      hidden: true
-    },
     {
       path: 'payment-record',
       name: 'PaymentRecord',

src/settings.js

@@ -17,7 +17,7 @@ module.exports = {
    * @type {boolean} true | false
    * @description Whether fix the header
    */
-  fixedHeader: false,
+  fixedHeader: true,
 
   /**
    * @type {boolean} true | false

src/styles/index.scss

@@ -223,6 +223,8 @@ input[type="number"]{
       font-size: 14px;
       color: #606266;
       font-weight: bold;
+      width: 90px;
+      text-align: right;
     }
     > .el-input,
     > .el-select {

src/utils/request.js

@@ -35,46 +35,63 @@ service.interceptors.response.use(
   /**
    * If you want to get http information such as headers or status
    * Please return  response => response
-  */
+   */
 
   /**
    * Determine the request status by custom code
    * Here is just an example
    * You can also judge the status by HTTP Status Code
    */
-  response => {
+  (response) => {
     const res = response.data
-    // if the custom code is not 20000, it is judged as an error.
-    if (res.code === 0) {
-      return res
-    } else {
+
+    // if the custom code is -1, it is judged as an error.
+    if (res.code === -1) {
       Message({
         message: res.msg || 'Error',
         type: 'error',
-        duration: 3 * 1000
+        duration: 5 * 1000
       })
-      console.log(res)
+
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
       if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
         // to re-login
-        MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
-          confirmButtonText: 'Re-Login',
-          cancelButtonText: 'Cancel',
-          type: 'warning'
-        }).then(() => {
+        MessageBox.confirm(
+          'You have been logged out, you can cancel to stay on this page, or log in again',
+          'Confirm logout',
+          {
+            confirmButtonText: 'Re-Login',
+            cancelButtonText: 'Cancel',
+            type: 'warning'
+          }
+        ).then(() => {
           store.dispatch('user/resetToken').then(() => {
             location.reload()
           })
         })
       }
+      return Promise.reject(new Error(res.msg || 'Error'))
+    }
+    if (res.code === -99) {
+      MessageBox.confirm('您已超时已被系统被自动退出，请重新登录~', '提示', {
+        confirmButtonText: '重新登录',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        store.dispatch('user/resetToken').then(() => {
+          location.reload() // 为了重新实例化vue-router对象 避免bug
+        })
+      })
+    } else {
+      return res
     }
   },
-  error => {
+  (error) => {
     const reg = new RegExp(/504|503|500|400/)
     console.log(error)
     if (reg.test(error.message) || error.message === 'Network Error') {
       Message({
-        message: '网络连接超时，请检查网络！',
+        message: '网络连接错误，请联系系统管理员！',
         type: 'error',
         duration: 3 * 1000
       })

src/views/campaign/activity-edit.vue

@@ -46,7 +46,7 @@
             </el-table-column>
             <el-table-column prop="sort" label="排序" align="center" width="100">
               <template slot-scope="{row}">
-                <el-input v-model="row.sort" :maxlength="4" size="mini" />
+                <el-input v-model="row.sort" type="text" :maxlength="4" size="mini" />
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center">
@@ -61,9 +61,11 @@
       <template v-if="form.activeType === 2">
         <div v-for="(activ,index) in form.images" :key="index" class="form-cell">
           <el-form-item label="宣传图:" prop="image" :rules="rules.image" style="margin-bottom: 40px;">
-            <div class="form-el-upload">
+            <div class="form-el-upload" style="width: 375px;height: 680px;">
               <upload-image
                 :limit="1"
+                :dom-width="'375px'"
+                :dom-height="'680px'"
                 :dom-index="index"
                 :dialog-image-url="activ.image"
                 :before-upload="beforeUpload"
@@ -100,7 +102,7 @@
               </el-table-column>
               <el-table-column label="排序" align="center" width="100">
                 <template slot-scope="{row}">
-                  <el-input v-model="row.sort" maxlength="4" minlength="1" />
+                  <el-input v-model="row.sort" type="text" maxlength="4" />
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center">
@@ -119,9 +121,11 @@
             <el-input v-model="activ.topic" placeholder="请输入宣传图标题" maxlength="30" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="宣传图:" prop="image" :rules="rules.image" style="margin-bottom: 40px;">
-            <div class="form-el-upload">
+            <div class="form-el-upload" style="width: 350px;height: 170px;">
               <upload-image
                 :limit="1"
+                :dom-width="'350px'"
+                :dom-height="'170px'"
                 :dom-index="index"
                 :dialog-image-url="activ.image"
                 :before-upload="beforeUpload"
@@ -273,11 +277,9 @@ export default {
     handleGoodConfirm(data) {
       // 确认选择商品
       if (this.form.activeType === 1) {
-        const products = data.map(item => { item.sort = 0; return item })
-        this.form.products = [...this.form.products, ...products]
+        this.form.products = [...this.form.products, ...data]
       } else {
-        const products = data.map(item => { item.sort = 0; return item })
-        this.form.images[this.ActivIndex].products = [...this.form.images[this.ActivIndex].products, ...products]
+        this.form.images[this.ActivIndex].products = [...this.form.images[this.ActivIndex].products, ...data]
       }
       console.log('products', this.form.products)
       this.handleGoodCancel()

src/views/campaign/activity-list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="filter-container">
       <div class="filter-control">
-        <span>活动类型:</span>
+        <span style="width: auto;">活动类型:</span>
         <el-select v-model="listQuery.activeType" style="width:120px;" clearable @change="getList">
           <el-option value="" label="请选择" />
           <el-option :value="1" label="商品列表" />
@@ -11,7 +11,7 @@
         </el-select>
       </div>
       <div class="filter-control">
-        <span>主题:</span>
+        <span style="width: auto;">主题:</span>
         <el-input
           v-model="listQuery.topic"
           placeholder="请输入活动主题"
@@ -21,7 +21,7 @@
         />
       </div>
       <div class="filter-control">
-        <span>状态:</span>
+        <span style="width: auto;">状态:</span>
         <el-select v-model="listQuery.enabledStatus" style="width:120px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option :value="1" label="已上线" />

src/views/campaign/components/banner/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="filter-container">
       <div class="filter-control">
-        <span>主题:</span>
+        <span style="width: auto;">主题:</span>
         <el-input
           v-model="listQuery.bannerName"
           placeholder="主题名称"
@@ -12,7 +12,7 @@
         />
       </div>
       <div class="filter-control">
-        <span>状态:</span>
+        <span style="width: auto;">状态:</span>
         <el-select v-model="listQuery.enabledStatus" style="width:120px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option :value="1" label="已上线" />

src/views/campaign/components/good-multi-dialog.vue

@@ -105,7 +105,8 @@ export default {
     async getList() {
       this.isLoading = true
       const res = await getList(this.listQuery)
-      this.list = res.data.results
+      const data = res.data.results
+      this.list = data.map(item => { item.sort = 0; return item })
       this.total = res.data.totalRecord
       this.isLoading = false
     },

src/views/campaign/components/special/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="filter-container">
       <div class="filter-control">
-        <span>主题:</span>
+        <span style="width: auto;">主题:</span>
         <el-input
           v-model="listQuery.topic"
           placeholder="主题名称"
@@ -12,7 +12,7 @@
         />
       </div>
       <div class="filter-control">
-        <span>状态:</span>
+        <span style="width: auto;">状态:</span>
         <el-select v-model="listQuery.enabledStatus" style="width:120px;" clearable @change="getList">
           <el-option value="" label="请选择" />
           <el-option :value="1" label="已上线" />

src/views/club/details.vue

@@ -30,10 +30,10 @@
           </div>
         </div>
       </el-form-item>
-      <el-form-item v-if="form.headpic" label="医疗执业许可证:" prop="headpic" style="width:450px; text-align: right;float:left;">
+      <el-form-item v-if="form.medicalPracticeLicenseImg" label="医疗执业许可证:" prop="medicalPracticeLicenseImg" style="width:450px; text-align: right;float:left;">
         <div class="form-el-upload">
           <div class="avatar">
-            <img :src="form.headpic">
+            <img :src="form.medicalPracticeLicenseImg">
           </div>
         </div>
       </el-form-item>

src/views/club/list.vue

@@ -2,19 +2,19 @@
   <div class="app-container">
     <div class="filter-container">
       <div class="filter-control">
-        <span>机构名称:</span>
+        <span style="width: auto;">机构名称:</span>
         <el-input v-model="listQuery.userName" style="width:130px;" placeholder="请输入机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
-        <span>联系人:</span>
+        <span style="width: auto;">联系人:</span>
         <el-input v-model="listQuery.linkMan" style="width:130px;" placeholder="请输入联系人姓名" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
-        <span>手机号:</span>
+        <span style="width: auto;">手机号:</span>
         <el-input v-model="listQuery.bindMobile" style="width:130px;" placeholder="请输入手机号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
-        <span>状态:</span>
+        <span style="width: auto;">状态:</span>
         <el-select v-model="listQuery.clubStatus" style="width:120px;" clearable @change="getList">
           <el-option value="" label="全部" />
           <el-option label="待审核" :value="1" />

src/views/dashboard/admin/index.vue

@@ -7,178 +7,19 @@
 </template>
 
 <script>
-import { getPayDetails, getReceiptTypeList, subPayApply, subPayCheck } from '@/api/finance'
 export default {
   name: 'PaymentDetails',
-  filters: {
-    statusFilter(status) {
-      const map = {
-        0: '待审核',
-        1: '审核通过',
-        2: '审核不通过'
-      }
-      return map[status]
-    },
-    receiptStatusFilter(status) {
-      const map = {
-        1: '待收款',
-        2: '部分收款',
-        3: '已收款'
-      }
-      return map[status]
-    },
-    payStatusFilter(status) {
-      const map = {
-        1: '待付款',
-        2: '部分付款',
-        3: '已付款'
-      }
-      return map[status]
-    }
-  },
   data() {
     return {
-      printObj: {
-        id: 'printBox', // 局部打印的<div> Id
-        popTitle: '', // 打印配置页上方标题
-        extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
-        preview: '', // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
-        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
-        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
-        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
-        previewBeforeOpenCallback() {}, // 预览窗口打开之前的callback（开启预览模式调用）
-        previewOpenCallback() {}, // 预览窗口打开之后的callback（开启预览模式调用）
-        beforeEntryIframe() {
-          const cells = document.querySelectorAll('.cell')
-          const tableNode = document.querySelectorAll('.el-table__header,.el-table__body')
-          // el-table 打印不全的问题
-          for (let j = 0; j < tableNode.length; j++) {
-            const tableItem = tableNode[j]
-            tableItem.style.width = '100%'
-            const child = tableItem.childNodes
-            for (let i = 0; i < child.length; i++) {
-              const element = child[i]
-              if (element.localName === 'colgroup') {
-                element.innerHTML = ''
-              }
-            }
-          }
-          // el-table 格子里面打印超过格子的问题
-          for (let i = 0; i < cells.length; i++) {
-            const cell = cells[i]
-            cell.style.width = '100%'
-            cell.removeAttribute('style')
-          }
-        },
-        openCallback() {
-
-        }, // 调用打印之后的回调事件
-        closeCallback() {}, // 关闭打印的回调事件（无法确定点击的是确认还是取消）
-        url: '',
-        standard: '',
-        extraCss: '',
-        loading: false
-      },
-      payRepacts: {},
-      receiptTypeList: [],
-      detailsType: '',
-      dialogVisible: false,
-      checkParams: {
-        id: 0,
-        passCode: 1,
-        payType: ''
 
-      },
-      rules: {
-        reason: [{ required: true, message: '请填写不通过原因', trigger: 'blur' }]
-      }
-    }
-  },
-  computed: {
-    payShopId: function() {
-      return this.$route.query.payShopId * 1
-    },
-    disabled() {
-      return !this.checkParams.reason
     }
   },
+
   created() {
-    if (this.$route.query.type) {
-      this.detailsType = this.$route.query.type
-    }
-    this.getPayDetails()
-    this.getReceiptTypeList()
+
   },
   methods: {
-    // 付款单详情
-    async getPayDetails() {
-      try {
-        const res = await getPayDetails(this.payShopId)
-        console.log('res', res)
-        this.payRepacts = res.data
-      } catch (error) {
-        console.log('error', error)
-      }
-    },
-    // 获取收款账号列表
-    async getReceiptTypeList() {
-      const res = await getReceiptTypeList()
-      this.receiptTypeList = res.data
-      this.checkParams.payType = res.data[0].id
-    },
-    payTypeFilters(value) {
-      // 收款账号
-      let valueText = ''
-      this.receiptTypeList.forEach(type => {
-        if (value === type.id) { valueText = type.name } else { valueText = '---' }
-      })
-      console.log('valueText', valueText)
-      return valueText
-    },
-    hanldeConfirm() {
-      // 保存编辑
-      this.payRepacts.operateMode = 1
-      this.subPayApply(this.payRepacts)
-    },
-    async subPayApply(params) {
-      // 执行保存
-      try {
-        await subPayApply(params)
-        this.$message.success('提交成功')
-        this.backToList()
-      } catch (error) {
-        console.log('error', error)
-      }
-    },
-    handlePayCheck(type) {
-      // 审核
-      if (type === 1) {
-        this.checkParams.reason = ''
-      }
-      this.checkParams.id = this.payRepacts.payShopId
-      this.checkParams.passCode = type
-      this.subPayCheck(this.checkParams)
-    },
-    async subPayCheck(params) {
-      // 执行审核
-      try {
-        await subPayCheck(params)
-        this.$message.success('审核成功')
-        this.checkParams.reason = ''
-        this.backToList()
-      } catch (error) {
-        console.log('error', error)
-      }
-    },
-    backToList() {
-      this.$store.dispatch('tagsView/delView', this.$route).then(() => {
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/finance/payment-list'
-          })
-        })
-      })
-    }
+
   }
 }
 </script>

src/views/finance/list.vue

@@ -3,27 +3,27 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>收款ID:</span>
-        <el-input v-model="listQuery.receiptId" style="width:130px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.receiptId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单ID:</span>
-        <el-input v-model="listQuery.orderId" style="width:130px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单编号:</span>
-        <el-input v-model="listQuery.orderNo" style="width:200px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderNo" style="width:180px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>机构名称:</span>
-        <el-input v-model="listQuery.userName" style="width:200px;" placeholder="客户名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.userName" style="width:180px;" placeholder="客户名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>收款方:</span>
-        <el-input v-model="listQuery.customer" style="width:200px;" placeholder="收款方" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.customer" style="width:180px;" placeholder="收款方" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>收款方式:</span>
-        <el-select v-model="listQuery.payWay" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.payWay" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="线上" :value="1" />
           <el-option label="线下" :value="2" />
@@ -31,7 +31,7 @@
       </div>
       <div class="filter-control">
         <span>收款状态:</span>
-        <el-select v-model="listQuery.receiptStatus" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.receiptStatus" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="待审核" :value="2" />
           <el-option label="审核通过" :value="3" />
@@ -41,14 +41,14 @@
       </div>
       <div class="filter-control">
         <span>收款账号:</span>
-        <el-select v-model="listQuery.payType" style="width:150px;" clearable @change="getList">
+        <el-select v-model="listQuery.payType" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option v-for="item in receiptTypeList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </div>
       <div class="filter-control">
         <span>收款进度:</span>
-        <el-select v-model="listQuery.receiptProgress" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.receiptProgress" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="待收款" :value="1" />
           <el-option label="部分收款" :value="2" />
@@ -57,7 +57,7 @@
       </div>
       <div class="filter-control">
         <span>关联数量:</span>
-        <el-select v-model="listQuery.associationNum" style="width:150px;" clearable @change="getList">
+        <el-select v-model="listQuery.associationNum" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="关联一个订单" value="1" />
           <el-option label="关联多个订单" value="2" />

src/views/finance/payapply-edit.vue

@@ -70,8 +70,8 @@
         </div>
         <div v-for="(shopOrder,index) in payRepacts.shopOrders" :key="index" class="refund-item">
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>订单编号(ID)：</b> {{ shopOrder.orderNo }}({{ shopOrder.orderId }})</el-col>
-            <el-col :span="4"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
+            <el-col :span="5"><b>订单编号(ID)：</b> {{ shopOrder.orderNo }}({{ shopOrder.orderId }})</el-col>
+            <el-col :span="5"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
             <el-col :span="4"><b>订单金额：</b> <span class="el-span-danger">{{ shopOrder.payTotalFee }}</span></el-col>
             <el-col :span="10">
               <b>所有子订单：</b>
@@ -81,23 +81,15 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>机构名称：</b> {{ shopOrder.buyer }}</el-col>
-            <el-col :span="4"><b>机构运费：</b>
-              <span v-if="shopOrder.freight === 0">包邮</span>
-              <span v-else-if="shopOrder.freight === -1">到付</span>
-              <span v-else-if="shopOrder.freight === -2">仪器到付-产品包邮</span>
-              <span v-else>{{ shopOrder.freight ? shopOrder.freight : '0.00' }}</span>
+            <el-col :span="5"><b>机构名称：</b> {{ shopOrder.buyer }}</el-col>
+            <el-col :span="5"><b>机构运费：</b>
+              <span class="el-span-danger">{{ payRepacts.postageInfo }}</span>
             </el-col>
-            <el-col :span="4"><b>收款状态：</b>
-              <span
-                :class="{
-                  'el-span-warning': shopOrder.orderReceiptStatus == 1,
-                  'el-span-success': shopOrder.orderReceiptStatus == 2,
-                  'el-span-danger': shopOrder.orderReceiptStatus == 3
-                }"
-              >
-                {{ shopOrder.orderReceiptStatus | receiptStatusFilter }}
-              </span>
+            <el-col :span="4">
+              <b>收款状态：</b>
+              <el-tag v-if="shopOrder.orderReceiptStatus===1" type="danger" size="small">待收款</el-tag>
+              <el-tag v-if="shopOrder.orderReceiptStatus===2" type="warning" size="small">部分收款</el-tag>
+              <el-tag v-if="shopOrder.orderReceiptStatus===3" type="success" size="small">已收款</el-tag>
             </el-col>
             <el-col :span="10">
               <b>收款金额：</b>
@@ -105,15 +97,20 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>子订单编号(ID)：</b> {{ shopOrder.shopOrderNo }}({{ shopOrder.shopOrderId }})</el-col>
-            <el-col :span="4"><b>子订单佣金：</b>
+            <el-col :span="5"><b>子订单编号(ID)：</b> {{ shopOrder.shopOrderNo }}({{ shopOrder.shopOrderId }})</el-col>
+            <el-col :span="5"><b>子订单佣金：</b>
               <span class="el-span-danger"> {{ shopOrder.brokerage | amountfilters }}  </span>
             </el-col>
             <el-col :span="4"><b>商品费：</b> {{ shopOrder.productAmount | amountfilters }}</el-col>
-            <el-col :span="10"><b>付款状态：</b> {{ shopOrder.payStatus | payStatusFilter }}</el-col>
+            <el-col :span="10">
+              <b>付款状态：</b>
+              <el-tag v-if="shopOrder.payStatus===1" type="danger" size="small">待付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus===2" type="warning" size="small">部分付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus===3" type="success" size="small">已付款</el-tag>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>供应商名称：</b> {{ shopOrder.shopName }}</el-col>
+            <el-col :span="5"><b>供应商名称：</b> {{ shopOrder.shopName }}</el-col>
             <el-col :span="18"><b>供应商运费：</b>
               <el-input v-model="shopOrder.shopPostFee" style="width: 100px;" size="mini" />
             </el-col>

src/views/finance/payapply-list.vue

@@ -3,31 +3,31 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>子订单ID:</span>
-        <el-input v-model="listQuery.shopOrderId" style="width:130px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopOrderId" style="width:180px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>子订单编号:</span>
-        <el-input v-model="listQuery.shopOrderNo" style="width:200px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopOrderNo" style="width:180px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单ID:</span>
-        <el-input v-model="listQuery.orderId" style="width:130px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单编号:</span>
-        <el-input v-model="listQuery.orderNo" style="width:200px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderNo" style="width:180px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>供应商:</span>
-        <el-input v-model="listQuery.shopName" style="width:200px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopName" style="width:180px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>机构名称:</span>
-        <el-input v-model="listQuery.clubName" style="width:200px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.clubName" style="width:180px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>付款状态:</span>
-        <el-select v-model="listQuery.status" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="未付款" value="0" />
           <el-option label="部分付款" value="1" />
@@ -140,10 +140,7 @@
       <el-table-column label="机构" align="center" prop="buyer" />
       <el-table-column label="机构运费" align="center" prop="freight">
         <template slot-scope="{row}">
-          <span v-if="row.freight === 0">包邮</span>
-          <span v-else-if="row.freight === -1">到付</span>
-          <span v-else-if="row.freight === -2">仪器到付-产品包邮</span>
-          <span v-else>{{ row.freight ? row.freight : '0.00' }}</span>
+          <span>{{ row.postageInfo }}</span>
         </template>
       </el-table-column>
       <el-table-column label="供应商" align="center" prop="shopName" />

src/views/finance/paycents-list.vue

@@ -3,27 +3,27 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>子订单ID:</span>
-        <el-input v-model="listQuery.shopOrderId" style="width:130px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopOrderId" style="width:180px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>子订单编号:</span>
-        <el-input v-model="listQuery.shopOrderNo" style="width:200px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopOrderNo" style="width:180px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单ID:</span>
-        <el-input v-model="listQuery.orderId" style="width:130px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单编号:</span>
-        <el-input v-model="listQuery.orderNo" style="width:200px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderNo" style="width:180px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>供应商:</span>
-        <el-input v-model="listQuery.shopName" style="width:200px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopName" style="width:180px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>机构名称:</span>
-        <el-input v-model="listQuery.clubName" style="width:200px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.clubName" style="width:180px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>下单时间:</span>
@@ -132,10 +132,7 @@
       <el-table-column label="机构" align="center" prop="buyer" />
       <el-table-column label="机构运费" align="center" prop="freight">
         <template slot-scope="{row}">
-          <span v-if="row.freight === 0">包邮</span>
-          <span v-else-if="row.freight === -1">到付</span>
-          <span v-else-if="row.freight === -2">仪器到付-产品包邮</span>
-          <span v-else>{{ row.freight ? row.freight : '0.00' }}</span>
+          <span>{{ row.postageInfo }}</span>
         </template>
       </el-table-column>
       <el-table-column label="供应商" align="center" prop="shopName" />

src/views/finance/payfinance-list.vue

@@ -3,31 +3,31 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>子订单ID:</span>
-        <el-input v-model="listQuery.shopOrderId" style="width:130px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopOrderId" style="width:180px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>子订单编号:</span>
-        <el-input v-model="listQuery.shopOrderNo" style="width:200px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopOrderNo" style="width:180px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单ID:</span>
-        <el-input v-model="listQuery.orderId" style="width:130px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单编号:</span>
-        <el-input v-model="listQuery.orderNo" style="width:200px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderNo" style="width:180px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>供应商:</span>
-        <el-input v-model="listQuery.shopName" style="width:200px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopName" style="width:180px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>机构名称:</span>
-        <el-input v-model="listQuery.clubName" style="width:200px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.clubName" style="width:180px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>收款状态:</span>
-        <el-select v-model="listQuery.receiptStatus" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.receiptStatus" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="待收款" :value="1" />
           <el-option label="部分收款" :value="2" />
@@ -36,7 +36,7 @@
       </div>
       <div class="filter-control">
         <span>付款状态:</span>
-        <el-select v-model="listQuery.payStatus" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.payStatus" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="待付款" :value="1" />
           <el-option label="部分付款" :value="2" />
@@ -45,7 +45,7 @@
       </div>
       <div class="filter-control">
         <span>退款状态:</span>
-        <el-select v-model="listQuery.refundType" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.refundType" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="部分退款" :value="1" />
           <el-option label="全部退款" :value="2" />
@@ -53,7 +53,7 @@
       </div>
       <div class="filter-control">
         <span>结算状态:</span>
-        <el-select v-model="listQuery.settleStatus" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.settleStatus" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="未结算" :value="1" />
           <el-option label="部分结算" :value="2" />
@@ -180,10 +180,7 @@
       <el-table-column label="机构" align="center" prop="clubName" />
       <el-table-column label="机构运费" align="center" prop="freight">
         <template slot-scope="{row}">
-          <span v-if="row.freight*1===0">包邮</span>
-          <span v-if="row.freight*1===-1">到付</span>
-          <span v-if="row.freight*1===-2">仪器到付-产品包邮</span>
-          <span v-else>¥{{ row.freight }}</span>
+          <span>{{ row.postageInfo }}</span>
         </template>
       </el-table-column>
       <el-table-column label="订单状态" prop="status" align="center">

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

@@ -43,7 +43,7 @@
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>订单金额：</b> {{ repacts.payableAmount }}</el-col>
             <el-col :span="4"><b>应收金额：</b> {{ repacts.payableAmount }}</el-col>
-            <el-col :span="4"><b>机构运费：</b> 包邮</el-col>
+            <el-col :span="4"><b>机构运费：</b>  <span>{{ repacts.postageInfo }}</span></el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>收款状态：</b> {{ repacts.status | statusFilter }}</el-col>
@@ -164,32 +164,7 @@ export default {
       payRepacts: {},
       repacts: {},
       products: [],
-      cmReturnedPurchaseList: [],
-      activeIndex: '2',
-      order: null,
-      receiptAmount: 0,
-      returnValue: 0,
-      returnedPurchaseFee: 0,
-      bpClauses: null,
-      dialogRemarkList: [],
-      dialogRemarksVisible: false,
-      dialogRemarksOrderId: 0,
-      statusObj: {
-        '0': '待确认',
-        '4': '交易完成',
-        '5': '订单完成',
-        '6': '已关闭',
-        '7': '交易全退',
-        '11': '待收款、待发货',
-        '12': '待收款、部分发货',
-        '13': '待收款、全部发货',
-        '21': '部分收款、待发货',
-        '22': '部分收款、部分发货',
-        '23': '部分收款、全部发货',
-        '31': '全部收款、待发货',
-        '32': '全部收款、部分发货',
-        '33': '全部收款、全部发货'
-      }
+      cmReturnedPurchaseList: []
     }
   },
   computed: {

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

@@ -48,10 +48,7 @@
             <el-col :span="4"><b>应收金额：</b> {{ dataOrder.order.payableAmount | amountfilters }}</el-col>
             <el-col :span="4">
               <b>运费：</b>
-              <span v-if="dataOrder.order.freight*1===0">包邮</span>
-              <span v-else-if="dataOrder.order.freight*1===-1">到付</span>
-              <span v-else-if="dataOrder.order.freight*1===-2">仪器到付-产品包邮</span>
-              <span v-else>¥{{ dataOrder.order.freight }}</span>
+              <span>{{ dataOrder.order.postageInfo }}</span>
             </el-col>
             <el-col :span="4"><b>退款金额：</b> {{ dataOrder.order.returnValue | amountfilters }}</el-col>
           </el-row>

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

@@ -8,7 +8,7 @@
             <el-col :span="4"><b>下单时间：</b> {{ repacts.applyTime }}</el-col>
             <el-col :span="4"><b>机构名称：</b> {{ repacts.clubName }}</el-col>
             <el-col :span="4"><b>订单金额：</b> {{ repacts.payableAmount }}</el-col>
-            <el-col :span="4"><b>机构运费：</b> 包邮</el-col>
+            <el-col :span="4"><b>机构运费：</b>  <span>{{ repacts.postageInfo }}</span></el-col>
             <el-col :span="3"><b>订单状态：</b> 交易中</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">

src/views/finance/payment-details.vue

@@ -83,8 +83,8 @@
         </div>
         <div v-for="(shopOrder,index) in payRepacts.shopOrders" :key="index" class="refund-item">
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>订单编号(ID)：</b> {{ shopOrder.orderNo }}({{ shopOrder.orderId }})</el-col>
-            <el-col :span="4"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
+            <el-col :span="5"><b>订单编号(ID)：</b> {{ shopOrder.orderNo }}({{ shopOrder.orderId }})</el-col>
+            <el-col :span="5"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
             <el-col :span="4"><b>订单金额：</b> <span class="el-span-danger">{{ shopOrder.payTotalFee }}</span></el-col>
             <el-col :span="10">
               <b>所有子订单：</b>
@@ -94,23 +94,19 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>机构名称：</b> {{ shopOrder.buyer }}</el-col>
-            <el-col :span="4"><b>机构运费：</b>
-              <span v-if="shopOrder.freight === 0">包邮</span>
-              <span v-else-if="shopOrder.freight === -1">到付</span>
-              <span v-else-if="shopOrder.freight === -2">仪器到付-产品包邮</span>
-              <span v-else>{{ shopOrder.freight ? shopOrder.freight : '0.00' }}</span>
+            <el-col :span="5">
+              <b>机构名称：</b>
+              {{ shopOrder.buyer }}
             </el-col>
-            <el-col :span="4"><b>收款状态：</b>
-              <span
-                :class="{
-                  'el-span-warning': shopOrder.orderReceiptStatus == 1,
-                  'el-span-success': shopOrder.orderReceiptStatus == 2,
-                  'el-span-danger': shopOrder.orderReceiptStatus == 3
-                }"
-              >
-                {{ shopOrder.orderReceiptStatus | receiptStatusFilter }}
-              </span>
+            <el-col :span="5">
+              <b>机构运费：</b>
+              <span class="el-span-danger">{{ payRepacts.postageInfo }}</span>
+            </el-col>
+            <el-col :span="4">
+              <b>收款状态：</b>
+              <el-tag v-if="shopOrder.orderReceiptStatus===1" type="danger" size="small">待收款</el-tag>
+              <el-tag v-if="shopOrder.orderReceiptStatus===2" type="warning" size="small">部分收款</el-tag>
+              <el-tag v-if="shopOrder.orderReceiptStatus===3" type="success" size="small">已收款</el-tag>
             </el-col>
             <el-col :span="10">
               <b>收款金额：</b>
@@ -118,16 +114,20 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>子订单编号(ID)：</b> {{ shopOrder.shopOrderNo }}({{ shopOrder.shopOrderId }})</el-col>
-            <el-col :span="4"><b>子订单佣金：</b>
+            <el-col :span="5"><b>子订单编号(ID)：</b> {{ shopOrder.shopOrderNo }}({{ shopOrder.shopOrderId }})</el-col>
+            <el-col :span="5"><b>子订单佣金：</b>
               <span> {{ shopOrder.brokerage | amountfilters }}  </span>
             </el-col>
             <el-col :span="4"><b>商品费：</b> {{ shopOrder.productAmount | amountfilters }}</el-col>
-            <el-col :span="10"><b>付款状态：</b> {{ shopOrder.payStatus | payStatusFilter }}</el-col>
+            <el-col :span="10"><b>付款状态：</b>
+              <el-tag v-if="shopOrder.payStatus===1" type="danger" size="small">待付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus===2" type="warning" size="small">部分付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus===3" type="success" size="small">已付款</el-tag>
+            </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>供应商名称：</b> {{ shopOrder.shopName }}</el-col>
-            <el-col :span="4"><b>供应商运费：</b>
+            <el-col :span="5"><b>供应商名称：</b> {{ shopOrder.shopName }}</el-col>
+            <el-col :span="5"><b>供应商运费：</b>
               <span>{{ shopOrder.shopPostFee | amountfilters }}</span>
             </el-col>
           </el-row>

src/views/finance/payment-edit.vue

@@ -1,381 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card class="box-card" style="margin: 0 auto;">
-      <h1 class="app-title">付款单</h1>
-      <div class="refund-item">
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="24"><b>付款单名称：</b>
-            <el-input
-              v-model="payRepacts.name"
-              placeholder="请输入付款单名称"
-              clearable
-              style="width: 250px;"
-            /> </el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="24"><b>供应商名称：</b> 浙江瑞崎科技有限公司</el-col>
-        </el-row>
-        <h1 style="font-size: 14px;">付款账号：</h1>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="4"><b>户名：</b>
-            <el-input
-              v-model="payRepacts.name"
-              placeholder="请输入银行户名："
-              clearable
-              style="width: 150px;"
-            />
-          </el-col>
-          <el-col :span="6"><b>账号：</b>
-            <el-input
-              v-model="payRepacts.account"
-              clearable
-              placeholder="请输入银行账户："
-              style="width: 250px;"
-            />
-          </el-col>
-          <el-col :span="6"><b>开户行：</b>
-            <el-input
-              v-model="payRepacts.accountBank"
-              placeholder="请输入开户行："
-              style="width: 200px;"
-            />
-          </el-col>
-          <el-col :span="6"><b>账户类型：</b>
-            <el-select v-model="payRepacts.enabledStatus" placeholder="请选择">
-              <el-option label="公账" :value="1" />
-              <el-option label="私账" :value="2" />
-            </el-select>
-          </el-col>
-        </el-row>
-      </div>
-      <div v-for="(repact,index) in repacts" :key="index" class="refund-item">
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>订单编号(ID)：</b> {{ repact.orderNo }}({{ repact.orderId }})</el-col>
-          <el-col :span="4"><b>下单时间：</b> {{ repact.applyTime }}</el-col>
-          <el-col :span="4"><b>订单金额：</b> {{ repact.payableAmount }}</el-col>
-          <el-col :span="10">
-            <b>所有子订单：</b>
-            <span v-for="child in repact.childOrderId" :key="child">
-              【{{ child }}】
-            </span>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>机构名称：</b> {{ repact.clubName }}</el-col>
-          <el-col :span="4"><b>机构运费：</b> 包邮</el-col>
-          <el-col :span="4"><b>收款状态：</b> {{ repact.status | statusFilter }}</el-col>
-          <el-col :span="10"><b>收款金额：</b> {{ repact.payableAmount }}</el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>子订单编号(ID)</b> {{ repact.orderNo }}({{ repact.orderId }})</el-col>
-          <el-col :span="4">
-            <b>子订单佣金：</b>5000.00(17%)
-          </el-col>
-          <el-col :span="4"><b>商品费：</b> {{ repact.payableAmount }}</el-col>
-          <el-col :span="10"><b>付款状态：</b> {{ repact.status | statusFilter }}</el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>供应商名称：</b> {{ repact.shopName }}</el-col>
-          <el-col :span="4">
-            <b>供应商运费：</b>
-            <el-input v-model="payRepacts.name" placeholder="" size="mini" clearable style="width: 80px;" />
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="24"><b>付供应商：</b>
-            <b style="margin-left: 10px;">应付采美:</b>10000.00
-            <b style="margin-left: 10px;">已付采美:</b>10000.00
-            <b style="margin-left: 10px;">待付采美:</b>
-            <el-input v-model="payRepacts.name" placeholder="" size="mini" clearable style="width: 150px;" />
-            <b style="margin-left: 10px;">应付供应商:</b>10000.00
-            <b style="margin-left: 10px;">已付供应商:</b>10000.00
-            <b style="margin-left: 10px;">待付供应商:</b>
-            <el-input v-model="payRepacts.name" placeholder="" size="mini" clearable style="width: 150px;" />
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-table :data="repact.products" border fit highlight-current-row :header-cell-style="{background:'#eef1f6',color:'#606266'}">
-            <el-table-column label="商品名" align="center" prop="productName" />
-            <el-table-column label="规格" 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" prop="totalPrice" />
-          </el-table>
-        </el-row>
-      </div>
-      <div class="refund-item">
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="5"><b>付供应商总金额：</b> 480.00 </el-col>
-          <el-col :span="6"><b>付采美总金额：</b> 480.00 </el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="5"><b>转账支付：</b> 480.00 </el-col>
-          <el-col :span="6"><b>付款银行：</b> 中信银行0897  </el-col>
-          <el-col :span="6"><b>付款时间：</b> 2023-05-05 11:23:05 </el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="5"><b>申请人：</b> 卢海珠  </el-col>
-          <el-col :span="8"><b>申请时间：</b> 2023-05-05 10:55:33   </el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="5"><b>审核人：</b> 李昕  </el-col>
-          <el-col :span="8"><b>审核时间：</b> 2023-05-05 11:23:05 </el-col>
-        </el-row>
-        <el-row :gutter="24" class="box-row">
-          <el-col :span="24"><b>审核状态：</b> 审核通过 </el-col>
-        </el-row>
-      </div>
-    </el-card>
-    <div class="filter-container" style="text-align: center;margin-top: 20px;">
-      <el-button type="primary">提交付款单</el-button>
-      <el-button plain @click="backToList">返回</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getDetail, getRemarks } from '@/api/order'
-export default {
-  name: 'PaymentDetails',
-  filters: {
-    statusFilter(status) {
-      const map = {
-        0: '待付款',
-        1: '已付款',
-        2: '审核不通过'
-      }
-      return map[status]
-    }
-  },
-  data() {
-    return {
-      printObj: {
-        id: 'printBox', // 局部打印的<div> Id
-        popTitle: '', // 打印配置页上方标题
-        extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
-        preview: '', // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
-        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
-        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
-        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
-        previewBeforeOpenCallback() {}, // 预览窗口打开之前的callback（开启预览模式调用）
-        previewOpenCallback() {}, // 预览窗口打开之后的callback（开启预览模式调用）
-        beforeEntryIframe() {
-          const cells = document.querySelectorAll('.cell')
-          const tableNode = document.querySelectorAll('.el-table__header,.el-table__body')
-          // el-table 打印不全的问题
-          for (let j = 0; j < tableNode.length; j++) {
-            const tableItem = tableNode[j]
-            tableItem.style.width = '100%'
-            const child = tableItem.childNodes
-            for (let i = 0; i < child.length; i++) {
-              const element = child[i]
-              if (element.localName === 'colgroup') {
-                element.innerHTML = ''
-              }
-            }
-          }
-          // el-table 格子里面打印超过格子的问题
-          for (let i = 0; i < cells.length; i++) {
-            const cell = cells[i]
-            cell.style.width = '100%'
-            cell.removeAttribute('style')
-          }
-        },
-        openCallback() {
-
-        }, // 调用打印之后的回调事件
-        closeCallback() {}, // 关闭打印的回调事件（无法确定点击的是确认还是取消）
-        url: '',
-        standard: '',
-        extraCss: '',
-        loading: false
-      },
-      payRepacts: {
-        name: '卢海珠',
-        account: '6214 8328 2826 4957 ',
-        accountBank: '中国建设银行',
-        accountType: '公账'
-      },
-      repacts: [
-        {
-          id: 7580,
-          name: '卢海珠',
-          account: '6214 8328 2826 4957 ',
-          accountBank: '中国建设银行',
-          accountType: '公账',
-          type: '子订单付款',
-          shopName: '采美信息技术有限公司',
-          payableAmount: '20000.00',
-          shopOrderNo: 'P1682650952091471001',
-          shopOrderId: '19747',
-          orderNo: 'P16265095220221471',
-          orderId: '18179',
-          clubName: '广州白云区松洲蒂亚美容院',
-          applyMan: '路海珠',
-          applyTime: '2020-01-01:20:30:56',
-          verifyMan: '李昕',
-          verifyTime: '2020-01-01:20:30:56',
-          status: 0,
-          totalProduct: '3000.00',
-          payShopTotal: '3000.00',
-          childOrderId: ['P16265095220221471', 'P16265095220221471', 'P16265095220221471'],
-          products: [
-            {
-              productName: '阶雪山之恋保滋润面霜吖',
-              unit: '50ml',
-              num: 3,
-              returnNum: 0,
-              price: '2000.00',
-              totalPrice: '6000.00',
-              costPrice: '1000.00',
-              totalCostPrice: '3000.00'
-            },
-            {
-              productName: '阶雪山之恋保滋润面霜吖',
-              unit: '50ml',
-              num: 3,
-              returnNum: 0,
-              price: '2000.00',
-              totalPrice: '6000.00',
-              costPrice: '1000.00',
-              totalCostPrice: '3000.00'
-            },
-            {
-              productName: '阶雪山之恋保滋润面霜吖',
-              unit: '50ml',
-              num: 3,
-              returnNum: 0,
-              price: '2000.00',
-              totalPrice: '6000.00',
-              costPrice: '1000.00',
-              totalCostPrice: '3000.00'
-            },
-            {
-              productName: '阶雪山之恋保滋润面霜吖',
-              unit: '50ml',
-              num: 3,
-              returnNum: 0,
-              price: '2000.00',
-              totalPrice: '6000.00',
-              costPrice: '1000.00',
-              totalCostPrice: '3000.00'
-            }
-          ]
-        }
-      ],
-      activeIndex: '2',
-      order: null,
-      receiptAmount: 0,
-      returnValue: 0,
-      returnedPurchaseFee: 0,
-      bpClauses: null,
-      dialogRemarkList: [],
-      dialogRemarksVisible: false,
-      dialogRemarksOrderId: 0,
-      statusObj: {
-        '0': '待确认',
-        '4': '交易完成',
-        '5': '订单完成',
-        '6': '已关闭',
-        '7': '交易全退',
-        '11': '待收款、待发货',
-        '12': '待收款、部分发货',
-        '13': '待收款、全部发货',
-        '21': '部分收款、待发货',
-        '22': '部分收款、部分发货',
-        '23': '部分收款、全部发货',
-        '31': '全部收款、待发货',
-        '32': '全部收款、部分发货',
-        '33': '全部收款、全部发货'
-      }
-    }
-  },
-  computed: {
-    orderID: function() {
-      return this.$route.query.orderID * 1
-    }
-  },
-  created() {
-    // this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.listLoading = true
-      getDetail({ id: this.orderID }).then(response => {
-        this.order = response.data.order
-        this.bpClauses = response.data.bpClauses
-        this.receiptAmount = response.data.receiptAmount
-        this.returnValue = response.data.returnValue
-        this.returnedPurchaseFee = response.data.returnedPurchaseFee
-        this.listLoading = false
-      }).catch(() => {
-        this.listLoading = false
-      })
-    },
-    RemarksOrder: function(id) {
-      getRemarks({ orderID: id }).then(response => {
-        this.dialogRemarkList = response.data
-      })
-      this.dialogRemarksOrderId = id
-      this.dialogRemarksVisible = true
-    },
-    backToList() {
-      this.$store.dispatch('tagsView/delView', this.$route).then(() => {
-        this.$nextTick(() => {
-          this.$router.replace({
-            path: '/finance/payapply-list'
-          })
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .app-title{
-    line-height: 36px;
-    font-size: 26px;
-    font-weight: bold;
-    color: #409EFF;
-    text-align: center;
-  }
-  .box-card{
-    margin-top: 20px;
-    font-size: 14px;
-  }
-  .box-row{
-    padding: 10px 0;
-  }
-  .box-row .dropdown{
-    margin-top: -10px;
-  }
-  .refund-item{
-    padding: 10px 0;
-  }
-  .order-item{
-    background:#f7f7f7;
-    margin-bottom: 20px;
-    padding: 10px 15px;
-    border-radius: 5px;
-  }
-  .product-row{
-    padding: 10px 0;
-    background: #EBEEF5;
-    border-top: 1px dashed #DCDFE6;
-  }
-  .op-item{
-    padding: 5px 0;
-  }
-  .el-span-warning{
-  color: #E6A23C;
-}
-.el-span-success{
-  color: #67C23A;
-}
-.el-span-danger{
-  color: #F56C6C;
-}
-</style>
-

src/views/finance/payment-list.vue

@@ -3,35 +3,35 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>子订单ID:</span>
-        <el-input v-model="listQuery.shopOrderId" style="width:130px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopOrderId" style="width:180px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>子订单编号:</span>
-        <el-input v-model="listQuery.shopOrderNo" style="width:200px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopOrderNo" style="width:180px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单ID:</span>
-        <el-input v-model="listQuery.orderId" style="width:130px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单编号:</span>
-        <el-input v-model="listQuery.orderNo" style="width:200px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderNo" style="width:180px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>付款单ID:</span>
-        <el-input v-model="listQuery.payShopId" style="width:120px;" placeholder="付款单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.payShopId" style="width:180px;" placeholder="付款单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>供应商:</span>
-        <el-input v-model="listQuery.shopName" style="width:200px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopName" style="width:180px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>付款单名称:</span>
-        <el-input v-model="listQuery.name" style="width:200px;" placeholder="付款单名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.name" style="width:180px;" placeholder="付款单名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>付款审核状态:</span>
-        <el-select v-model="listQuery.status" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="待审核" :value="0" />
           <el-option label="审核通过" :value="1" />

src/views/finance/payment-record.vue

@@ -16,7 +16,7 @@
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="6"><b>机构名称：</b> {{ repact.clubName }}</el-col>
-            <el-col :span="4"><b>机构运费：</b> 包邮</el-col>
+            <el-col :span="4"><b>机构运费：</b> <span>{{ repact.postageInfo }}</span></el-col>
             <el-col :span="4"><b>收款状态：</b> {{ repact.status | statusFilter }}</el-col>
             <el-col :span="10"><b>收款金额：</b> {{ repact.payableAmount }}</el-col>
           </el-row>

src/views/finance/paysettle-list.vue

@@ -3,27 +3,27 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>子订单ID:</span>
-        <el-input v-model="listQuery.shopOrderId" style="width:130px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopOrderId" style="width:180px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>子订单编号:</span>
-        <el-input v-model="listQuery.shopOrderNo" style="width:200px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopOrderNo" style="width:180px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单ID:</span>
-        <el-input v-model="listQuery.orderId" style="width:130px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单编号:</span>
-        <el-input v-model="listQuery.orderNo" style="width:200px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderNo" style="width:180px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>供应商:</span>
-        <el-input v-model="listQuery.shopName" style="width:200px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopName" style="width:180px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>机构名称:</span>
-        <el-input v-model="listQuery.clubName" style="width:200px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.clubName" style="width:180px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>下单时间:</span>
@@ -132,10 +132,7 @@
       <el-table-column label="机构" align="center" prop="buyer" />
       <el-table-column label="机构运费" align="center" prop="freight">
         <template slot-scope="{row}">
-          <span v-if="row.freight === 0">包邮</span>
-          <span v-else-if="row.freight === -1">到付</span>
-          <span v-else-if="row.freight === -2">仪器到付-产品包邮</span>
-          <span v-else>{{ row.freight ? row.freight : '0.00' }}</span>
+          <span>{{ row.postageInfo }}</span>
         </template>
       </el-table-column>
       <el-table-column label="供应商" align="center" prop="shopName" />
@@ -156,7 +153,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
-          <el-button type="text" size="mini" @click="handleToRecord(row.id)">退/付款记录</el-button>
+          <el-button type="text" size="mini" @click="handleToRecord(row.orderId)">结算记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -277,8 +274,8 @@ export default {
       }
       return flag
     },
-    handleToRecord(id) {
-      this.$router.push({ path: '/finance/payment-record', query: { id: id }})
+    handleToRecord(orderId) {
+      this.$router.push({ path: '/finance/paysettle-record', query: { orderId: orderId }})
     }
   }
 }

src/views/finance/paysettle-record.vue

@@ -16,7 +16,7 @@
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="6"><b>机构名称：</b> {{ repact.clubName }}</el-col>
-            <el-col :span="4"><b>机构运费：</b> 包邮</el-col>
+            <el-col :span="4"><b>机构运费：</b> {{ repact.postageInfo }}</el-col>
             <el-col :span="4"><b>收款状态：</b> {{ repact.status | statusFilter }}</el-col>
             <el-col :span="10"><b>收款金额：</b> {{ repact.payableAmount }}</el-col>
           </el-row>
@@ -48,7 +48,7 @@
         </div>
         <div class="refund-item">
           <h1 class="refund-item-title">结算记录</h1>
-          <el-table :data="products" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
+          <el-table :data="settleRecord" 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" />
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { getDetail, getRemarks } from '@/api/order'
+import { organizeSettleRecord } from '@/api/finance'
 export default {
   name: 'PaysettleRecord',
   filters: {
@@ -77,217 +77,28 @@ export default {
   },
   data() {
     return {
-      printObj: {
-        id: 'printBox', // 局部打印的<div> Id
-        popTitle: '', // 打印配置页上方标题
-        extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
-        preview: '', // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
-        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
-        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
-        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
-        previewBeforeOpenCallback() {}, // 预览窗口打开之前的callback（开启预览模式调用）
-        previewOpenCallback() {}, // 预览窗口打开之后的callback（开启预览模式调用）
-        beforeEntryIframe() {
-          const cells = document.querySelectorAll('.cell')
-          const tableNode = document.querySelectorAll('.el-table__header,.el-table__body')
-          // el-table 打印不全的问题
-          for (let j = 0; j < tableNode.length; j++) {
-            const tableItem = tableNode[j]
-            tableItem.style.width = '100%'
-            const child = tableItem.childNodes
-            for (let i = 0; i < child.length; i++) {
-              const element = child[i]
-              if (element.localName === 'colgroup') {
-                element.innerHTML = ''
-              }
-            }
-          }
-          // el-table 格子里面打印超过格子的问题
-          for (let i = 0; i < cells.length; i++) {
-            const cell = cells[i]
-            cell.style.width = '100%'
-            cell.removeAttribute('style')
-          }
-        },
-        openCallback() {
-
-        }, // 调用打印之后的回调事件
-        closeCallback() {}, // 关闭打印的回调事件（无法确定点击的是确认还是取消）
-        url: '',
-        standard: '',
-        extraCss: '',
-        loading: false
-      },
-      payRepacts: {
-        name: '卢海珠',
-        account: '6214 8328 2826 4957 ',
-        accountBank: '中国建设银行',
-        accountType: '公账'
-      },
-      repacts: [
-        {
-          id: 7580,
-          name: '卢海珠',
-          account: '6214 8328 2826 4957 ',
-          accountBank: '中国建设银行',
-          accountType: '公账',
-          type: '子订单付款',
-          shopName: '采美信息技术有限公司',
-          payableAmount: '20000.00',
-          shopOrderNo: 'P1682650952091471001',
-          shopOrderId: '19747',
-          orderNo: 'P16265095220221471',
-          orderId: '18179',
-          clubName: '广州白云区松洲蒂亚美容院',
-          applyMan: '路海珠',
-          applyTime: '2020-01-01:20:30:56',
-          verifyMan: '李昕',
-          verifyTime: '2020-01-01:20:30:56',
-          status: 0,
-          totalProduct: '3000.00',
-          payShopTotal: '3000.00',
-          childOrderId: ['P16265095220221471', 'P16265095220221471', 'P16265095220221471'],
-          products: [
-            {
-              productName: '阶雪山之恋保滋润面霜吖',
-              unit: '50ml',
-              num: 3,
-              returnNum: 0,
-              price: '2000.00',
-              totalPrice: '6000.00',
-              costPrice: '1000.00',
-              totalCostPrice: '3000.00'
-            },
-            {
-              productName: '阶雪山之恋保滋润面霜吖',
-              unit: '50ml',
-              num: 3,
-              returnNum: 0,
-              price: '2000.00',
-              totalPrice: '6000.00',
-              costPrice: '1000.00',
-              totalCostPrice: '3000.00'
-            },
-            {
-              productName: '阶雪山之恋保滋润面霜吖',
-              unit: '50ml',
-              num: 3,
-              returnNum: 0,
-              price: '2000.00',
-              totalPrice: '6000.00',
-              costPrice: '1000.00',
-              totalCostPrice: '3000.00'
-            },
-            {
-              productName: '阶雪山之恋保滋润面霜吖',
-              unit: '50ml',
-              num: 3,
-              returnNum: 0,
-              price: '2000.00',
-              totalPrice: '6000.00',
-              costPrice: '1000.00',
-              totalCostPrice: '3000.00'
-            }
-          ]
-        }
-      ],
-      products: [
-        {
-          productName: '阶雪山之恋保滋润面霜吖',
-          unit: '50ml',
-          num: 3,
-          returnNum: 0,
-          price: '2000.00',
-          totalPrice: '6000.00',
-          costPrice: '1000.00',
-          totalCostPrice: '3000.00'
-        },
-        {
-          productName: '阶雪山之恋保滋润面霜吖',
-          unit: '50ml',
-          num: 3,
-          returnNum: 0,
-          price: '2000.00',
-          totalPrice: '6000.00',
-          costPrice: '1000.00',
-          totalCostPrice: '3000.00'
-        },
-        {
-          productName: '阶雪山之恋保滋润面霜吖',
-          unit: '50ml',
-          num: 3,
-          returnNum: 0,
-          price: '2000.00',
-          totalPrice: '6000.00',
-          costPrice: '1000.00',
-          totalCostPrice: '3000.00'
-        },
-        {
-          productName: '阶雪山之恋保滋润面霜吖',
-          unit: '50ml',
-          num: 3,
-          returnNum: 0,
-          price: '2000.00',
-          totalPrice: '6000.00',
-          costPrice: '1000.00',
-          totalCostPrice: '3000.00'
-        }
-      ],
-      activeIndex: '2',
-      order: null,
-      receiptAmount: 0,
-      returnValue: 0,
-      returnedPurchaseFee: 0,
-      bpClauses: null,
-      dialogRemarkList: [],
-      dialogRemarksVisible: false,
-      dialogRemarksOrderId: 0,
-      statusObj: {
-        '0': '待确认',
-        '4': '交易完成',
-        '5': '订单完成',
-        '6': '已关闭',
-        '7': '交易全退',
-        '11': '待收款、待发货',
-        '12': '待收款、部分发货',
-        '13': '待收款、全部发货',
-        '21': '部分收款、待发货',
-        '22': '部分收款、部分发货',
-        '23': '部分收款、全部发货',
-        '31': '全部收款、待发货',
-        '32': '全部收款、部分发货',
-        '33': '全部收款、全部发货'
-      }
+      repacts: {},
+      products: [],
+      settleRecord: []
     }
   },
   computed: {
-    orderID: function() {
-      return this.$route.query.orderID * 1
+    orderId: function() {
+      return this.$route.query.orderId * 1
     }
   },
   created() {
-    // this.fetchData()
+    this.organizeSettleRecord()
   },
   methods: {
-    fetchData() {
-      this.listLoading = true
-      getDetail({ id: this.orderID }).then(response => {
-        this.order = response.data.order
-        this.bpClauses = response.data.bpClauses
-        this.receiptAmount = response.data.receiptAmount
-        this.returnValue = response.data.returnValue
-        this.returnedPurchaseFee = response.data.returnedPurchaseFee
-        this.listLoading = false
-      }).catch(() => {
-        this.listLoading = false
-      })
-    },
-    RemarksOrder: function(id) {
-      getRemarks({ orderID: id }).then(response => {
-        this.dialogRemarkList = response.data
-      })
-      this.dialogRemarksOrderId = id
-      this.dialogRemarksVisible = true
+    async organizeSettleRecord() {
+      try {
+        const res = await organizeSettleRecord(this.orderId)
+        this.repacts = res.data.repacts
+        this.settleRecord = res.data.settleRecord
+      } catch (error) {
+        console.log('error', error)
+      }
     },
     backToList() {
       this.$store.dispatch('tagsView/delView', this.$route).then(() => {

src/views/floor/components/good-multi-dialog.vue

@@ -105,7 +105,8 @@ export default {
     async getList() {
       this.isLoading = true
       const res = await getList(this.listQuery)
-      this.list = res.data.results
+      const data = res.data.results
+      this.list = data.map(item => { item.sort = 0; return item })
       this.total = res.data.totalRecord
       this.isLoading = false
     },
@@ -116,7 +117,6 @@ export default {
     },
     handleAddProConfirm() {
       // 确认选择商品
-      this.productRadio = this.productRadio.map(item => { item.sort = 0; return item })
       this.$emit('confirm', this.productRadio)
     },
     handleCanle() {

src/views/goods/list.vue

@@ -3,15 +3,15 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>商品名称:</span>
-        <el-input v-model="listQuery.productName" style="width:130px;" placeholder="商品名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.productName" style="width:180px;" placeholder="商品名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>供应商名称:</span>
-        <el-input v-model="listQuery.shopName" style="width:130px;" placeholder="供应商名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.shopName" style="width:180px;" placeholder="供应商名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>商品状态:</span>
-        <el-select v-model="listQuery.validFlag" placeholder="商品状态" clearable style="width: 110px" value="" @change="getList">
+        <el-select v-model="listQuery.validFlag" placeholder="商品状态" clearable style="width: 180px" value="" @change="getList">
           <el-option label="所有" value="" />
           <el-option label="已上架" value="1" />
           <el-option label="已下架" value="2" />

src/views/order/detail.vue

@@ -4,17 +4,17 @@
       <div class="app-title">订单详情</div>
       <el-button type="primary" icon="el-icon-back" style="float: right;" @click="backToList">返回</el-button>
     </div>
-    <el-card v-if="order" class="box-card">
+    <el-card v-if="listLoading" class="box-card">
       <div class="refund-item">
         <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>下单时间：</b> {{ order.orderTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</el-col>
+          <el-col :span="6"><b>下单时间：</b> {{ order.orderTime }}</el-col>
           <el-col :span="6"><b>订单编号(ID)：</b> {{ order.orderNo + '(' + order.orderId + ')' }}</el-col>
           <el-col :span="6"><b>订单状态：</b>
             <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
-              <el-tag type="success" size="small">{{ '交易中('+statusObj[order.status]+')' }}</el-tag>
+              <el-tag type="success" size="small">交易中({{ order.status | orderStatusFilter }})</el-tag>
             </template>
             <template v-else>
-              <el-tag :type="order.status*1===6?'info':''" size="small">{{ statusObj[order.status] }}</el-tag>
+              <el-tag :type="order.status*1===6?'info':''" size="small">{{ order.status | orderStatusFilter }}</el-tag>
             </template>
           </el-col>
           <el-col :span="6">
@@ -29,10 +29,10 @@
                 <el-dropdown-item v-if="order.checkFlag === 1">
                   <div @click="handeleDialogFormVisible"> 更改收款状态</div>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="['13','33'].indexOf(order.status)<0">
+                <el-dropdown-item v-if="['11','12','21','22','31','32'].indexOf(order.status) !== -1">
                   <div @click="handeleDropdown(1,order.orderId)">发货</div>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="['4','5','12', '22', '23', '32', '33'].indexOf(order.status)<0">
+                <el-dropdown-item v-if="['4','5','12','13', '22', '23', '32', '33'].indexOf(order.status) !== -1">
                   <div @click="handeleDropdown(2,order.orderId)">发货记录</div>
                 </el-dropdown-item>
                 <el-dropdown-item>
@@ -91,10 +91,7 @@
           <el-col :span="6"><b>退款金额(已完成)：</b> ¥{{ returnValue | toThousandFloatFilter }}
           </el-col>
           <el-col :span="6"><b>运费：</b>
-            <template v-if="order.freight*1===0">包邮</template>
-            <template v-else-if="order.freight*1===-1">到付</template>
-            <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
-            <template v-else>¥{{ order.freight }}</template>
+            <span>{{ order.postageInfo }}</span>
           </el-col>
         </el-row>
       </div>
@@ -159,33 +156,67 @@
           </el-row>
         </div>
       </div>
-    </el-card>
-    <el-dialog title="更改收款状态" :visible.sync="dialogFormVisible" width="600px">
-      <el-form ref="dataForm" :rules="rules" :model="chengeOrder" label-position="right" label-width="150px">
-        <el-row :gutter="24" class="box-row" style="margin-bottom: 40px;">
-          <el-col :span="8"><b>应收金额：</b> ￥{{ order.payableAmount | amountfilters }}</el-col>
-          <el-col :span="8"><b>已收金额：</b>￥{{ receiptAmount | amountfilters }}</el-col>
-          <el-col :span="8"><b>未收金额：</b> ￥{{ (order.payableAmount - receiptAmount) | amountfilters }}</el-col>
+      <div class="refund-item">
+        <template v-if="order.invoiceFlag === '0'">
+          <el-row :gutter="24" class="box-row">
+            <el-col :span="6"><b>发票信息：</b>不需要发票</el-col>
+          </el-row>
+        </template>
+        <template v-else>
+          <el-row :gutter="24" class="box-row">
+            <el-col :span="6"><b>发票信息：</b> {{ orderInvoice.type | invoiceFilters }}</el-col>
+          </el-row>
+          <el-row :gutter="24" class="box-row">
+            <el-col :span="6"><b>单位名称：</b> {{ orderInvoice.invoiceTitle }}</el-col>
+            <el-col :span="6"><b>纳税人识别号：</b> {{ orderInvoice.corporationTaxNum }}</el-col>
+            <el-col :span="8"><b>注册地址：</b> {{ orderInvoice.registeredAddress }}</el-col>
+          </el-row>
+          <el-row :gutter="24" class="box-row">
+            <el-col :span="6"><b>注册电话：</b> {{ orderInvoice.registeredPhone }}</el-col>
+            <el-col :span="6"><b>开户银行：</b> {{ orderInvoice.openBank }}</el-col>
+            <el-col :span="8"><b>银行账号：</b> {{ orderInvoice.bankAccountNo }}</el-col>
+          </el-row>
+        </template>
+      </div>
+      <div class="refund-item">
+        <h1 style="font-size: 14px;color: #409EFF;">线下支付凭证：</h1>
+        <el-row v-for="(vouch,index) in voucher" :key="index" style="padding:5px 0">
+          <p class="refund-item-p">{{ vouch.addTime }}</p>
+          <div class="refund-item-imgs">
+            <div v-for="(imgage,imgIndex) in vouch.images" :key="imgIndex" class="item-image">
+              <img :src="imgage" alt="">
+            </div>
+          </div>
+          <p class="refund-item-p">备注：{{ vouch.remarks }}</p>
         </el-row>
-        <el-form-item label="订单本次收款金额:" prop="auditStatus">
-          <el-input v-model="chengeOrder.amount" style="width: 200px">
-            <template slot="prepend">￥</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="修改订单收款状态:" prop="sataus">
-          <el-select v-model="chengeOrder.status" placeholder="请选择">
-            <el-option label="请选择" value="" />
-            <el-option label="部分收款" :value="2" />
-            <el-option label="已收款" :value="3" />
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取消</el-button>
-        <el-button type="primary" @click="handleChangOrder">确定</el-button>
       </div>
-    </el-dialog>
-    <Remarks dialog-title="订单备注信息" :is-visible.sync="dialogRemarksVisible" :order-id="dialogRemarksorderId" :remark-list="dialogRemarkList" />
+      <el-dialog title="更改收款状态" :visible.sync="dialogFormVisible" width="600px">
+        <el-form ref="dataForm" :rules="rules" :model="chengeOrder" label-position="right" label-width="150px">
+          <el-row :gutter="24" class="box-row" style="margin-bottom: 40px;">
+            <el-col :span="8"><b>应收金额：</b> ￥{{ order.payableAmount | amountfilters }}</el-col>
+            <el-col :span="8"><b>已收金额：</b>￥{{ receiptAmount | amountfilters }}</el-col>
+            <el-col :span="8"><b>未收金额：</b> ￥{{ (order.payableAmount - receiptAmount) | amountfilters }}</el-col>
+          </el-row>
+          <el-form-item label="订单本次收款金额:" prop="auditStatus">
+            <el-input v-model="chengeOrder.amount" style="width: 200px">
+              <template slot="prepend">￥</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="修改订单收款状态:" prop="sataus">
+            <el-select v-model="chengeOrder.status" placeholder="请选择">
+              <el-option label="请选择" value="" />
+              <el-option label="部分收款" :value="2" />
+              <el-option label="已收款" :value="3" />
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">取消</el-button>
+          <el-button type="primary" @click="handleChangOrder">确定</el-button>
+        </div>
+      </el-dialog>
+      <Remarks dialog-title="订单备注信息" :is-visible.sync="dialogRemarksVisible" :order-id="dialogRemarksorderId" :remark-list="dialogRemarkList" />
+    </el-card>
   </div>
 </template>
 
@@ -194,6 +225,16 @@ import { getDetail, getRemarks, orderCheckReceipt } from '@/api/order'
 import Remarks from './components/remarks'
 export default {
   components: { Remarks },
+  filters: {
+    invoiceFilters(value) {
+      const map = {
+        0: '不开发票',
+        1: '普通发票',
+        2: '增值税发票'
+      }
+      return map[value]
+    }
+  },
   data() {
     return {
       activeIndex: '2',
@@ -206,32 +247,19 @@ export default {
       dialogRemarksVisible: false,
       dialogRemarksorderId: 0,
       dialogFormVisible: false,
-      statusObj: {
-        '0': '待确认',
-        '4': '交易完成',
-        '5': '订单完成',
-        '6': '已关闭',
-        '7': '交易全退',
-        '11': '待收款、待发货',
-        '12': '待收款、部分发货',
-        '13': '待收款、全部发货',
-        '21': '部分收款、待发货',
-        '22': '部分收款、部分发货',
-        '23': '部分收款、全部发货',
-        '31': '全部收款、待发货',
-        '32': '全部收款、部分发货',
-        '33': '全部收款、全部发货'
-      },
       chengeOrder: {
         orderId: this.$route.query.id * 1,
         amount: '',
         status: ''// 2部分收款 3已收款
       },
+      orderInvoice: {},
+      voucher: [],
       rules: {
         sataus: [{ required: true, message: '请选择机构类型', trigger: 'blur' }],
         account: [{ required: true, message: '请选择审核状态', trigger: 'blur' }],
         auditNote: [{ required: true, message: '请填写原因', trigger: 'blur' }]
-      }
+      },
+      listLoading: false
     }
   },
   computed: {
@@ -244,16 +272,17 @@ export default {
   },
   methods: {
     fetchData() {
-      this.listLoading = true
       getDetail({ id: this.orderId }).then(response => {
         this.order = response.data.order
         this.bpClauses = response.data.bpClauses
         this.receiptAmount = response.data.receiptAmount
         this.returnValue = response.data.returnValue
         this.returnedPurchaseFee = response.data.returnedPurchaseFee
-        this.listLoading = false
+        this.orderInvoice = this.order.orderInvoice
+        this.voucher = response.data.voucher
+        this.listLoading = true
       }).catch(() => {
-        this.listLoading = false
+        this.listLoading = true
       })
     },
     RemarksOrder: function(id) {
@@ -328,6 +357,30 @@ export default {
     padding: 10px 0;
     border-bottom:1px dashed #E4E7ED;
   }
+  .refund-item-p{
+    width: 100%;
+    line-height: 18px;
+    font-size: 14px;
+    color: #666666;
+    float: left;
+  }
+  .refund-item-imgs{
+    width: 100%;
+    height: auto;
+    margin: 5px 0;
+  }
+  .refund-item-imgs .item-image{
+    width: 148px;
+    height: 148px;
+    margin-right: 10px;
+    border: 1px dashed #E1E1E1;
+    float: left;
+  }
+  .refund-item-imgs .item-image img{
+    width: 148px;
+    height: 148px;
+    display: block;
+  }
   .order-item{
     background:#f7f7f7;
     margin-bottom: 20px;

src/views/order/list.vue

@@ -3,7 +3,7 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>订单ID:</span>
-        <el-input v-model="listQuery.orderId" style="width:130px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单号:</span>
@@ -11,19 +11,19 @@
       </div>
       <div class="filter-control">
         <span>机构名称:</span>
-        <el-input v-model="listQuery.buyer" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.buyer" style="width:180px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>收货人:</span>
-        <el-input v-model="listQuery.receiver" style="width:120px;" placeholder="收货人" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.receiver" style="width:180px;" placeholder="收货人" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>商品名称:</span>
-        <el-input v-model="listQuery.receiver" placeholder="商品名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.receiver" style="width:180px;" placeholder="商品名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单状态:</span>
-        <el-select v-model="listQuery.status" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="待确认" value="0" />
           <el-option label="交易中" value="99" />
@@ -35,7 +35,7 @@
       </div>
       <div class="filter-control">
         <span>收款状态:</span>
-        <el-select v-model="listQuery.receiptStatus" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.receiptStatus" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="待收款" value="1" />
           <el-option label="部分收款" value="2" />
@@ -44,7 +44,7 @@
       </div>
       <div class="filter-control">
         <span>发货状态:</span>
-        <el-select v-model="listQuery.sendOutStatus" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.sendOutStatus" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="待发货" value="1" />
           <el-option label="部分发货" value="2" />
@@ -53,7 +53,7 @@
       </div>
       <div class="filter-control">
         <span>付款状态:</span>
-        <el-select v-model="listQuery.sendOutStatus" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.payStatus" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="待付款" value="1" />
           <el-option label="部分付款" value="2" />
@@ -62,7 +62,7 @@
       </div>
       <div class="filter-control">
         <span>退款状态:</span>
-        <el-select v-model="listQuery.refundType" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.refundType" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="无退款" value="0" />
           <el-option label="部分退款" value="1" />
@@ -71,20 +71,12 @@
       </div>
       <div class="filter-control">
         <span>待审核退款:</span>
-        <el-select v-model="listQuery.returnedPurchaseStatus" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.returnedPurchaseStatus" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="有" value="1" />
           <el-option label="无" value="0" />
         </el-select>
       </div>
-      <div class="filter-control">
-        <span>待审核退款:</span>
-        <el-select v-model="listQuery.returnedPurchaseStatus" style="width:120px;" clearable @change="getList">
-          <el-option value="" label="所有" />
-          <el-option label="协销订单" value="1" />
-          <el-option label="自主订单" value="0" />
-        </el-select>
-      </div>
       <div class="filter-control">
         <span>下单时间:</span>
         <el-date-picker

src/views/order/refund-detail.vue

@@ -57,10 +57,7 @@
             <el-col :span="7"><b>订单金额：</b> {{ orderData.payTotalFee }}</el-col>
             <el-col :span="6"><b>应收金额：</b> {{ orderData.payableAmount }}</el-col>
             <el-col :span="4"><b>机构运费：</b>
-              <span v-if="orderData.freight*1===0">包邮</span>
-              <span v-else-if="orderData.freight*1===-1">到付</span>
-              <span v-else-if="orderData.freight*1===-2">仪器到付-产品包邮</span>
-              <span v-else>¥{{ orderData.freight }}</span>
+              <span>{{ orderData.postageInfo }}</span>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">

src/views/order/refund-record.vue

@@ -50,10 +50,7 @@
         <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
         <el-col :span="6"><b>应收总额:</b> ¥{{ order.payableAmount | toThousandFloatFilter }}</el-col>
         <el-col :span="6"><b>运费:</b>
-          <template v-if="order.freight*1===0">包邮</template>
-          <template v-else-if="order.freight*1===-1">到付</template>
-          <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
-          <template v-else>¥{{ order.freight }}</template>
+          <span>{{ order.postageInfo }}</span>
         </el-col>
       </el-row>
       <el-row :gutter="24" class="box-row">

src/views/order/refund-return.vue

@@ -123,10 +123,7 @@
               <el-col :span="6"><b>应收总额:</b>¥{{ order.payableAmount | toThousandFloatFilter }}</el-col>
               <el-col :span="6"><b>经理折扣:</b>¥{{ order.discountFee | toThousandFloatFilter }}</el-col>
               <el-col :span="6"><b>运费:</b>
-                <template v-if="order.freight*1===0">包邮</template>
-                <template v-else-if="order.freight*1===-1">到付</template>
-                <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
-                <template v-else>¥{{ order.freight | toThousandFloatFilter }}</template>
+                <span>{{ order.postageInfo }}</span>
               </el-col>
             </el-row>
             <el-row :gutter="24" class="box-row">

src/views/order/refund.vue

@@ -3,23 +3,23 @@
     <div class="filter-container">
       <div class="filter-control">
         <span>退款编号:</span>
-        <el-input v-model="listQuery.returnedNo" style="width:130px;" placeholder="退款编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.returnedNo" style="width:180px;" placeholder="退款编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单ID:</span>
-        <el-input v-model="listQuery.orderID" style="width:130px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderID" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>订单编号:</span>
-        <el-input v-model="listQuery.orderNo" style="width:130px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderNo" style="width:180px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>机构名称:</span>
-        <el-input v-model="listQuery.orderID" style="width:130px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
+        <el-input v-model="listQuery.orderID" style="width:180px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
       </div>
       <div class="filter-control">
         <span>退款审核状态:</span>
-        <el-select v-model="listQuery.status" style="width:120px;" clearable @change="getList">
+        <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">
           <el-option value="" label="所有" />
           <el-option label="待审核" value="1" />
           <el-option label="审核通过" value="2" />