谷养正道

src/api/hisStore/guCoinOrder.js

@@ -35,6 +35,22 @@ export function updateGuCoinOrder(data) {
   })
 }
 
+// 查询谷币订单物流信息
+export function getGuCoinOrderExpress(orderId) {
+  return request({
+    url: '/his/guCoinOrder/getExpress/' + orderId,
+    method: 'get'
+  })
+}
+
+// 同步谷币订单物流状态
+export function syncGuCoinOrderExpress(orderId) {
+  return request({
+    url: '/his/guCoinOrder/syncExpress/' + orderId,
+    method: 'get'
+  })
+}
+
 // 删除谷币订单
 export function delGuCoinOrder(orderIds) {
   return request({

src/views/hisStore/guCoinOrder/index.vue

@@ -80,14 +80,24 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="快递公司" align="center" prop="deliveryCode" width="100" />
       <el-table-column label="快递名称" align="center" prop="deliveryName" />
       <el-table-column label="快递单号" align="center" prop="deliverySn" width="160" />
+      <el-table-column label="签收状态" align="center" prop="deliveryStatus" width="100">
+        <template slot-scope="scope">
+          <dict-tag v-if="scope.row.deliveryStatus != null" :options="deliveryStatusOptions" :value="scope.row.deliveryStatus" />
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="发货时间" align="center" prop="deliveryTime" width="160" />
+      <el-table-column label="跟单时间" align="center" prop="followTime" width="160" />
       <el-table-column label="下单时间" align="center" prop="createTime" width="160" />
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="100">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button size="mini" type="text" v-hasPermi="['his:guCoinOrder:query']" @click="handleDetail(scope.row)">详情</el-button>
+          <el-button size="mini" type="text" v-hasPermi="['his:guCoinOrder:express']" @click="handleExpress(scope.row)" v-if="scope.row.deliverySn">查看物流</el-button>
+          <el-button size="mini" type="text" v-hasPermi="['his:guCoinOrder:edit']" @click="handleEdit(scope.row)">订单修改</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -120,10 +130,21 @@
         <el-descriptions-item label="支付类型">{{ payTypeText(detailData.payType) }}</el-descriptions-item>
         <el-descriptions-item label="支付状态">{{ detailData.isPay === 1 ? '已支付' : '未支付' }}</el-descriptions-item>
         <el-descriptions-item label="支付时间">{{ detailData.payTime }}</el-descriptions-item>
+        <el-descriptions-item label="快递公司">{{ detailData.deliveryCode || '-' }}</el-descriptions-item>
         <el-descriptions-item label="快递名称">{{ detailData.deliveryName }}</el-descriptions-item>
         <el-descriptions-item label="快递单号">{{ detailData.deliverySn }}</el-descriptions-item>
+        <el-descriptions-item label="签收状态">
+          <dict-tag v-if="detailData.deliveryStatus != null" :options="deliveryStatusOptions" :value="detailData.deliveryStatus" />
+          <span v-else>-</span>
+        </el-descriptions-item>
         <el-descriptions-item label="发货时间">{{ detailData.deliveryTime }}</el-descriptions-item>
+        <el-descriptions-item label="跟单时间">{{ detailData.followTime || '-' }}</el-descriptions-item>
         <el-descriptions-item label="下单时间">{{ detailData.createTime }}</el-descriptions-item>
+        <el-descriptions-item label="代收金额">{{ detailData.collectionPrice != null ? detailData.collectionPrice : '-' }}</el-descriptions-item>
+        <el-descriptions-item label="退款金额">{{ detailData.refundPrice != null ? detailData.refundPrice : '-' }}</el-descriptions-item>
+        <el-descriptions-item label="退款日期">{{ detailData.refundTime || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="拒收回退时间">{{ detailData.rejectReturnTime || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="病名">{{ detailData.diseaseName || '-' }}</el-descriptions-item>
         <el-descriptions-item label="销售ID">{{ detailData.companyUserId }}</el-descriptions-item>
         <el-descriptions-item label="销售公司ID">{{ detailData.companyId }}</el-descriptions-item>
         <el-descriptions-item label="企业微信ID">{{ detailData.qwUserId }}</el-descriptions-item>
@@ -156,11 +177,98 @@
         <el-button @click="detailOpen = false">关 闭</el-button>
       </div>
     </el-dialog>
+
+    <!-- 物流信息对话框 -->
+    <el-dialog title="物流信息" :visible.sync="expressOpen" width="700px" append-to-body>
+      <div style="margin-bottom: 10px;">
+        <el-button size="mini" type="primary" v-hasPermi="['his:guCoinOrder:syncExpress']" @click="handleSyncExpress(expressRow)" v-if="expressRow && expressRow.deliverySn">同步快递鸟物流状态</el-button>
+      </div>
+      <el-table style="width: 100%" :data="traces" border>
+        <el-table-column label="操作时间" width="160" align="center" prop="AcceptTime" />
+        <el-table-column label="位置" align="center" prop="Location" />
+        <el-table-column label="描述" align="center" prop="AcceptStation" />
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="expressOpen = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 订单修改对话框 -->
+    <el-dialog title="订单修改" :visible.sync="editOpen" width="600px" append-to-body :close-on-click-modal="false">
+      <el-form ref="editForm" :model="editForm" label-width="120px">
+        <el-form-item label="订单状态">
+          <el-select v-model="editForm.status" placeholder="请选择订单状态" clearable size="small" style="width:200px;">
+            <el-option
+              v-for="item in statusOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="跟单时间">
+          <el-date-picker v-model="editForm.followTime" type="datetime" placeholder="请选择跟单时间" size="small" style="width:200px;" value-format="yyyy-MM-dd HH:mm:ss" />
+        </el-form-item>
+        <el-form-item label="快递类型">
+          <el-input v-model="editForm.deliveryName" placeholder="请输入快递类型" clearable size="small" style="width:200px;" />
+        </el-form-item>
+        <el-form-item label="快递公司">
+          <el-input v-model="editForm.deliveryCode" placeholder="请输入快递公司编号" clearable size="small" style="width:200px;" />
+        </el-form-item>
+        <el-form-item label="签收状态">
+          <el-select v-model="editForm.deliveryStatus" placeholder="请选择签收状态" clearable size="small" style="width:200px;">
+            <el-option
+              v-for="item in deliveryStatusOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="Number(item.dictValue)"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="代收金额">
+          <el-input-number v-model="editForm.collectionPrice" :precision="2" :min="0" size="small" style="width:200px;" />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="editForm.remark" type="textarea" :rows="3" placeholder="请输入备注" style="width:350px;" />
+        </el-form-item>
+        <el-form-item label="退款金额">
+          <el-input-number v-model="editForm.refundPrice" :precision="2" :min="0" size="small" style="width:200px;" />
+        </el-form-item>
+        <el-form-item label="退款日期">
+          <el-date-picker v-model="editForm.refundTime" type="datetime" placeholder="请选择退款日期" size="small" style="width:200px;" value-format="yyyy-MM-dd HH:mm:ss" />
+        </el-form-item>
+        <el-form-item label="拒收回退时间" v-if="showRejectReturnTime">
+          <el-date-picker v-model="editForm.rejectReturnTime" type="datetime" placeholder="请选择拒收回退时间" size="small" style="width:200px;" value-format="yyyy-MM-dd HH:mm:ss" />
+        </el-form-item>
+        <el-form-item label="是否还货" v-if="showReturnGoods">
+          <el-select v-model="editForm.isReturnGoods" placeholder="请选择是否还货" clearable size="small" style="width:200px;">
+            <el-option label="是" :value="1" />
+            <el-option label="否" :value="2" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="病名">
+          <el-input v-model="editForm.diseaseName" placeholder="请输入病名" clearable size="small" style="width:200px;" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="editOpen = false">取 消</el-button>
+        <el-button type="primary" @click="submitEditConfirm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 确认修改对话框 -->
+    <el-dialog title="确认修改" :visible.sync="editConfirmOpen" width="360px" append-to-body>
+      <span>确认修改该订单信息吗？</span>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="editConfirmOpen = false">取 消</el-button>
+        <el-button type="primary" @click="submitEdit">确 认</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listGuCoinOrder, getGuCoinOrder } from "@/api/hisStore/guCoinOrder";
+import { listGuCoinOrder, getGuCoinOrder, updateGuCoinOrder, getGuCoinOrderExpress, syncGuCoinOrderExpress } from "@/api/hisStore/guCoinOrder";
 
 export default {
   name: "GuCoinOrder",
@@ -174,13 +282,37 @@ export default {
       detailData: null,
       itemList: [],
       actName: "10",
-      // 1待发货 2待收货 3已完成 4待支付 -1取消
+      // 物流弹窗
+      expressOpen: false,
+      expressRow: null,
+      traces: [],
+      // 订单修改弹窗
+      editOpen: false,
+      editConfirmOpen: false,
+      editForm: {
+        orderId: null,
+        status: null,
+        followTime: null,
+        deliveryName: null,
+        deliveryCode: null,
+        deliveryStatus: null,
+        collectionPrice: null,
+        remark: null,
+        refundPrice: null,
+        refundTime: null,
+        rejectReturnTime: null,
+        diseaseName: null,
+        isReturnGoods: null
+      },
+      // 字典
+      deliveryStatusOptions: [],
+      // 1待发货 2待收货 3已完成 4待支付 5已取消
       statusOptions: [
         { value: 4, label: "待支付" },
         { value: 1, label: "待发货" },
         { value: 2, label: "待收货" },
         { value: 3, label: "已完成" },
-        { value: -1, label: "取消" }
+        { value: 5, label: "已取消" }
       ],
       queryParams: {
         pageNum: 1,
@@ -192,8 +324,30 @@ export default {
       }
     };
   },
+  computed: {
+    showRejectReturnTime() {
+      if (this.editForm.deliveryStatus == null) return false;
+      const statusItem = this.deliveryStatusOptions.find(item => Number(item.dictValue) === this.editForm.deliveryStatus);
+      if (statusItem) {
+        const label = statusItem.dictLabel;
+        return ['已拒收', '已退回', '退回签收'].includes(label);
+      }
+      return false;
+    },
+    showReturnGoods() {
+      if (this.editForm.deliveryStatus == null) return false;
+      const statusItem = this.deliveryStatusOptions.find(item => Number(item.dictValue) === this.editForm.deliveryStatus);
+      if (statusItem) {
+        return statusItem.dictLabel === '已拒收';
+      }
+      return false;
+    }
+  },
   created() {
     this.getList();
+    this.getDicts("sys_store_order_delivery_status").then(response => {
+      this.deliveryStatusOptions = response.data;
+    });
   },
   methods: {
     getList() {
@@ -231,7 +385,7 @@ export default {
         case 1: return "warning";
         case 2: return "primary";
         case 3: return "success";
-        case -1: return "info";
+        case 5: return "info";
         default: return "info";
       }
     },
@@ -256,6 +410,77 @@ export default {
         }
         this.detailOpen = true;
       });
+    },
+    handleExpress(row) {
+      this.expressRow = row;
+      this.expressOpen = true;
+      this.traces = [];
+      getGuCoinOrderExpress(row.orderId).then(response => {
+        const express = response.data;
+        if (express != null && express.Traces != null) {
+          this.traces = express.Traces;
+        }
+      });
+    },
+    handleSyncExpress(row) {
+      if (!row || !row.orderId) {
+        this.msgError("请选择订单");
+        return;
+      }
+      this.$confirm("确定同步物流状态吗？", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return syncGuCoinOrderExpress(row.orderId);
+      }).then(() => {
+        this.msgSuccess("同步成功");
+        this.getList();
+        // 同步后刷新物流弹窗
+        if (this.expressRow && this.expressRow.orderId === row.orderId) {
+          this.handleExpress(row);
+        }
+      }).catch(() => {});
+    },
+    handleEdit(row) {
+      getGuCoinOrder(row.orderId).then(response => {
+        const d = response.data;
+        this.editForm = {
+          orderId: d.orderId,
+          status: d.status,
+          followTime: d.followTime || null,
+          deliveryName: d.deliveryName || null,
+          deliveryCode: d.deliveryCode || null,
+          deliveryStatus: d.deliveryStatus != null ? d.deliveryStatus : null,
+          collectionPrice: d.collectionPrice != null ? Number(d.collectionPrice) : null,
+          remark: d.remark || null,
+          refundPrice: d.refundPrice != null ? Number(d.refundPrice) : null,
+          refundTime: d.refundTime || null,
+          rejectReturnTime: d.rejectReturnTime || null,
+          diseaseName: d.diseaseName || null,
+          isReturnGoods: d.isReturnGoods != null ? d.isReturnGoods : null
+        };
+        this.editOpen = true;
+      });
+    },
+    submitEditConfirm() {
+      this.editConfirmOpen = true;
+    },
+    submitEdit() {
+      updateGuCoinOrder(this.editForm).then(response => {
+        if (response.code === 200) {
+          this.msgSuccess("修改成功");
+          this.editConfirmOpen = false;
+          this.editOpen = false;
+          this.$nextTick(() => {
+            this.getList();
+          });
+        } else {
+          this.msgError(response.msg || "修改失败");
+        }
+      }).catch(() => {
+        this.editConfirmOpen = false;
+      });
     }
   }
 };