订单

src/router/modules/order.js

@@ -49,6 +49,20 @@ const orderRouter = {
       meta: { title: '添加物流', noCache: true, activeMenu: '/order/addLogistics' },
       hidden: true
     },
+    {
+      path: 'order-remarks',
+      name: 'OrderRemarks',
+      component: () => import('@/views/order/order-remarks'),
+      meta: { title: '订单备注', noCache: true, activeMenu: '/order/order-remarks' },
+      hidden: true
+    },
+    {
+      path: 'add-remarks ',
+      name: 'AddRemarks ',
+      component: () => import('@/views/order/add-remarks '),
+      meta: { title: '订单备注', noCache: true, activeMenu: '/order/add-remarks ' },
+      hidden: true
+    },
     {
       path: 'detail',
       name: 'Detail',

src/utils/request.js

@@ -52,24 +52,23 @@ service.interceptors.response.use(
         type: 'error',
         duration: 5 * 1000
       })
-
       // 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(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-          })
-        })
-      }
+      // 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(() => {
+      //     store.dispatch('user/resetToken').then(() => {
+      //       location.reload()
+      //     })
+      //   })
+      // }
       return Promise.reject(new Error(res.msg || 'Error'))
     }
     if (res.code === -99) {

src/views/finance/details.vue

@@ -10,7 +10,7 @@
         <el-row :gutter="24" class="box-row">
           <el-col :span="4"><b>收款ID：</b> {{ repacts.receiptId }}</el-col>
           <el-col :span="4"><b>收款类型：</b> {{ repacts.bankNameType }}</el-col>
-          <el-col :span="4"><b>收款金额：</b> {{ repacts.receiptAmount }}</el-col>
+          <el-col :span="4"><b>收款金额：</b> ¥{{ repacts.receiptAmount }}</el-col>
           <el-col :span="4"><b>收款时间：</b> {{ repacts.receiptDate }}</el-col>
           <el-col :span="4"><b>收款状态：</b>
             <span
@@ -34,9 +34,9 @@
         <div v-for="order in repacts.orderInfos" :key="order.orderId">
           <el-row :gutter="22" class="box-row">
             <el-col :span="5"><b>订单编号：</b> {{ order.orderNo + '(' + order.orderId + ')' }}</el-col>
-            <el-col :span="5"><b>订单金额：</b> {{ order.orderAmount | amountfilters }}</el-col>
-            <el-col :span="4"><b>应收金额：</b> {{ order.payableAmount | amountfilters }}</el-col>
-            <el-col :span="4"><b>已收金额：</b> {{ order.receiptAmount | amountfilters }}</el-col>
+            <el-col :span="5"><b>订单金额：</b> ¥{{ order.orderAmount | amountfilters }}</el-col>
+            <el-col :span="4"><b>应收金额：</b> ¥{{ order.payableAmount | amountfilters }}</el-col>
+            <el-col :span="4"><b>已收金额：</b> ¥{{ order.receiptAmount | amountfilters }}</el-col>
             <el-col :span="4"><b>订单状态：</b> {{ order.receiptStatus | orderReceiptStatus }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">

src/views/finance/payapply-edit.vue

@@ -72,7 +72,7 @@
           <el-row :gutter="24" class="box-row">
             <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="4"><b>订单金额：</b> <span class="el-span-danger">¥{{ shopOrder.payTotalFee }}</span></el-col>
             <el-col :span="10">
               <b>所有子订单：</b>
               <span v-for="child in shopOrder.shopOrderNos" :key="child">
@@ -93,15 +93,15 @@
             </el-col>
             <el-col :span="10">
               <b>收款金额：</b>
-              <span class="el-span-danger">{{ shopOrder.receiptTotalFee | amountfilters }}</span>
+              <span class="el-span-danger">¥{{ shopOrder.receiptTotalFee | amountfilters }}</span>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
             <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>
+              <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="4"><b>商品费：</b> ¥{{ shopOrder.productAmount | amountfilters }}</el-col>
             <el-col :span="10">
               <b>付款状态：</b>
               <el-tag v-if="shopOrder.payStatus===1" type="danger" size="small">待付款</el-tag>
@@ -119,15 +119,15 @@
             <el-col :span="24">
               <b>付供应商：</b>
               <b style="margin-left: 10px;">应付采美：</b>
-              <span class="el-span-danger"> {{ shopOrder.shouldPayCmAmount | amountfilters }}  </span>
+              <span class="el-span-danger"> ¥{{ shopOrder.shouldPayCmAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">已付采美：</b>
-              <span class="el-span-danger"> {{ shopOrder.payCmAmount | amountfilters }}  </span>
+              <span class="el-span-danger"> ¥{{ shopOrder.payCmAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">待付采美：</b>
               <el-input v-model="shopOrder.waitPayCmAmount" style="width: 100px;" size="mini" />
               <b style="margin-left: 10px;">应付供应商：</b>
-              <span class="el-span-danger"> {{ shopOrder.shouldPayShopAmount | amountfilters }}  </span>
+              <span class="el-span-danger"> ¥{{ shopOrder.shouldPayShopAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">已付供应商：</b>
-              <span class="el-span-danger"> {{ shopOrder.payedShopAmount | amountfilters }}  </span>
+              <span class="el-span-danger"> ¥{{ shopOrder.payedShopAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">待付供应商：</b>
               <el-input v-model="shopOrder.waitPayShop" style="width: 100px;" size="mini" />
             </el-col>
@@ -158,10 +158,10 @@
         <div class="refund-item">
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>付供应商总金额：</b>
-              <span class="el-span-danger"> {{ totalShopTotalAmount | amountfilters }} </span>
+              <span class="el-span-danger"> ¥{{ totalShopTotalAmount | amountfilters }} </span>
             </el-col>
             <el-col :span="6"><b>付采美总金额：</b>
-              <span class="el-span-danger"> {{ totalCmTotalAmount | amountfilters }}  </span>
+              <span class="el-span-danger"> ¥{{ totalCmTotalAmount | amountfilters }}  </span>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">

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

@@ -44,13 +44,13 @@
               {{ dataOrder.order.address }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>订单金额：</b> {{ dataOrder.order.payTotalFee | amountfilters }}</el-col>
-            <el-col :span="4"><b>应收金额：</b> {{ dataOrder.order.payableAmount | amountfilters }}</el-col>
+            <el-col :span="5"><b>订单金额：</b> ¥{{ dataOrder.order.payTotalFee | amountfilters }}</el-col>
+            <el-col :span="4"><b>应收金额：</b> ¥{{ dataOrder.order.payableAmount | amountfilters }}</el-col>
             <el-col :span="4">
               <b>运费：</b>
               <span>{{ dataOrder.order.postageInfo }}</span>
             </el-col>
-            <el-col :span="4"><b>退款金额：</b> {{ dataOrder.order.returnValue | amountfilters }}</el-col>
+            <el-col :span="4"><b>退款金额：</b> ¥{{ dataOrder.order.returnValue | amountfilters }}</el-col>
           </el-row>
           <h1 class="refund-item-title">收款记录</h1>
           <el-table :data="dataOrder.receiptList" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">

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

@@ -7,21 +7,21 @@
             <el-col :span="5"><b>订单编号(ID)：</b> {{ repacts.orderNo }}({{ repacts.orderId }})</el-col>
             <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> ¥{{ repacts.payableAmount }}</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">
-            <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> {{ repacts.payableAmount }}</el-col>
-            <el-col :span="4"><b>已付金额：</b> {{ repacts.payableAmount }}</el-col>
+            <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> ¥{{ repacts.payableAmount }}</el-col>
+            <el-col :span="4"><b>已付金额：</b> ¥{{ repacts.payableAmount }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>收款状态：</b> {{ repacts.status | statusFilter }}</el-col>
             <el-col :span="4"><b>付款状态：</b> {{ repacts.status | statusFilter }}</el-col>
             <el-col :span="4"><b>退款状态：</b> {{ repacts.status | statusFilter }}</el-col>
-            <el-col :span="4"><b>退款金额：</b> {{ repacts.payableAmount }}</el-col>
+            <el-col :span="4"><b>退款金额：</b> ¥{{ repacts.payableAmount }}</el-col>
           </el-row>
           <el-table :data="repacts.shopOrderIdList" border fit highlight-current-row default-expand-all :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
             <el-table-column label="商品信息" type="expand" width="80px">

src/views/finance/payment-details.vue

@@ -85,7 +85,7 @@
           <el-row :gutter="24" class="box-row">
             <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="4"><b>订单金额：</b> <span class="el-span-danger">¥{{ shopOrder.payTotalFee }}</span></el-col>
             <el-col :span="10">
               <b>所有子订单：</b>
               <span v-for="child in shopOrder.shopOrderNos" :key="child">
@@ -110,7 +110,7 @@
             </el-col>
             <el-col :span="10">
               <b>收款金额：</b>
-              <span class="el-span-danger">{{ shopOrder.receiptTotalFee | amountfilters }}</span>
+              <span class="el-span-danger">¥{{ shopOrder.receiptTotalFee | amountfilters }}</span>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
@@ -128,24 +128,24 @@
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>供应商名称：</b> {{ shopOrder.shopName }}</el-col>
             <el-col :span="5"><b>供应商运费：</b>
-              <span>{{ shopOrder.shopPostFee | amountfilters }}</span>
+              <span>¥{{ shopOrder.shopPostFee | amountfilters }}</span>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="24">
               <b>付供应商：</b>
               <b style="margin-left: 10px;">应付采美：</b>
-              <span class="el-span-danger"> {{ shopOrder.shouldPayCmAmount | amountfilters }}  </span>
-              <b style="margin-left: 10px;">已付采美：</b>
+              <span class="el-span-danger"> ¥{{ shopOrder.shouldPayCmAmount | amountfilters }}  </span>
+              <b style="margin-left: 10px;">¥已付采美：</b>
               <span class="el-span-danger"> {{ shopOrder.payCmAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">待付采美：</b>
-              <span class="el-span-danger"> {{ shopOrder.waitPayCmAmount | amountfilters }}  </span>
+              <span class="el-span-danger"> ¥{{ shopOrder.waitPayCmAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">应付供应商：</b>
-              <span class="el-span-danger"> {{ shopOrder.shouldPayShopAmount | amountfilters }}  </span>
+              <span class="el-span-danger"> ¥{{ shopOrder.shouldPayShopAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">已付供应商：</b>
-              <span class="el-span-danger"> {{ shopOrder.payedShopAmount | amountfilters }}  </span>
+              <span class="el-span-danger"> ¥{{ shopOrder.payedShopAmount | amountfilters }}  </span>
               <b style="margin-left: 10px;">待付供应商：</b>
-              <span class="el-span-danger"> {{ shopOrder.waitPayShop | amountfilters }}  </span>
+              <span class="el-span-danger"> ¥{{ shopOrder.waitPayShop | amountfilters }}  </span>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">

src/views/finance/payment-record.vue

@@ -8,7 +8,7 @@
             <el-col :span="5"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
             <el-col :span="4">
               <b>订单金额：</b>
-              <span class="el-span-danger">{{ shopOrder.payTotalFee | amountfilters }}</span>
+              <span class="el-span-danger">¥{{ shopOrder.payTotalFee | amountfilters }}</span>
             </el-col></el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>机构名称：</b> {{ shopOrder.clubName }}</el-col>
@@ -21,11 +21,11 @@
             </el-col>
             <el-col :span="10">
               <b>收款金额：</b>
-              <span class="el-span-danger">{{ shopOrder.payableAmount | amountfilters }}</span>
+              <span class="el-span-danger">¥{{ shopOrder.payableAmount | amountfilters }}</span>
             </el-col></el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="5"><b>子订单编号(ID)</b> {{ shopOrder.shopOrderNo }}({{ shopOrder.shopOrderId }})</el-col>
-            <el-col :span="5"><b>商品费：</b> {{ shopOrder.payableAmount | amountfilters }}</el-col>
+            <el-col :span="5"><b>商品费：</b> ¥{{ shopOrder.payableAmount | amountfilters }}</el-col>
             <el-col :span="10">
               <b>付款状态：</b>
               <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>

src/views/order/add-remarks .vue

@@ -0,0 +1,330 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card" style="margin: 0 auto;">
+      <div class="refund-item" />
+    </el-card>
+    <el-card class="box-card" style="margin: 10px auto;">
+      <div class="refund-item">
+        <el-form ref="logisticFrom" :model="params" :rules="rules" label-width="120px">
+          <el-row v-for="(logistic,index) in params.transportations" :key="index" :gutter="24" class="box-row">
+            <el-col :span="8">
+              <el-form-item label="快递公司：" :prop="`transportations.${index}.logisticsCompanyName`" :rules="rules.logisticsCompanyName">
+                <el-select v-model="logistic.logisticsCompanyName" style="width:250px;" clearable size="mini" @change="hanldeCompny($event,index)">
+                  <el-option value="" label="请选择物流公司" />
+                  <el-option v-for="item in kuaiduLisrt" :key="item.id" :label="item.label" :value="item" />
+                </el-select>
+                <el-button v-if="index === 0" type="primary" icon="el-icon-plus" size="mini" style="margin-left: 10px;" @click="hanldeAddlogis(logistic,index)" />
+                <el-button v-if="(index+1) > 1" type="danger" icon="el-icon-minus" size="mini" style="margin-left: 10px;" @click="handeleDelete(index)" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div v-for="(sticsNu,numIndex) in logistic.logisticsNu" :key="numIndex">
+                <el-form-item label="物流编号：" :prop="`transportations.${index}.logisticsNu.${numIndex}.num`" :rules="rules.num">
+                  <el-input :key="numIndex" v-model="sticsNu.num" placeholder="请输入物流单号" style="width: 250px" size="mini" />
+                  <el-button v-if="numIndex === 0" type="primary" icon="el-icon-plus" size="mini" style="margin-left: 10px;" @click="hanldeAddNumber(logistic,numIndex)" />
+                  <el-button v-if="(numIndex+1) > 1" type="danger" icon="el-icon-minus" size="mini" style="margin-left: 10px;" @click="handeleDeleteNumber(logistic,numIndex)" />
+                </el-form-item>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="box-row">
+            <el-form-item label="图片备注:" prop="logImage">
+              <div class="form-el-upload" style="width: 148px;height: 148px;">
+                <el-upload
+                  class="avatar-uploader"
+                  :action="actionUrl"
+                  :headers="getToken"
+                  list-type="picture-card"
+                  :on-remove="handleRemove"
+                  :on-success="handleSuccess"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <p style="margin: 0;line-height: 20px;font-size: 14px;color: red;">注意：请上传jpg / png格式的图片，最大不超过5M，最多可上传10张</p>
+              </div>
+            </el-form-item>
+            <el-form-item label="备注：" prop="name">
+              <el-input v-model="params.remark" type="textarea" show-word-limit placeholder="请输入备注文字，200字以内" maxlength="200" :autosize="{ minRows: 5, maxRows: 6}" style="width: 600px;" />
+            </el-form-item>
+          </el-row>
+        </el-form>
+      </div>
+    </el-card>
+    <div class="filter-container" style="text-align: right;margin-top: 20px;">
+      <el-button plain @click="backToList">取消</el-button>
+      <el-button type="primary" :disabled="disabled" @click="hanldeConfirm('logisticFrom')">确认发货</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { confirmDeliver, deliverShipCompany } from '@/api/order'
+const defaultForm = () => {
+  return {
+    logisticsCompanyCode: '',
+    logisticsCompanyName: '',
+    logisticsNu: [
+      { num: '' }
+    ]
+  }
+}
+export default {
+  name: 'AddRemarks',
+  filters: {
+  },
+  data() {
+    return {
+      params: {
+        images: [], // 发货图片备注
+        orderProducts: [],
+        remark: '',
+        transportations: [
+          {
+            logisticsCompanyCode: '',
+            logisticsCompanyName: '',
+            logisticsNu: [
+              { num: '' }
+            ]
+          }
+        ]
+      },
+      islogisticsCompany: false,
+      islogisticsNumber: false,
+      productList: [],
+      kuaiduLisrt: [],
+      fileImageList: [], // 上传图片列表
+      rules: {
+        logisticsCompanyName: [{ required: true, message: '请选择物流公司', trigger: 'blur' }],
+        num: [{ required: true, message: '请输入物流单号', trigger: 'blur' }]
+      }
+    }
+  },
+  computed: {
+    getToken() {
+      return {
+        'token': this.$store.getters.token
+      }
+    },
+    actionUrl() {
+      return process.env.VUE_APP_BASE_API + '/formData/MultiPictareaddData'
+    },
+    orderId: function() {
+      return this.$route.query.orderId * 1
+    },
+    disabled() {
+      return this.params.transportations[0] === ''
+    }
+  },
+  created() {
+    if (this.$route.query.products) {
+      this.params.orderProducts = JSON.parse(this.$route.query.products)
+    }
+    this.deliverShipCompany()
+    console.log('productList', this.params.orderProducts)
+  },
+  methods: {
+    // 付款单详情
+    async deliverShipCompany() {
+      try {
+        const res = await deliverShipCompany()
+        console.log('res', res)
+        this.kuaiduLisrt = res.data
+      } catch (error) {
+        console.log('error', error)
+      }
+    },
+    //  选择物流公司
+    hanldeCompny(value, index) {
+      console.log('value', value)
+      this.params.transportations[index].logisticsCompanyName = value.label
+      this.params.transportations[index].logisticsCompanyCode = value.value
+      this.islogisticsCompany = false
+    },
+    // 添加一条物流公司
+    hanldeAddlogis() {
+      this.params.transportations.push(defaultForm())
+    },
+    // 删除 一条物流公司
+    handeleDelete(index) {
+      this.params.transportations.splice(index, 1)
+    },
+    // 添加物流单号
+    hanldeAddNumber(logistic, num, numIndex) {
+      logistic.logisticsNu.push({ num: '' })
+    },
+    // 删除一条物流编号
+    handeleDeleteNumber(logistic, numIndex) {
+      logistic.logisticsNu.splice(numIndex, 1)
+    },
+    checkedParams() { // 校验参数信息
+      const _this = this
+      this.params.transportations.forEach(function(pros) {
+        pros.logisticsNu.forEach(function(item) {
+          const transpor = {
+            logisticsCompanyCode: pros.logisticsCompanyCode,
+            logisticsCompanyName: pros.logisticsCompanyName,
+            num: item.num
+          }
+          if (transpor.logisticsCompanyCode === '' && transpor.logisticsCompanyName === '') {
+            _this.islogisticsCompany = true
+          } else {
+            _this.islogisticsCompany = false
+          }
+          if (transpor.num === '') {
+            console.log('1111111111')
+            _this.islogisticsNumber = true
+          } else {
+            _this.islogisticsNumber = false
+          }
+        })
+      })
+    },
+    hanldeConfirm(formName) {
+      // 保存编辑
+      // this.checkedParams()
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          this.fileImageList.forEach((image) => {
+            this.params.images.push(image.response.data)
+          })
+          this.confirmDeliver(this.params)
+        } else {
+          return false
+        }
+      })
+    },
+    async confirmDeliver(params) {
+      try {
+        await confirmDeliver(params)
+        this.$message.success('操作成功')
+        this.backToList()
+      } catch (error) {
+        console.log('error', error)
+      }
+    },
+    // 上传图片事件
+    handleSuccess(res, file, fileList) {
+      this.fileImageList = fileList
+      console.log('images', this.fileImageList)
+    },
+    // 删除图片事件
+    handleRemove(file, fileList) {
+      this.fileImageList = fileList
+      console.log('images', this.fileImageList)
+    },
+    reloadImage() {
+      this.loadImgLoading = true
+      setTimeout(() => {
+        this.temp.classifyImage = this.temp.classifyImage.split('?')[0] + '?r=' + Math.floor(Math.random() * 1000)
+      }, 1000 * 2)
+    },
+    loadSucess() {
+      this.loadImgLoading = false
+    },
+    backToList() {
+      this.$store.dispatch('tagsView/delView', this.$route).then(() => {
+        this.$nextTick(() => {
+          this.$router.replace({
+            path: '/order/list'
+          })
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+  .app-title{
+    line-height: 36px;
+    font-size: 26px;
+    font-weight: bold;
+    color: #409EFF;
+    text-align: center;
+    margin: 0;
+  }
+  .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;
+  }
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 148px;
+    height: 148px;
+    line-height: 148px;
+    text-align: center;
+  }
+  .avatar {
+    width: 148px;
+    height: 148px;
+    display: block;
+  }
+  .avatar img {
+    width: 148px;
+    height: 148px;
+    display: block;
+  }
+  .el-form-item__label{
+      text-align: right !important;
+  }
+  .el-upload__tip{
+    line-height: 20px;
+    color: red;
+    text-align: left;
+    position: absolute;
+    right: -50%;
+    bottom: 0;
+  }
+  .span_tip{
+    font-size: 12px;
+    color: red;
+    margin-left: 5px;
+  }
+  .filter-item-temp{
+    width: 100px;
+  }
+  .op-item{
+    padding: 5px 0;
+  }
+  .el-span-warning{
+    color: #E6A23C;
+  }
+  .el-span-success{
+    color: #67C23A;
+  }
+  .el-span-danger{
+    color: #F56C6C;
+  }
+</style>
+

src/views/order/deliver.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="app-container">
+    <div class="filter-container" style="text-align: right;">
+      <el-button type="primary" @click="handlePayNote">查看订单备注</el-button>
+    </div>
     <el-card class="box-card" style="margin: 0 auto;">
       <div class="refund-item">
         <el-row :gutter="24" class="box-row">
@@ -106,6 +109,9 @@ export default {
         this.$router.push({ path: '/order/addLogistics', query: { orderId: this.orderId, products: JSON.stringify(this.productRadio) }})
       })
     },
+    handlePayNote() {
+      this.$router.push({ path: '/order/order-remarks', query: { orderId: this.orderId }})
+    },
     backToList() {
       this.$store.dispatch('tagsView/delView', this.$route).then(() => {
         this.$nextTick(() => {

src/views/order/detail.vue

@@ -108,10 +108,10 @@
             </el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
-            <el-col :span="6"><b>商品总额：</b> {{ shopOrder.orderTime }}</el-col>
-            <el-col :span="6"><b>应付金额：</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderId + ')' }}</el-col>
-            <el-col :span="6"><b>已付金额：</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
-            <el-col :span="6"><b>待付金额：</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
+            <el-col :span="6"><b>商品总额：</b> ¥{{ shopOrder.productAmount | toThousandFloatFilter }}</el-col>
+            <el-col :span="6"><b>应付金额：</b> ¥{{ shopOrder.shouldPayShopAmount | toThousandFloatFilter }}</el-col>
+            <el-col :span="6"><b>已付金额：</b> ¥{{ shopOrder.payedShopAmount | toThousandFloatFilter }}</el-col>
+            <el-col :span="6"><b>待付金额：</b> ¥{{ shopOrder.waitPayShop | toThousandFloatFilter }}</el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
             <el-col :span="6"><b>收款状态：</b>
@@ -120,9 +120,9 @@
               <el-tag v-if="shopOrder.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
             </el-col>
             <el-col :span="6"><b>付款状态：</b>
-              <el-tag v-if="shopOrder.refundType*1===1" type="warning" size="small">部分付款</el-tag>
-              <el-tag v-else-if="shopOrder.refundType*1===2" type="danger" size="small">已付款</el-tag>
-              <el-tag v-else type="info" size="small">无付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
+              <el-tag v-if="shopOrder.payStatus*1===3" type="success" size="small">已付款</el-tag>
             </el-col>
             <el-col :span="6"><b>发货状态：</b>
               <el-tag v-if="shopOrder.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
@@ -178,7 +178,7 @@
           </el-row>
         </template>
       </div>
-      <div class="refund-item">
+      <div v-if="voucher.length>0" 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>
@@ -197,7 +197,7 @@
             <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-form-item label="订单本次收款金额:" prop="amount" :rules="rules.amount">
             <el-input v-model="chengeOrder.amount" style="width: 200px">
               <template slot="prepend">￥</template>
             </el-input>
@@ -205,7 +205,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogFormVisible = false">取消</el-button>
-          <el-button type="primary" @click="handleChangOrder">确定</el-button>
+          <el-button type="primary" :disabled="disabled" @click="handleChangOrder">确定</el-button>
         </div>
       </el-dialog>
       <Remarks dialog-title="订单备注信息" :is-visible.sync="dialogRemarksVisible" :order-id="dialogRemarksorderId" :remark-list="dialogRemarkList" />
@@ -242,14 +242,12 @@ export default {
       dialogFormVisible: false,
       chengeOrder: {
         orderId: this.$route.query.id * 1,
-        amount: ''
+        amount: null
       },
       orderInvoice: {},
       voucher: [],
       rules: {
-        sataus: [{ required: true, message: '请选择机构类型', trigger: 'blur' }],
-        account: [{ required: true, message: '请选择审核状态', trigger: 'blur' }],
-        auditNote: [{ required: true, message: '请填写原因', trigger: 'blur' }]
+        amount: [{ required: true, message: '请输入本次收款金额', trigger: 'blur' }]
       },
       listLoading: false
     }
@@ -257,6 +255,9 @@ export default {
   computed: {
     orderId: function() {
       return this.$route.query.id * 1
+    },
+    disabled() {
+      return !(this.chengeOrder.amount > 0)
     }
   },
   created() {

src/views/order/order-remarks.vue

@@ -0,0 +1,115 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container" style="text-align: right;">
+      <el-button type="primary" @click="handlePayNote">添加订单备注</el-button>
+    </div>
+    <el-card class="box-card" style="margin: 0 auto;">
+      <div class="refund-item">
+        订单备注
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { orderTodeliver } from '@/api/order'
+export default {
+  name: 'OrderRemarks',
+  filters: {
+
+  },
+  data() {
+    return {
+      orderInfo: {},
+      productRadio: null
+    }
+  },
+  computed: {
+    orderId: function() {
+      return this.$route.query.orderId * 1
+    },
+    disabled() {
+      return this.productRadio === null
+    }
+  },
+  created() {
+    this.orderTodeliver(this.orderId)
+  },
+  methods: {
+    // 付款单详情
+    async orderTodeliver(orderId) {
+      try {
+        const res = await orderTodeliver(orderId)
+        console.log('res', res)
+        this.orderInfo = res.data
+        this.orderInfo.orderProduct.map((elem) => {
+          elem.deliveryNum = elem.num
+          return elem
+        })
+      } catch (error) {
+        console.log('error', error)
+      }
+    },
+    handlePayNote() {
+      this.$router.push({ path: '/order/add-remarks ', query: { orderId: this.orderId }})
+    },
+    backToList() {
+      this.$store.dispatch('tagsView/delView', this.$route).then(() => {
+        this.$nextTick(() => {
+          this.$router.replace({
+            path: '/finance/payment-list'
+          })
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-title{
+    line-height: 36px;
+    font-size: 26px;
+    font-weight: bold;
+    color: #409EFF;
+    text-align: center;
+    margin: 0;
+  }
+  .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/order/refund-detail.vue

@@ -54,8 +54,8 @@
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="7"><b>订单金额：</b> {{ orderData.payTotalFee }}</el-col>
-            <el-col :span="6"><b>应收金额：</b> {{ orderData.payableAmount }}</el-col>
+            <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>{{ orderData.postageInfo }}</span>
             </el-col>