阿拉蕾 1 year ago
parent
commit
e96fe2c28a
2 changed files with 33 additions and 16 deletions
  1. 8 0
      src/api/store/storeOrder.js
  2. 25 16
      src/views/store/components/productOrder.vue

+ 8 - 0
src/api/store/storeOrder.js

@@ -62,6 +62,14 @@ export function getStoreOrder(id) {
   })
 }
 
+// 查询订单详细
+export function getStoreOrderAddress(id) {
+  return request({
+    url: '/store/storeOrder/queryAddress/' + id,
+    method: 'get'
+  })
+}
+
 
 export function getExpress(id) {
   return request({

+ 25 - 16
src/views/store/components/productOrder.vue

@@ -145,6 +145,7 @@
                 trigger="hover"
                 :content="order.userAddress">
                 <span slot="reference">{{order.userAddress}}</span>
+                <el-button icon="el-icon-search" size="mini" @click="handleAddress()" style="margin-left: 20px;" circle v-hasPermi="['store:storeOrder:queryAddress']"></el-button>
               </el-popover>
             </el-descriptions-item>
             <el-descriptions-item label="档期归属"  >
@@ -288,21 +289,7 @@
           <el-table-column label="支付时间" align="center" prop="payTime" />
       </el-table>
 
-      <div style="margin-top: 20px">
-        <!-- <svg-icon icon-class="marker" style="color: #606266"></svg-icon> -->
-        <span class="font-small">分佣信息</span>
-      </div>
-      <el-table
-        border
-        :data="tuiMoneyLogs"
-        size="small"
-                style="width: 100%;margin-top: 20px" >
-          <el-table-column label="公司名称" align="center" prop="companyName" width="120px" />
-          <el-table-column label="金额" align="center" prop="money" />
-          <el-table-column label="余额" align="center" prop="balance" />
-          <el-table-column label="创建时间" align="center" prop="createTime" />
-          <el-table-column label="备注" align="center" prop="remark" />
-      </el-table>
+      
       <div style="margin-top: 20px">
         <span class="font-small">操作信息</span>
       </div>
@@ -320,6 +307,22 @@
           </template>
         </el-table-column>
       </el-table>
+
+      <div style="margin-top: 20px">
+        <!-- <svg-icon icon-class="marker" style="color: #606266"></svg-icon> -->
+        <span class="font-small">分佣信息</span>
+      </div>
+      <el-table
+        border
+        :data="tuiMoneyLogs"
+        size="small"
+                style="width: 100%;margin-top: 20px" >
+          <el-table-column label="公司名称" align="center" prop="companyName" width="120px" />
+          <el-table-column label="金额" align="center" prop="money" />
+          <el-table-column label="余额" align="center" prop="balance" />
+          <el-table-column label="创建时间" align="center" prop="createTime" />
+          <el-table-column label="备注" align="center" prop="remark" />
+      </el-table>
       </el-card>
     </div>
 
@@ -474,7 +477,7 @@
 </template>
 
 <script>
-import {auditPayRemain,addTuiMoney,syncExpress,updateExpress,getEroOrder,refundOrderMoney, editTuiMoney,getExpress,finishOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,updateDeliveryId, createErpOrder,updateErp} from "@/api/store/storeOrder";
+import {auditPayRemain,addTuiMoney,syncExpress,updateExpress,getEroOrder,refundOrderMoney, editTuiMoney,getExpress,finishOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,updateDeliveryId, createErpOrder,updateErp,getStoreOrderAddress} from "@/api/store/storeOrder";
 import { getTcmScheduleList } from "@/api/company/schedule";
 export default {
   name: "order",
@@ -571,6 +574,12 @@ export default {
     });
   },
   methods: {
+    handleAddress(){
+        const id = this.order.id;
+        getStoreOrderAddress(id).then(response =>{
+            this.order.userAddress = response.address;
+        }) 
+      },
     showImageDialog() {
       this.dialogVisible = true;
     },