更新v1.0

.env.development

@@ -5,7 +5,8 @@ ENV = 'development'
 # VUE_APP_BASE_API = '/dev-api'
 # VUE_APP_BASE_API = 'http://192.168.1.22:9104'
 # VUE_APP_BASE_API = 'http://192.168.2.67:9104'
-VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
+# VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
+VUE_APP_BASE_API = 'http://192.168.2.103:9104'
 # VUE_APP_BASE_API = 'http://192.168.78.1:9104/'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

src/api/finance.js

@@ -131,7 +131,7 @@ export function organizePayInfos(params) {
  */
 export function organizeReceiptRecord(id) {
   return request({
-    url: '/order/organize/receipt/record/' + id,
+    url: `/order/organize/receipt/record/${id.orderId}/${id.shopOrderId}`,
     method: 'get'
   })
 }
@@ -140,7 +140,7 @@ export function organizeReceiptRecord(id) {
  */
 export function organizeToRecturnRecordByOrderId(id) {
   return request({
-    url: '/order/organize/toRecturnRecordByOrderId?orderId=' + id,
+    url: `/order/organize/toRecturnRecordByOrderId?orderId=${id.orderId}&shopOrderId=${id.shopOrderId}`,
     method: 'get'
   })
 }

src/api/order.js

@@ -119,7 +119,7 @@ export function deliverShipCompany() {
  */
 export function deliverDetails(id) {
   return request({
-    url: '/order/deliver/deliver/details/' + id,
+    url: `/order/deliver/deliver/details/${id.orderId}/${id.shopOrderId}`,
     method: 'get'
   })
 }
@@ -129,7 +129,7 @@ export function deliverDetails(id) {
  */
 export function orderNotes(orderId) {
   return request({
-    url: `/order/cmOrderRemark/remarksView/${orderId}`,
+    url: `/order/cmOrderRemark/remarksView/${orderId.orderId}/${orderId.shopOrderId}`,
     method: 'get'
   })
 }

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

@@ -3,7 +3,7 @@
     <el-card v-if="cmReturnedPurchaseList.length === 0" class="box-card" style="height: 100px;line-height: 100px; text-align:center;color: #999;">暂无退款退货详情记录~</el-card>
     <template v-else>
       <div v-for="(cmReturn,index) in cmReturnedPurchaseList" id="printBox" :key="index">
-        <el-card class="box-card" style="margin: 5px auto;">
+        <!-- <el-card class="box-card" style="margin: 5px auto;">
           <div class="refund-item">
             <h1 class="refund-item-title">审核信息</h1>
             <el-row :gutter="24" class="box-row">
@@ -12,7 +12,7 @@
               <el-col :span="15"><b>审核备注：</b> {{ cmReturn.reviewRemarks ? cmReturn.reviewRemarks :'--' }}</el-col>
             </el-row>
           </div>
-        </el-card>
+        </el-card> -->
         <el-card class="box-card" style="margin: 5px auto;">
           <div class="refund-item">
             <h1 class="refund-item-title">申请信息</h1>
@@ -46,10 +46,10 @@
                     <b>线下转账：</b>
                     <span>¥{{ cmReturn.refundOfflineFee | amountfilters }}</span>
                   </el-col>
-                  <el-col :span="4"><b>开户名：</b><span>{{ cmReturn.bankAccountName }}</span> </el-col>
+                  <!-- <el-col :span="4"><b>开户名：</b><span>{{ cmReturn.bankAccountName }}</span> </el-col>
                   <el-col :span="4"><b>账号：</b> <span>{{ cmReturn.bankAccountNo }}</span> </el-col>
                   <el-col :span="4"><b>开户行：</b> <span>{{ cmReturn.openBank }}</span> </el-col>
-                  <el-col :span="4"><b>账户类型：</b> <span>{{ cmReturn.bankAccountType*1 === 1 ? '公账' : '私账' }}</span> </el-col>
+                  <el-col :span="4"><b>账户类型：</b> <span>{{ cmReturn.bankAccountType*1 === 1 ? '公账' : '私账' }}</span> </el-col> -->
                 </template>
               </template>
               <span v-else>----</span>
@@ -58,7 +58,7 @@
         </el-card>
         <el-card class="box-card" style="margin: 5px auto;">
           <div class="refund-item">
-            <el-row :gutter="24" class="box-row">
+            <!-- <el-row :gutter="24" class="box-row">
               <el-col :span="5"><b>订单编号(ID)：</b> {{ order.orderNo }}({{ order.orderId }})</el-col>
               <el-col :span="4"><b>下单时间：</b> {{ order.orderTime }}</el-col>
               <el-col :span="6"><b>机构名称：</b> {{ order.clubName }}</el-col>
@@ -98,7 +98,7 @@
                 <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">已退款</el-tag>
                 <el-tag v-else type="info" size="small">无退款</el-tag>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row :gutter="24" class="box-row">
               <el-col :span="5"><b>机构:</b> {{ order.bpOrderUserinfo.name }}</el-col>
               <el-col :span="4"><b>收货人:</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
@@ -156,6 +156,18 @@
                   <el-tag v-if="row.payStatus*1===3" type="success" size="small">已付款</el-tag>
                 </template>
               </el-table-column>
+              <el-table-column label="运费" align="center">
+                <template>
+                  {{ order.newShopOrders[0].postageInfo }}
+                </template>
+              </el-table-column>
+              <el-table-column label="退款状态" align="center">
+                <template>
+                  <el-tag v-if="order.newShopOrders[0].orderStatusFlag*1===1" type="info" size="small">无退款</el-tag>
+                  <el-tag v-if="order.newShopOrders[0].orderStatusFlag*1===2" type="warning" size="small">退款中</el-tag>
+                  <el-tag v-if="order.newShopOrders[0].orderStatusFlag*1===3" type="success" size="small">已退款</el-tag>
+                </template>
+              </el-table-column>
               <el-table-column label="供应商" align="center" prop="shopName" />
             </el-table>
           </div>
@@ -191,6 +203,9 @@ export default {
   computed: {
     orderId: function() {
       return this.$route.query.orderId * 1
+    },
+    shopOrderId() {
+      return this.$route.query.shopOrderId * 1
     }
   },
   created() {
@@ -199,7 +214,7 @@ export default {
   methods: {
     async organizeToRecturnRecordByOrderId() {
       try {
-        const res = await organizeToRecturnRecordByOrderId(this.orderId)
+        const res = await organizeToRecturnRecordByOrderId({ orderId: this.orderId, shopOrderId: this.shopOrderId })
         this.order = res.data.order
         this.cmReturnedPurchase = res.data.cmReturnedPurchase
         this.cmReturnedPurchaseList = res.data.cmReturnedPurchaseList
@@ -212,7 +227,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
   .app-title{
     line-height: 36px;
     font-size: 26px;
@@ -262,10 +277,10 @@ export default {
   .el-span-danger{
     color: #F56C6C;
   }
-  /deep/ .el-table__expanded-cell[class*=cell]{
+  ::v-deep .el-table__expanded-cell[class*=cell]{
     padding:10px 10px !important;
   }
-  /deep/ .el-card__body{
+  ::v-deep .el-card__body{
     padding: 5px 20px !important;
   }
 </style>

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

@@ -1,34 +1,71 @@
 <template>
   <div class="app-container">
     <div id="printBox">
-      <el-card ref="print" class="box-card" style="margin: 0 auto;">
+      <el-card ref="print" class="box-card" style="margin: 0 auto">
         <div class="refund-item">
           <el-row :gutter="24" class="box-row">
-            <el-col :span="5"><b>订单编号(ID)：</b> {{ dataOrder.order.orderNo }}({{ dataOrder.order.orderId }})</el-col>
-            <el-col :span="4"><b>下单时间：</b> {{ dataOrder.order.orderTime }}</el-col>
-            <el-col :span="4"><b>机构名称：</b> {{ dataOrder.order.clubName }}</el-col>
+            <el-col
+              :span="5"
+            ><b>订单编号(ID)：</b> {{ dataOrder.order.newShopOrders[0].shopOrderNo }}({{
+              dataOrder.order.newShopOrders[0].shopOrderId
+            }})</el-col>
+            <el-col :span="4"><b>下单时间：</b> {{ dataOrder.order.newShopOrders[0].orderTime }}</el-col>
+            <el-col :span="4"><b>机构名称：</b> {{ dataOrder.order.newShopOrders[0].clubName }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
             <el-col :span="5">
               <b>订单状态：</b>
-              <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(dataOrder.order.status)>=0">
+              <template
+                v-if="
+                  ['11', '12', '13', '21', '22', '23', '31', '32', '33'].indexOf(
+                    dataOrder.order.status
+                  ) >= 0
+                "
+              >
                 <el-tag type="success" size="small">交易中</el-tag>
               </template>
               <template v-else>
-                <el-tag :type="dataOrder.order.status*1===6?'info':''" size="small">{{ dataOrder.order.status | orderStatusFilter }}</el-tag>
+                <el-tag
+                  :type="dataOrder.order.status * 1 === 6 ? 'info' : ''"
+                  size="small"
+                >{{ dataOrder.order.status | orderStatusFilter }}</el-tag>
               </template>
             </el-col>
             <el-col :span="4">
               <b>收款状态：</b>
-              <el-tag v-if="dataOrder.order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
-              <el-tag v-if="dataOrder.order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
-              <el-tag v-if="dataOrder.order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
+              <el-tag
+                v-if="dataOrder.order.newShopOrders[0].receiptStatus * 1 === 1"
+                type="danger"
+                size="small"
+              >待收款</el-tag>
+              <el-tag
+                v-if="dataOrder.order.newShopOrders[0].receiptStatus * 1 === 2"
+                type="warning"
+                size="small"
+              >部分收款</el-tag>
+              <el-tag
+                v-if="dataOrder.order.newShopOrders[0].receiptStatus * 1 === 3"
+                type="success"
+                size="small"
+              >已收款</el-tag>
             </el-col>
             <el-col :span="4">
               <b>付款状态：</b>
-              <el-tag v-if="dataOrder.order.payStatus*1===1" type="danger" size="small">待付款</el-tag>
-              <el-tag v-if="dataOrder.order.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
-              <el-tag v-if="dataOrder.order.payStatus*1===3" type="success" size="small">已付款</el-tag>
+              <el-tag
+                v-if="dataOrder.order.newShopOrders[0].payStatus * 1 === 1"
+                type="danger"
+                size="small"
+              >待付款</el-tag>
+              <el-tag
+                v-if="dataOrder.order.newShopOrders[0].payStatus * 1 === 2"
+                type="warning"
+                size="small"
+              >部分付款</el-tag>
+              <el-tag
+                v-if="dataOrder.order.newShopOrders[0].payStatus * 1 === 3"
+                type="success"
+                size="small"
+              >已付款</el-tag>
             </el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
@@ -44,43 +81,67 @@
               {{ 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">
+            <el-col
+              :span="5"
+            ><b>订单金额：</b> ¥{{
+              dataOrder.order.newShopOrders[0].totalAmount | amountfilters
+            }}</el-col>
+            <el-col
+              :span="4"
+            ><b>应收金额：</b> ¥{{
+              dataOrder.order.newShopOrders[0].shouldPayShopAmount | amountfilters
+            }}</el-col>
+            <!-- <el-col :span="5">
               <b>运费：</b>
               <span>{{ dataOrder.order.postageInfo }}</span>
-            </el-col>
-            <el-col :span="4"><b>退款金额：</b> ¥{{ dataOrder.order.returnValue | amountfilters }}</el-col>
+            </el-col> -->
+            <el-col
+              :span="4"
+            ><b>退款金额：</b> ¥{{
+              dataOrder.order.newShopOrders[0].refundsAmount | 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'}">
+          <el-table
+            :data="dataOrder.receiptList"
+            border
+            fit
+            highlight-current-row
+            :header-cell-style="{ background: '#e9f3f7', color: '#606266' }"
+          >
             <el-table-column label="序号" align="center" width="50">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
             <el-table-column label="收款ID" align="center" prop="receiptId" />
             <el-table-column label="收款方式" align="center" prop="bankNameType" />
             <el-table-column label="收款金额" align="center" prop="receiptAmount">
-              <template slot-scope="{row}">
+              <template slot-scope="{ row }">
                 ¥{{ row.receiptAmount | amountfilters }}
               </template>
             </el-table-column>
             <el-table-column label="收款时间" align="center" prop="receiptTime" />
           </el-table>
           <h1 class="refund-item-title">付款记录</h1>
-          <el-table :data="dataOrder.payList" border fit highlight-current-row :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
+          <el-table
+            :data="dataOrder.payList"
+            border
+            fit
+            highlight-current-row
+            :header-cell-style="{ background: '#e9f3f7', color: '#606266' }"
+          >
             <el-table-column label="序号" align="center" width="50">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
             <el-table-column label="付款单ID" align="center" prop="payShopId" />
             <el-table-column label="付款方式" align="center" prop="bankNameType" />
             <el-table-column label="付款金额" align="center" prop="payAmount">
-              <template slot-scope="{row}">
+              <template slot-scope="{ row }">
                 ¥{{ row.payAmount | amountfilters }}
               </template>
             </el-table-column>
             <el-table-column label="付款时间" align="center" prop="payTime">
-              <template slot-scope="{row}">
-                {{ row.payTime ? row.payTime : '---' }}
+              <template slot-scope="{ row }">
+                {{ row.payTime ? row.payTime : "---" }}
               </template>
             </el-table-column>
           </el-table>
@@ -112,6 +173,9 @@ export default {
   computed: {
     orderId: function() {
       return this.$route.query.orderId * 1
+    },
+    shopOrderId() {
+      return this.$route.query.shopOrderId * 1
     }
   },
   created() {
@@ -120,7 +184,10 @@ export default {
   methods: {
     async organizeReceiptRecord() {
       try {
-        const res = await organizeReceiptRecord(this.orderId)
+        const res = await organizeReceiptRecord({
+          orderId: this.orderId,
+          shopOrderId: this.shopOrderId
+        })
         console.log('res', res)
         this.dataOrder = res.data
         this.listLoading = false
@@ -142,62 +209,61 @@ export default {
 }
 </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;
-  }
-  .refund-item-title{
-    line-height: 24px;
-    font-size: 14px;
-    color: #409EFF;
-  }
-  .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;
-  }
-  /deep/ .el-table__expanded-cell[class*=cell]{
-    padding:10px 10px !important;
-  }
-  /deep/ .el-table__row td {
-    height: 34px !important;
-    line-height: 34px !important;
-    padding: 0 !important;
-  }
+<style scoped lang="scss">
+.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;
+}
+.refund-item-title {
+  line-height: 24px;
+  font-size: 14px;
+  color: #409eff;
+}
+.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;
+}
+::v-deep .el-table__expanded-cell[class*="cell"] {
+  padding: 10px 10px !important;
+}
+::v-deep .el-table__row td {
+  height: 34px !important;
+  line-height: 34px !important;
+  padding: 0 !important;
+}
 </style>
-

src/views/goods/components/price-edit.vue

@@ -59,7 +59,7 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="dialogFormVisible = false"> 关闭 </el-button>
-      <el-button type="primary" @click="handleSave"> 保存 </el-button>
+      <el-button v-if="isDetail" type="primary" @click="handleSave"> 保存 </el-button>
     </div>
   </el-dialog>
 </template>
@@ -83,6 +83,10 @@ export default {
     classify: {
       type: Array,
       default: () => []
+    },
+    isDetail: {
+      type: Boolean,
+      default: () => true
     }
   },
   data: function() {

src/views/goods/list.vue

@@ -81,7 +81,7 @@
 
     <pagination v-show="total>10" :total="total" :page.sync="listQuery.index" :limit.sync="listQuery.pageSize" @pagination="getList" />
 
-    <PriceEdit ref="priceChild" :dialog-title="dialogTitle" :is-visible.sync="dialogFormVisible" :product="dialogData" />
+    <PriceEdit ref="priceChild" :dialog-title="dialogTitle" :is-detail="false" :is-visible.sync="dialogFormVisible" :product="dialogData" />
 
     <template>
       <el-backtop style="right: 40px; bottom: 40px;">
@@ -124,7 +124,7 @@ export default {
       dialogData: {},
       dialogFormVisible: false,
       dialogStatus: '',
-      dialogTitle: '编辑'
+      dialogTitle: '查看详情'
     }
   },
   computed: {

src/views/order/deliver-record.vue

@@ -59,10 +59,13 @@ export default {
   computed: {
     orderId: function() {
       return this.$route.query.orderId * 1
+    },
+    shopOrderId() {
+      return this.$route.query.shopOrderId * 1
     }
   },
   created() {
-    this.deliverDetails(this.orderId)
+    this.deliverDetails({ orderId: this.orderId, shopOrderId: this.shopOrderId })
   },
   methods: {
     // 付款单详情

src/views/order/detail.vue

@@ -1,53 +1,122 @@
 <template>
   <div class="app-container">
-    <div class="app-header-top" style="width: 100%;float: right;margin-bottom: 10px;">
+    <div class="app-header-top" style="width: 100%; float: right; margin-bottom: 10px">
       <div class="app-title">订单详情</div>
-      <el-button type="primary" icon="el-icon-back" style="float: right;" @click="backToList">返回</el-button>
+      <el-button
+        type="primary"
+        icon="el-icon-back"
+        style="float: right"
+        @click="backToList"
+      >返回</el-button>
     </div>
     <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 }}</el-col>
-          <el-col :span="6"><b>订单编号(ID)：</b> {{ order.orderNo + '(' + order.orderId + ')' }}</el-col>
-          <el-col :span="4"><b>订单状态：</b>
-            <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(order.status)>=0">
+          <el-col
+            :span="6"
+          ><b>订单编号(ID)：</b> {{ order.orderNo + "(" + order.orderId + ")" }}</el-col>
+          <el-col
+            :span="4"
+          ><b>订单状态：</b>
+            <template
+              v-if="
+                ['11', '12', '13', '21', '22', '23', '31', '32', '33'].indexOf(
+                  order.status
+                ) >= 0
+              "
+            >
               <el-tag type="success" size="small">交易中</el-tag>
             </template>
             <template v-else>
-              <el-tag :type="order.status*1===6?'info':''" size="small">{{ order.status | orderStatusFilter }}</el-tag>
+              <el-tag :type="order.status * 1 === 6 ? 'info' : ''" size="small">{{
+                order.status | orderStatusFilter
+              }}</el-tag>
             </template>
           </el-col>
           <!-- <el-col :span="4"><b>订单类型：</b> {{ order.orderTime }}</el-col> -->
           <el-col :span="4"><b>订单来源：</b> 【采美】平台</el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>收款状态：</b>
-            <el-tag v-if="order.receiptStatus*1===1" type="danger" size="small">待收款</el-tag>
-            <el-tag v-if="order.receiptStatus*1===2" type="warning" size="small">部分收款</el-tag>
-            <el-tag v-if="order.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
+          <el-col
+            :span="6"
+          ><b>收款状态：</b>
+            <el-tag
+              v-if="order.receiptStatus * 1 === 1"
+              type="danger"
+              size="small"
+            >待收款</el-tag>
+            <el-tag
+              v-if="order.receiptStatus * 1 === 2"
+              type="warning"
+              size="small"
+            >部分收款</el-tag>
+            <el-tag
+              v-if="order.receiptStatus * 1 === 3"
+              type="success"
+              size="small"
+            >已收款</el-tag>
           </el-col>
-          <el-col :span="6"><b>发货状态：</b>
-            <el-tag v-if="order.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
-            <el-tag v-if="order.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
-            <el-tag v-if="order.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+          <el-col
+            :span="6"
+          ><b>发货状态：</b>
+            <el-tag
+              v-if="order.sendOutStatus * 1 === 1"
+              type="danger"
+              size="small"
+            >待发货</el-tag>
+            <el-tag
+              v-if="order.sendOutStatus * 1 === 2"
+              type="warning"
+              size="small"
+            >部分发货</el-tag>
+            <el-tag
+              v-if="order.sendOutStatus * 1 === 3"
+              type="success"
+              size="small"
+            >已发货</el-tag>
           </el-col>
-          <el-col :span="4"><b>付款状态：</b>
-            <el-tag v-if="order.payStatus*1===1" type="danger" size="small">待付款</el-tag>
-            <el-tag v-if="order.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
-            <el-tag v-if="order.payStatus*1===3" type="success" size="small">已付款</el-tag>
+          <el-col
+            :span="4"
+          ><b>付款状态：</b>
+            <el-tag
+              v-if="order.payStatus * 1 === 1"
+              type="danger"
+              size="small"
+            >待付款</el-tag>
+            <el-tag
+              v-if="order.payStatus * 1 === 2"
+              type="warning"
+              size="small"
+            >部分付款</el-tag>
+            <el-tag
+              v-if="order.payStatus * 1 === 3"
+              type="success"
+              size="small"
+            >已付款</el-tag>
           </el-col>
-          <el-col :span="4"><b>退款状态：</b>
-            <el-tag v-if="order.refundType*1===1" type="warning" size="small">部分退款</el-tag>
-            <el-tag v-else-if="order.refundType*1===2" type="danger" size="small">已退款</el-tag>
+          <el-col
+            :span="4"
+          ><b>退款状态：</b>
+            <el-tag
+              v-if="order.refundType * 1 === 1"
+              type="warning"
+              size="small"
+            >部分退款</el-tag>
+            <el-tag
+              v-else-if="order.refundType * 1 === 2"
+              type="danger"
+              size="small"
+            >已退款</el-tag>
             <el-tag v-else type="info" size="small">无退款</el-tag>
           </el-col>
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <el-dropdown class="dropdown">
               <el-button type="primary" size="mini">
                 功能<i class="el-icon-arrow-down el-icon--right" />
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <!-- <el-dropdown-item v-if="order.checkFlag === 1">
+                <el-dropdown-item v-if="order.checkFlag === 1">
                   <div @click="handeleDropdown(6,order.orderId)"> 上传线下支付凭证</div>
                 </el-dropdown-item>
                 <el-dropdown-item v-if="order.checkFlag === 1">
@@ -55,7 +124,7 @@
                 </el-dropdown-item>
                 <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>
                 <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>
@@ -70,89 +139,236 @@
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-          </el-col>
+          </el-col> -->
         </el-row>
       </div>
       <div class="refund-item">
         <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
-          <el-col v-if="order.bpOrderUserinfo" :span="6"><b>机构：</b> {{ order.clubName }}</el-col>
+          <el-col
+            v-if="order.bpOrderUserinfo"
+            :span="6"
+          ><b>机构：</b> {{ order.clubName }}</el-col>
         </el-row>
         <el-row v-if="order.bpOrderUserinfo" :gutter="24" class="box-row">
-          <el-col :span="6"><b>收货人：</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
+          <el-col
+            :span="6"
+          ><b>收货人：</b> {{ order.bpOrderUserinfo.shouHuoRen }}</el-col>
           <el-col :span="6"><b>手机：</b> {{ order.bpOrderUserinfo.mobile }}</el-col>
-          <el-col :span="12"><b>地址：</b> {{ order.bpOrderUserinfo.province +' '+ order.bpOrderUserinfo.city +' '+ order.bpOrderUserinfo.town +' '+ order.bpOrderUserinfo.address }}</el-col>
+          <el-col
+            :span="12"
+          ><b>地址：</b>
+            {{
+              order.bpOrderUserinfo.province +
+                " " +
+                order.bpOrderUserinfo.city +
+                " " +
+                order.bpOrderUserinfo.town +
+                " " +
+                order.bpOrderUserinfo.address
+            }}</el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>订单金额：</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
-          <el-col :span="6"><b>应收金额：</b>
-            ¥{{ order.payTotalFee | toThousandFloatFilter }}
+          <el-col
+            :span="6"
+          ><b>订单金额：</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
+          <el-col
+            :span="6"
+          ><b>应收金额：</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}
           </el-col>
-          <el-col :span="12"><b>已收金额：</b>
-            <template v-if="order.receiptStatus*1===1">¥0.00</template>
+          <el-col
+            :span="12"
+          ><b>已收金额：</b>
+            <template v-if="order.receiptStatus * 1 === 1">¥0.00</template>
             <template v-else>¥{{ receiptAmount | toThousandFloatFilter }}</template>
           </el-col>
         </el-row>
-        <el-row :gutter="24" class="box-row">
+        <!-- <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>退款金额(已完成)：</b> ¥{{ returnValue | toThousandFloatFilter }}
           </el-col>
-        </el-row>
+        </el-row> -->
       </div>
       <div class="refund-item">
-        <div v-for="shopOrder in order.newShopOrders" :key="shopOrder.shopOrderId" class="order-item">
+        <div
+          v-for="shopOrder in order.newShopOrders"
+          :key="shopOrder.shopOrderId"
+          class="order-item"
+        >
           <el-row :gutter="22" class="box-row">
             <el-col :span="6"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
-            <el-col :span="6"><b>子订单号(ID)：</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderId + ')' }}</el-col>
-            <el-col :span="6"><b>子订单金额：</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
-            <el-col :span="6"><b>运费：</b>
+            <el-col
+              :span="6"
+            ><b>子订单号(ID)：</b>
+              {{ shopOrder.shopOrderNo + "(" + shopOrder.shopOrderId + ")" }}</el-col>
+            <el-col
+              :span="6"
+            ><b>子订单金额：</b> ¥{{
+              shopOrder.needPayAmount | toThousandFloatFilter
+            }}</el-col>
+            <el-col
+              :span="6"
+            ><b>运费：</b>
               <span>{{ shopOrder.postageInfo }}</span>
             </el-col>
+            <el-col :span="4" class="function">
+              <el-dropdown class="dropdown">
+                <el-button type="primary" size="mini">
+                  功能<i class="el-icon-arrow-down el-icon--right" />
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <!-- <el-dropdown-item v-if="order.checkFlag === 1">
+                    <div @click="handeleDropdown(6,order.orderId)"> 上传线下支付凭证</div>
+                  </el-dropdown-item>
+                  <el-dropdown-item v-if="order.checkFlag === 1">
+                    <div @click="handeleDialogFormVisible"> 确认收款金额</div>
+                  </el-dropdown-item>
+                  <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="shopOrder.sendOutStatus * 1 > 1"
+                  >
+                    <div @click="handeleDropdown(2, order.orderId, shopOrder.shopOrderId)">发货记录</div>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
+                    <div @click="handeleDropdown(3, order.orderId, shopOrder.shopOrderId)">收付款记录</div>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
+                    <div @click="handeleDropdown(4, order.orderId, shopOrder.shopOrderId)">退款（退货）记录</div>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
+                    <div @click="handeleDropdown(5, order.orderId, shopOrder.shopOrderId)">订单备注</div>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
-            <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-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>
-              <el-tag v-if="shopOrder.receiptStatus*1===1" type="danger" size="small">待付款</el-tag>
-              <el-tag v-if="shopOrder.receiptStatus*1===2" type="warning" size="small">部分付款</el-tag>
-              <el-tag v-if="shopOrder.receiptStatus*1===3" type="success" size="small">已付款</el-tag>
+            <el-col
+              :span="6"
+            ><b>收款状态：</b>
+              <el-tag
+                v-if="shopOrder.receiptStatus * 1 === 1"
+                type="danger"
+                size="small"
+              >待付款</el-tag>
+              <el-tag
+                v-if="shopOrder.receiptStatus * 1 === 2"
+                type="warning"
+                size="small"
+              >部分付款</el-tag>
+              <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.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
+              :span="6"
+            ><b>付款状态：</b>
+              <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>
-              <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
-              <el-tag v-if="shopOrder.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
+            <el-col
+              :span="6"
+            ><b>发货状态：</b>
+              <el-tag
+                v-if="shopOrder.sendOutStatus * 1 === 1"
+                type="danger"
+                size="small"
+              >待发货</el-tag>
+              <el-tag
+                v-if="shopOrder.sendOutStatus * 1 === 2"
+                type="warning"
+                size="small"
+              >部分发货</el-tag>
+              <el-tag
+                v-if="shopOrder.sendOutStatus * 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="danger" size="small">待付款</el-tag>
-              <el-tag v-if="shopOrder.refundType*1===2" type="warning" size="small">部分付款</el-tag>
-              <el-tag v-if="shopOrder.refundType*1===3" type="success" size="small">已付款</el-tag>
+            <el-col
+              :span="6"
+            ><b>退款状态：</b>
+              <el-tag
+                v-if="shopOrder.orderStatusFlag * 1 === 1"
+                type="info"
+                size="small"
+              >无退款</el-tag>
+              <el-tag
+                v-if="shopOrder.orderStatusFlag * 1 === 2"
+                type="warning"
+                size="small"
+              >退款中</el-tag>
+              <el-tag
+                v-if="shopOrder.orderStatusFlag * 1 === 3"
+                type="success"
+                size="small"
+              >已退款</el-tag>
             </el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
-            <el-col :span="22"><b>留言：</b> {{ shopOrder.note ? shopOrder.note : '无' }}</el-col>
+            <el-col
+              :span="22"
+            ><b>留言：</b> {{ shopOrder.note ? shopOrder.note : "无" }}</el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
-            <el-col :span="22"><b>供应商：</b> {{ shopOrder.shopName ? shopOrder.shopName : '无' }}</el-col>
+            <el-col
+              :span="22"
+            ><b>供应商：</b>
+              {{ shopOrder.shopName ? shopOrder.shopName : "无" }}</el-col>
           </el-row>
           <el-row :gutter="22">
             <el-table :data="shopOrder.newOrderProducts" border>
               <el-table-column label="商品图片" align="center" prop="productImage">
-                <template slot-scope="{row}">
-                  <el-popover
-                    placement="top-start"
-                    title=""
-                    width="120"
-                    trigger="hover"
-                  >
-                    <img :src="row.productImage" alt="" style="width:100px;height:100px;">
-                    <img slot="reference" :src="row.productImage" alt="" style="width:50px;height:50px;">
+                <template slot-scope="{ row }">
+                  <el-popover placement="top-start" title="" width="120" trigger="hover">
+                    <img
+                      :src="row.productImage"
+                      alt=""
+                      style="width: 100px; height: 100px"
+                    >
+                    <img
+                      slot="reference"
+                      :src="row.productImage"
+                      alt=""
+                      style="width: 50px; height: 50px"
+                    >
                   </el-popover>
                 </template>
               </el-table-column>
@@ -160,23 +376,36 @@
               <el-table-column label="规格" align="center" prop="unit" />
               <el-table-column label="数量" align="center" prop="num" width="60" />
               <el-table-column label="单价" align="center" prop="price">
-                <template slot-scope="{row}">
+                <template slot-scope="{ row }">
                   <span>¥{{ row.price | amountfilters }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="总价" align="center" prop="totalFee">
-                <template slot-scope="{row}">
+                <template slot-scope="{ row }">
                   <span>¥{{ row.totalFee | amountfilters }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="已发/已收" align="center" prop="returnedPurchaseProductNum">
-                <template slot-scope="{row}">
-                  <span>{{ `${row.sendOutNum ? row.sendOutNum : 0}/${row.receivedNum ? row.receivedNum : 0}` }}</span>
+              <el-table-column
+                label="已发/已收"
+                align="center"
+                prop="returnedPurchaseProductNum"
+              >
+                <template slot-scope="{ row }">
+                  <span>{{
+                    `${row.sendOutNum ? row.sendOutNum : 0}/${
+                      row.receivedNum ? row.receivedNum : 0
+                    }`
+                  }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="退款(退货)中/已完成" align="center" prop="returnedPurchaseProductNum">
-                <template slot-scope="{row}">
-                  <span>{{ row.returningNum ? row.returningNum : 0 }} / {{ row.returnedNum ? row.returnedNum : 0 }}</span>
+              <el-table-column
+                label="退款(退货)中/已完成"
+                align="center"
+                prop="returnedPurchaseProductNum"
+              >
+                <template slot-scope="{ row }">
+                  <span>{{ row.returningNum ? row.returningNum : 0 }} /
+                    {{ row.returnedNum ? row.returnedNum : 0 }}</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -186,17 +415,43 @@
       <div class="refund-item">
         <template v-if="orderInvoice">
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>发票信息：</b> {{ setInvoiceText(orderInvoice) }}</el-col>
+            <el-col
+              :span="6"
+            ><b>发票信息：</b> {{ setInvoiceText(orderInvoice) }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>发票抬头：</b> {{ orderInvoice.invoiceTitle ? orderInvoice.invoiceTitle : '无' }}</el-col>
-            <el-col :span="6"><b>单位税号：</b> {{ orderInvoice.corporationTaxNum ? orderInvoice.corporationTaxNum : '无' }}</el-col>
-            <el-col :span="8"><b>注册地址：</b> {{ orderInvoice.registeredAddress ? orderInvoice.registeredAddress : '无' }}</el-col>
+            <el-col
+              :span="6"
+            ><b>发票抬头：</b>
+              {{ orderInvoice.invoiceTitle ? orderInvoice.invoiceTitle : "无" }}</el-col>
+            <el-col
+              :span="6"
+            ><b>单位税号：</b>
+              {{
+                orderInvoice.corporationTaxNum ? orderInvoice.corporationTaxNum : "无"
+              }}</el-col>
+            <el-col
+              :span="8"
+            ><b>注册地址：</b>
+              {{
+                orderInvoice.registeredAddress ? orderInvoice.registeredAddress : "无"
+              }}</el-col>
           </el-row>
           <el-row :gutter="24" class="box-row">
-            <el-col :span="6"><b>注册电话：</b> {{ orderInvoice.registeredPhone ? orderInvoice.registeredPhone : '无' }}</el-col>
-            <el-col :span="6"><b>开户银行：</b> {{ orderInvoice.openBank ? orderInvoice.openBank : '无' }}</el-col>
-            <el-col :span="8"><b>银行账号：</b> {{ orderInvoice.bankAccountNo ? orderInvoice.bankAccountNo : '无' }}</el-col>
+            <el-col
+              :span="6"
+            ><b>注册电话：</b>
+              {{
+                orderInvoice.registeredPhone ? orderInvoice.registeredPhone : "无"
+              }}</el-col>
+            <el-col
+              :span="6"
+            ><b>开户银行：</b>
+              {{ orderInvoice.openBank ? orderInvoice.openBank : "无" }}</el-col>
+            <el-col
+              :span="8"
+            ><b>银行账号：</b>
+              {{ orderInvoice.bankAccountNo ? orderInvoice.bankAccountNo : "无" }}</el-col>
           </el-row>
         </template>
         <template v-else>
@@ -205,12 +460,16 @@
           </el-row>
         </template>
       </div>
-      <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">
+      <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>
           <div class="refund-item-imgs">
-            <div v-for="(imgage,imgIndex) in vouch.images" :key="imgIndex" class="item-image">
+            <div
+              v-for="(imgage, imgIndex) in vouch.images"
+              :key="imgIndex"
+              class="item-image"
+            >
               <a :href="imgage" target="_blank" rel="noopener noreferrer">
                 <img :src="imgage" alt="">
               </a>
@@ -220,11 +479,25 @@
         </el-row>
       </div>
       <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.payTotalFee | amountfilters }}</el-col>
-            <el-col :span="8"><b>已收金额：</b>￥{{ receiptAmount | amountfilters }}</el-col>
-            <el-col :span="8"><b>未收金额：</b> ￥{{ (order.payTotalFee - receiptAmount) | amountfilters }}</el-col>
+        <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.payTotalFee | amountfilters }}</el-col>
+            <el-col
+              :span="8"
+            ><b>已收金额：</b>￥{{ receiptAmount | amountfilters }}</el-col>
+            <el-col
+              :span="8"
+            ><b>未收金额：</b> ￥{{
+              (order.payTotalFee - receiptAmount) | amountfilters
+            }}</el-col>
           </el-row>
           <el-form-item label="订单本次收款金额:" prop="amount" :rules="rules.amount">
             <el-input v-model="chengeOrder.amount" style="width: 200px">
@@ -234,10 +507,19 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogFormVisible = false">取消</el-button>
-          <el-button type="primary" :disabled="disabled" @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" />
+      <Remarks
+        dialog-title="订单备注信息"
+        :is-visible.sync="dialogRemarksVisible"
+        :order-id="dialogRemarksorderId"
+        :remark-list="dialogRemarkList"
+      />
     </el-card>
   </div>
 </template>
@@ -261,7 +543,10 @@ export default {
     const picValidator = (rule, value, callback) => {
       if (!this.chengeOrder.amount) {
         callback(new Error('请输入本次收款金额'))
-      } else if (this.chengeOrder.amount > this.SubtrAount(this.order.payTotalFee, this.receiptAmount) * 1) {
+      } else if (
+        this.chengeOrder.amount >
+        this.SubtrAount(this.order.payTotalFee, this.receiptAmount) * 1
+      ) {
         callback(new Error('本次收款金额不能大于未收金额'))
       } else {
         callback()
@@ -303,18 +588,20 @@ export default {
   },
   methods: {
     fetchData() {
-      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.orderInvoice = this.order.orderInvoice
-        this.voucher = response.data.voucher
-        this.listLoading = true
-      }).catch(() => {
-        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.orderInvoice = this.order.orderInvoice
+          this.voucher = response.data.voucher
+          this.listLoading = true
+        })
+        .catch(() => {
+          this.listLoading = true
+        })
     },
     // 设置发票文案
     setInvoiceText(data) {
@@ -337,7 +624,7 @@ export default {
       return invoiceText
     },
     RemarksOrder: function(id) {
-      getRemarks(id).then(response => {
+      getRemarks(id).then((response) => {
         this.dialogRemarkList = response.data
       })
       this.dialogRemarksorderId = id
@@ -346,31 +633,43 @@ export default {
     handeleDialogFormVisible() {
       this.dialogFormVisible = true
     },
-    handeleDropdown(type, orderId) {
+    handeleDropdown(type, orderId, shopOrderId) {
       switch (type) {
-        case 1:// 发货
+        case 1: // 发货
           this.$router.push({ path: '/order/deliver', query: { orderId: orderId }})
           break
-        case 2:// 发货记录
-          this.$router.push({ path: '/order/deliver-record', query: { orderId: orderId }})
+        case 2: // 发货记录
+          this.$router.push({
+            path: '/order/deliver-record',
+            query: { orderId: orderId, shopOrderId }
+          })
           break
-        case 3:// 收付款记录
-          this.$router.push({ path: '/finance/remit-record', query: { orderId: orderId }})
+        case 3: // 收付款记录
+          this.$router.push({
+            path: '/finance/remit-record',
+            query: { orderId: orderId, shopOrderId }
+          })
           break
-        case 4:// 退款（退货）记录
-          this.$router.push({ path: '/finance/refund-record', query: { orderId: orderId }})
+        case 4: // 退款（退货）记录
+          this.$router.push({
+            path: '/finance/refund-record',
+            query: { orderId: orderId, shopOrderId }
+          })
           break
-        case 5:// 订单备注
-          this.$router.push({ path: '/order/order-remarks', query: { orderId: orderId }})
+        case 5: // 订单备注
+          this.$router.push({
+            path: '/order/order-remarks',
+            query: { orderId: orderId, shopOrderId }
+          })
           break
-        case 6:// 上传线下支付凭证
+        case 6: // 上传线下支付凭证
           this.$router.push({ path: '/order/pay-remarks', query: { orderId: orderId }})
           break
       }
     },
     async handleChangOrder() {
       // 确认本次收款金额
-      this.$refs['dataForm'].validate(valid => {
+      this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.orderCheckReceipt()
         } else {
@@ -401,7 +700,7 @@ export default {
         r2 = 0
       }
       m = Math.pow(10, Math.max(r1, r2))
-      n = (r1 >= r2) ? r1 : r2
+      n = r1 >= r2 ? r1 : r2
       return ((arg1 * m - arg2 * m) / m).toFixed(n)
     },
     backToList() {
@@ -418,70 +717,77 @@ export default {
 </script>
 
 <style scoped>
-  .app-title{
-    float: left;
-    line-height: 36px;
-    font-size: 18px;
-    font-weight: bold;
-    color: #999999;
-  }
-  .box-card{
-    margin-top: 20px;
-    font-size: 14px;
-  }
-  .box-row{
-    padding: 10px 0;
-  }
-  .box-row .dropdown{
-    margin-top: -10px;
-  }
-  .refund-item{
-    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 a{
-    width: 148px;
-    height: 148px;
-    display: block;
-  }
-  .refund-item-imgs .item-image a img{
-    width: 148px;
-    height: 148px;
-    display: block;
-  }
-  .order-item{
-    background:#F7F7F7;
-    padding:10px 20px;
-    box-sizing: border-box;
-    border-radius: 5px;
-    margin-bottom: 10px;
-  }
-  .product-row{
-    padding: 10px 0;
-    background: #EBEEF5;
-    border-top: 1px dashed #DCDFE6;
-  }
-  .op-item{
-    padding: 5px 0;
-  }
+::v-deep .el-row {
+  position: relative;
+}
+.function {
+  position: absolute;
+  right: 0;
+  width: auto;
+}
+.app-title {
+  float: left;
+  line-height: 36px;
+  font-size: 18px;
+  font-weight: bold;
+  color: #999999;
+}
+.box-card {
+  margin-top: 20px;
+  font-size: 14px;
+}
+.box-row {
+  padding: 10px 0;
+}
+.box-row .dropdown {
+  margin-top: -10px;
+}
+.refund-item {
+  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 a {
+  width: 148px;
+  height: 148px;
+  display: block;
+}
+.refund-item-imgs .item-image a img {
+  width: 148px;
+  height: 148px;
+  display: block;
+}
+.order-item {
+  background: #f7f7f7;
+  padding: 10px 20px;
+  box-sizing: border-box;
+  border-radius: 5px;
+  margin-bottom: 10px;
+}
+.product-row {
+  padding: 10px 0;
+  background: #ebeef5;
+  border-top: 1px dashed #dcdfe6;
+}
+.op-item {
+  padding: 5px 0;
+}
 </style>
-

src/views/order/list.vue

@@ -127,10 +127,8 @@
       </div>
       <div class="filter-control">
         <span>订单来源:</span>
-        <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">
-          <el-option value="" label="所有" />
-          <el-option label="【采美】平台" value="99" />
-          <el-option label="【丽格集采联盟】平台" value="7" />
+        <el-select v-model="listQuery.organizeId" style="width:180px;" clearable @change="getList">
+          <el-option label="【丽格集采联盟】平台" :value="4" />
         </el-select>
       </div>
       <div class="filter-control">
@@ -239,7 +237,7 @@ export default {
       listQuery: {
         index: 1,
         pageSize: 10,
-        organizeId: this.$store.getters.organizeId,
+        organizeId: 4,
         orderId: '',
         orderNo: '',
         buyer: '',

src/views/order/order-remarks.vue

@@ -2,12 +2,12 @@
   <div class="app-container">
     <div v-if="orderNoteList.length === 0" class="order_empty">
       <span>暂无订单备注</span>
-      <el-button type="primary" @click="handlePayNote">添加备注</el-button>
+      <!-- <el-button type="primary" @click="handlePayNote">添加备注</el-button> -->
     </div>
     <div v-else>
-      <div class="filter-container" style="text-align: right; padding: 0;">
+      <!-- <div class="filter-container" style="text-align: right; padding: 0;">
         <el-button type="primary" @click="handlePayNote">添加备注</el-button>
-      </div>
+      </div> -->
       <el-card v-for="item in orderNoteList" :key="item.id" class="box-card" style="margin: 0 auto;">
         <div class="refund-item">
           <el-form label-width="120px">
@@ -57,10 +57,13 @@ export default {
     },
     disabled() {
       return this.productRadio === null
+    },
+    shopOrderId() {
+      return this.$route.query.shopOrderId * 1
     }
   },
   created() {
-    this.orderNotes(this.orderId)
+    this.orderNotes({ orderId: this.orderId, shopOrderId: this.shopOrderId })
   },
   methods: {
     // 获取订单备注列表

src/views/order/refund-detail.vue

@@ -13,11 +13,11 @@
             <el-col :span="5"><b>退款编号：</b> {{ cmReturnedPurchase.returnedNo }}</el-col>
             <el-col :span="5"><b>申请时间：</b> {{ cmReturnedPurchase.returnTime }}</el-col>
             <el-col :span="4"><b>申请金额：</b> ¥{{ cmReturnedPurchase.refundFee | amountfilters }} </el-col>
-            <el-col :span="4"><b>退款审核状态：</b>
+            <!-- <el-col :span="4"><b>退款审核状态：</b>
               <el-tag v-if="cmReturnedPurchase.status*1===1" type="warning" size="small">待审核</el-tag>
               <el-tag v-if="cmReturnedPurchase.status*1===2" type="success" size="small">审核通过</el-tag>
               <el-tag v-if="cmReturnedPurchase.status*1===3" type="danger" size="small">审核不通过</el-tag>
-            </el-col>
+            </el-col> -->
           </el-row>
           <h1 class="refund-item-title">退款方式</h1>
           <el-row :gutter="24" class="box-row">
@@ -34,10 +34,10 @@
                   <b>线下转账：</b>
                   <span>¥{{ cmReturnedPurchase.refundOfflineFee | amountfilters }}</span>
                 </el-col>
-                <el-col :span="4"><b>开户名：</b><span>{{ cmReturnedPurchase.bankAccountName }}</span> </el-col>
+                <!-- <el-col :span="4"><b>开户名：</b><span>{{ cmReturnedPurchase.bankAccountName }}</span> </el-col>
                 <el-col :span="4"><b>账号：</b> <span>{{ cmReturnedPurchase.bankAccountNo }}</span> </el-col>
                 <el-col :span="4"><b>开户行：</b> <span>{{ cmReturnedPurchase.openBank }}</span> </el-col>
-                <el-col :span="4"><b>账户类型：</b> <span>{{ cmReturnedPurchase.bankAccountType*1 === 1 ? '公账' : '私账' }}</span> </el-col>
+                <el-col :span="4"><b>账户类型：</b> <span>{{ cmReturnedPurchase.bankAccountType*1 === 1 ? '公账' : '私账' }}</span> </el-col> -->
               </template>
             </template>
             <span v-else>----</span>
@@ -46,7 +46,7 @@
       </el-card>
       <el-card ref="print" class="box-card" style="margin: 5px auto;">
         <div class="refund-item">
-          <el-row :gutter="24" class="box-row">
+          <!-- <el-row :gutter="24" class="box-row">
             <el-col :span="5">
               <b>订单编号(ID)：</b>{{ orderData.orderNo }}({{ orderData.orderId }})
             </el-col>
@@ -100,7 +100,7 @@
             <el-col :span="5"><b>机构名称：</b> {{ orderData.clubName }}</el-col>
             <el-col :span="5"><b>收货人：</b> {{ orderData.receiver }}({{ orderData.mobile }})</el-col>
             <el-col :span="14"><b>地址：</b> {{ orderData.address }}</el-col>
-          </el-row>
+          </el-row> -->
           <el-table :data="orderData.newShopOrders" border fit highlight-current-row default-expand-all :header-cell-style="{background:'#e9f3f7',color:'#606266'}">
             <el-table-column label="商品信息" type="expand" width="110">
               <template slot-scope="{row}">
@@ -152,11 +152,12 @@
                 <el-tag v-else type="info" size="small">无退款</el-tag>
               </template>
             </el-table-column>
+            <el-table-column label="运费" align="center" prop="postageInfo" />
             <el-table-column label="供应商" align="center" prop="shopName" />
           </el-table>
         </div>
       </el-card>
-      <el-card ref="print" class="box-card" style="margin: 5px auto;">
+      <!-- <el-card ref="print" class="box-card" style="margin: 5px auto;">
         <div class="refund-item">
           <h1 class="refund-item-title">审核信息</h1>
           <el-row :gutter="24" class="box-row">
@@ -170,7 +171,7 @@
             </el-col>
           </el-row>
         </div>
-      </el-card>
+      </el-card> -->
       <el-card ref="print" class="box-card" style="margin: 5px auto;">
         <div class="refund-item">
           <h1 class="refund-item-title">申请信息</h1>
@@ -291,7 +292,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
   .app-title{
     line-height: 32px;
     font-size: 24px;
@@ -342,10 +343,10 @@ export default {
   .el-span-danger{
     color: #F56C6C;
   }
-  /deep/ .el-table__expanded-cell[class*=cell]{
+  ::v-deep .el-table__expanded-cell[class*=cell]{
     padding:10px 10px !important;
   }
-  /deep/ .el-card__body{
+  ::v-deep .el-card__body{
     padding: 5px 20px !important;
   }
 </style>

src/views/order/refund.vue

@@ -54,7 +54,7 @@
     >
       <el-table-column label="退款编号" align="center" prop="returnedNo" />
       <el-table-column label="订单编号(ID)" align="center" prop="orderNo" width="200">
-        <template slot-scope="{row}">{{ row.orderNo + '(' + row.orderId + ')' }}</template>
+        <template slot-scope="{row}">{{ row.shopOrderReturnedList[0].shopOrderNo + '(' + row.shopOrderReturnedList[0].shopOrderId + ')' }}</template>
       </el-table-column>
       <el-table-column label="机构" align="center" prop="clubName" />
       <el-table-column label="退款金额" align="center" prop="refundFee" width="110">
@@ -81,7 +81,7 @@
           <span>{{ row.returnTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核人" align="center" prop="reviewUserName" width="100">
+      <!-- <el-table-column label="审核人" align="center" prop="reviewUserName" width="100">
         <template slot-scope="{row}">
           <span>{{ row.reviewUserName ? row.reviewUserName : '--' }}</span>
         </template>
@@ -97,7 +97,7 @@
           <el-tag v-if="row.status*1===2" type="success" size="small">审核通过</el-tag>
           <el-tag v-if="row.status*1===3" type="danger" size="small">审核不通过</el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
           <el-button type="primary" size="mini" @click="handleDetailes(row)">查看详情</el-button>
@@ -158,6 +158,7 @@ export default {
       try {
         const res = await getRefundList(this.listQuery)
         this.list = res.data.results
+        console.log(this.list)
         this.total = res.data.totalRecord
         this.listLoading = false
       } catch (error) {