From 14fd6be62b0f3a78b97afabf883395117ce15c70 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Tue, 10 Mar 2026 17:52:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logisticsManagement/materialPacking.js    |  44 +++
 .../components/addLogisticsDialog.vue         |   2 +-
 .../components/addPackingDialog.vue           | 145 +++++++++
 .../components/receiveDialog.vue              |   2 +-
 .../components/returnDialog.vue               |  17 +-
 .../components/unbindDialog.vue               | 121 +++++++
 .../logisticsDistribution.vue                 |   5 +-
 .../logisticsManagement/materialPacking.vue   | 300 ++++++++++++++++++
 8 files changed, 623 insertions(+), 13 deletions(-)
 create mode 100644 src/api/logisticsManagement/materialPacking.js
 create mode 100644 src/views/logisticsManagement/components/addPackingDialog.vue
 create mode 100644 src/views/logisticsManagement/components/unbindDialog.vue
 create mode 100644 src/views/logisticsManagement/materialPacking.vue

diff --git a/src/api/logisticsManagement/materialPacking.js b/src/api/logisticsManagement/materialPacking.js
new file mode 100644
index 0000000..ef2bd75
--- /dev/null
+++ b/src/api/logisticsManagement/materialPacking.js
@@ -0,0 +1,44 @@
+import request from '@/axios';
+
+
+
+
+// 获取配送记录列表
+export const getList = (current, size, params) => {
+  return request({
+    url: '/blade-desk/order-bind/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
+// 提交 
+export const boxBinding = (data) => {
+  return request({
+    url: '/blade-desk/order-bind/box-binding',
+    method: 'post',
+    data: data,
+  });
+};
+
+// 获取订单信息
+export function getOrderInfo(params) {
+  return request({
+    url: '/logistics/orderInfo', // 实际接口路径
+    method: 'get',
+    params,
+  });
+}
+
+// 解绑 order-bind/box-unbind
+export const boxUnbind = (data) => {
+  return request({
+    url: '/blade-desk/order-bind/box-unbind',
+    method: 'post',
+    data: data,
+  });
+};
\ No newline at end of file
diff --git a/src/views/logisticsManagement/components/addLogisticsDialog.vue b/src/views/logisticsManagement/components/addLogisticsDialog.vue
index c679c60..cd2c8aa 100644
--- a/src/views/logisticsManagement/components/addLogisticsDialog.vue
+++ b/src/views/logisticsManagement/components/addLogisticsDialog.vue
@@ -6,7 +6,7 @@
     width="30%"
     @close="closeDialog"
   >
-    <el-form :model="form" ref="form" :rules="rules" label-width="auto">
+    <el-form :model="form" ref="form" :rules="rules" label-width="auto" @submit.prevent>
       <el-form-item label="箱条码" prop="boxBarcode">
         <el-input
           v-model="form.boxBarcode"
diff --git a/src/views/logisticsManagement/components/addPackingDialog.vue b/src/views/logisticsManagement/components/addPackingDialog.vue
new file mode 100644
index 0000000..88443e3
--- /dev/null
+++ b/src/views/logisticsManagement/components/addPackingDialog.vue
@@ -0,0 +1,145 @@
+<template>
+  <el-dialog
+    title="解绑配送"
+    append-to-body
+    :modelValue="openShow"
+    width="30%"
+    @close="closeDialog"
+  >
+    <el-form :model="form" ref="form" :rules="rules" label-width="auto" @submit.prevent>
+      <el-form-item label="箱条码：" prop="boxBarcode">
+        <el-input
+          v-model="form.boxBarcode"
+          @keyup.enter.prevent="changeCode"
+          placeholder="请扫描箱条码"
+        />
+      </el-form-item>
+      <el-form-item label="订单号：" prop="orderNo">
+        <el-input
+          v-model="form.orderNo"
+          @keyup.enter.prevent="changeOrderCode"
+          placeholder="请扫描箱条码"
+        />
+      </el-form-item>
+      <el-form-item label="流程卡号：" prop="orderNo">
+        <el-tag
+          :key="tag"
+          v-for="tag in orderIdList"
+          closable
+          :disable-transitions="false"
+          @close="handleClose(tag)"
+        >
+          {{ tag }}
+        </el-tag>
+      </el-form-item>
+    </el-form>
+    <!-- <el-table :data="orderIdList" style="width: 100%">
+      <el-table-column prop="id" label="订单号"> </el-table-column>
+      <el-table-column prop="name" label="作业中心"> </el-table-column>
+      <el-table-column label="操作" width="80" align="center">
+        <template #default="scope">
+          <el-button type="danger" size="small" @click="deleteOrder(scope.$index)">
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table> -->
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submit" :loading="submitLoading">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { boxBinding, getOrderInfo } from '@/api/logisticsManagement/materialPacking';
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      submitLoading: false,
+      tableData: [],
+      openShow: false,
+      form: {},
+      rules: {
+        boxBarcode: [{ required: true, message: '请扫描箱条码', trigger: 'blur' }],
+      },
+      workCenterOptions: [],
+      orderIdList:[]
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+  },
+  methods: {
+    // 扫描箱条码
+    changeCode() {
+      console.log('箱条码:', this.form.boxBarcode);
+      // 可在此处添加箱条码查询逻辑
+    },
+    // 扫描订单号 - 添加到流程卡号列表
+    changeOrderCode() {
+      const orderNo = this.form.orderNo?.trim();
+      if (!orderNo) {
+        this.$message.warning('请输入订单号');
+        return;
+      }
+
+      // 检查是否已存在
+      const exists = this.orderIdList.includes(orderNo);
+      if (exists) {
+        this.$message.warning('该订单号已添加');
+        this.form.orderNo = '';
+        return;
+      }
+
+      // 调用 API 获取订单信息（如果需要验证）
+       this.orderIdList.push(orderNo);
+        this.form.orderNo = '';
+    },
+    // 删除流程卡号标签
+    handleClose(tag) {
+      this.orderIdList = this.orderIdList.filter(item => item !== tag);
+    },
+    closeDialog() {
+      this.openShow = false;
+      this.form = {
+        boxBarcode: '',
+        orderNo: '',
+      };
+      this.orderIdList = [];
+      this.$emit('closeDialog');
+    },
+    submit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          
+          this.submitLoading = true;
+          let params = {
+            boxBarcode: this.form.boxBarcode,
+            orderIdList: this.orderIdList,
+          };
+
+          boxBinding(params)
+            .then(res => {
+              this.$message.success('操作成功');
+              this.submitLoading = false;
+              this.closeDialog();
+            })
+            .catch(err => {
+              this.submitLoading = false;
+            });
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/logisticsManagement/components/receiveDialog.vue b/src/views/logisticsManagement/components/receiveDialog.vue
index 7905369..a1e0365 100644
--- a/src/views/logisticsManagement/components/receiveDialog.vue
+++ b/src/views/logisticsManagement/components/receiveDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="退回" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
-    <el-form :model="form" ref="form" :rules="rules" label-width="auto">
+    <el-form :model="form" ref="form" :rules="rules" label-width="auto" @submit.prevent>
       <!-- <el-form-item label="箱条码" prop="boxBarcode">
         <el-input
           v-model="form.boxBarcode"
diff --git a/src/views/logisticsManagement/components/returnDialog.vue b/src/views/logisticsManagement/components/returnDialog.vue
index c09ee92..d199e2f 100644
--- a/src/views/logisticsManagement/components/returnDialog.vue
+++ b/src/views/logisticsManagement/components/returnDialog.vue
@@ -1,23 +1,21 @@
 <template>
-  <el-dialog title="退回" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
-    <el-form :model="form" ref="form" :rules="rules" label-width="auto">
-      <el-form-item label="箱条码" prop="boxBarcode">
+  <el-dialog title="新增" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
+    <el-form :model="form" ref="form" :rules="rules" label-width="auto" @submit.prevent>
+      <el-form-item label="箱条码">
         <el-input
           v-model="form.boxBarcode"
-          style=""
           @keyup.enter.native="changeCode"
           placeholder="请扫描箱条码"
         />
       </el-form-item>
-      <el-form-item label="站点码" prop="stationCode">
+      <el-form-item label="起点站点" prop="stationCode">
         <el-input
           v-model="form.stationCode"
-          style=""
           @keyup.enter.native="changeCode"
           placeholder="请扫描箱条码"
         />
       </el-form-item>
-      <el-form-item label="终点站" prop="endLocationId">
+      <el-form-item label="终点站点" prop="endLocationId">
         <el-select
           v-model="form.endLocationId"
           placeholder="请选择"
@@ -46,6 +44,7 @@
 import {
   returnWarehouseList,
   returnWarehouse,
+  boxBinding
 } from '@/api/logisticsManagement/logisticsDistribution';
 export default {
   props: {
@@ -102,10 +101,10 @@ export default {
             boxBarcode: this.form.boxBarcode,
             stationCode: this.form.stationCode,
 
-            endLocationId: this.form.endLocationId,
+            endWcId: this.form.endLocationId,
           };
 
-          returnWarehouse(params)
+          boxBinding(params)
             .then(res => {
               this.$message.success('操作成功');
               this.submitLoading = false;
diff --git a/src/views/logisticsManagement/components/unbindDialog.vue b/src/views/logisticsManagement/components/unbindDialog.vue
new file mode 100644
index 0000000..7a667dc
--- /dev/null
+++ b/src/views/logisticsManagement/components/unbindDialog.vue
@@ -0,0 +1,121 @@
+<template>
+  <el-dialog
+    title="新增配送"
+    append-to-body
+    :modelValue="openShow"
+    width="30%"
+    @close="closeDialog"
+  >
+    <el-form :model="form" ref="form" :rules="rules" label-width="auto" @submit.prevent>
+      <el-form-item label="箱条码：" prop="boxBarcode">
+        <el-input
+          v-model="form.boxBarcode"
+          @keyup.enter.prevent="changeCode"
+          placeholder="请扫描箱条码"
+        />
+      </el-form-item>
+      
+    </el-form>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submit" :loading="submitLoading">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { boxBinding, getOrderInfo } from '@/api/logisticsManagement/materialPacking';
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      submitLoading: false,
+      tableData: [],
+      openShow: false,
+      form: {},
+      rules: {
+        boxBarcode: [{ required: true, message: '请扫描箱条码', trigger: 'blur' }],
+      },
+      workCenterOptions: [],
+      orderIdList:[]
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+  },
+  methods: {
+    // 扫描箱条码
+    changeCode() {
+      console.log('箱条码:', this.form.boxBarcode);
+      // 可在此处添加箱条码查询逻辑
+    },
+    // 扫描订单号 - 添加到流程卡号列表
+    changeOrderCode() {
+      const orderNo = this.form.orderNo?.trim();
+      if (!orderNo) {
+        this.$message.warning('请输入订单号');
+        return;
+      }
+
+      // 检查是否已存在
+      const exists = this.orderIdList.includes(orderNo);
+      if (exists) {
+        this.$message.warning('该订单号已添加');
+        this.form.orderNo = '';
+        return;
+      }
+
+      // 调用 API 获取订单信息（如果需要验证）
+       this.orderIdList.push(orderNo);
+        this.form.orderNo = '';
+    },
+    // 删除流程卡号标签
+    handleClose(tag) {
+      this.orderIdList = this.orderIdList.filter(item => item !== tag);
+    },
+    closeDialog() {
+      this.openShow = false;
+      this.form = {
+        boxBarcode: '',
+        orderNo: '',
+      };
+      this.orderIdList = [];
+      this.$emit('closeDialog');
+    },
+    submit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          if (this.orderIdList.length === 0) {
+            this.$message.warning('请至少添加一个流程卡号');
+            return;
+          }
+
+          this.submitLoading = true;
+          let params = {
+            boxBarcode: this.form.boxBarcode,
+            orderList: this.orderIdList,
+          };
+
+          boxBinding(params)
+            .then(res => {
+              this.$message.success('操作成功');
+              this.submitLoading = false;
+              this.closeDialog();
+            })
+            .catch(err => {
+              this.submitLoading = false;
+            });
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/logisticsManagement/logisticsDistribution.vue b/src/views/logisticsManagement/logisticsDistribution.vue
index 8cc1e16..3ba1e6f 100644
--- a/src/views/logisticsManagement/logisticsDistribution.vue
+++ b/src/views/logisticsManagement/logisticsDistribution.vue
@@ -19,7 +19,7 @@
       <template #menu-left>
         <el-button type="primary" @click="addFn">新增</el-button>
         <el-button type="primary" @click="receiveFn">接收</el-button>
-        <el-button type="primary" @click="returnFn">退回</el-button>
+        <!-- <el-button type="primary" @click="returnFn">退回</el-button> -->
       </template>
       <template #menu-right> </template>
       <!-- <template #menu="{ row }">
@@ -212,7 +212,8 @@ export default {
       // this.rowItem = row;
     },
     addFn() {
-      this.showAddDialogd = true;
+      // this.showAddDialogd = true;
+       this.showReturnDialog = true;
     },
     closeDialog() {
       this.showAddDialogd = false;
diff --git a/src/views/logisticsManagement/materialPacking.vue b/src/views/logisticsManagement/materialPacking.vue
new file mode 100644
index 0000000..a29d05d
--- /dev/null
+++ b/src/views/logisticsManagement/materialPacking.vue
@@ -0,0 +1,300 @@
+<template>
+  <basic-container>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button type="primary" @click="addFn">新增</el-button>
+        <el-button type="primary" @click="unbindFn">解绑</el-button>
+      </template>
+      <template #menu-right> </template>
+    </avue-crud>
+    <!-- 新增 -->
+    <addPackingDialog
+      v-if="showAddDialogd"
+      :showDialog="showAddDialogd"
+      @closeDialog="closeDialog"
+    ></addPackingDialog>
+    <!-- 解绑 -->
+     <unbindDialog
+      v-if="showUnbindDialogd"
+      :showDialog="showUnbindDialogd"
+      :rowItem="rowItem"
+      @closeDialog="closeDialog"
+    ></unbindDialog>
+  </basic-container>
+</template>
+
+<script>
+import addPackingDialog from './components/addPackingDialog.vue';
+import unbindDialog from './components/unbindDialog.vue';
+import { getList ,boxUnbind} from '@/api/logisticsManagement/materialPacking';
+export default {
+  components: {
+    addPackingDialog,
+    unbindDialog
+  },
+  data() {
+    return {
+      showReceiveDialog: false,
+      showReturnDialog: false,
+      showAddDialogd: false,
+      showUnbindDialogd:false,
+      rowItem: {},
+      form: {},
+      selectionList: [],
+      query: {},
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        columnSort: true,
+        tip: false,
+        height: 'auto',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        addBtn: false,
+        editBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtnText: '修改',
+        labelWidth: 120,
+        menuWidth: 80,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: false,
+        filterBtn: true,
+        searchShowBtn: false,
+        excelBtn: true,
+        showOverflowTooltip: true,
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        gridBtn: false,
+        searchLabelPosition: 'left',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        align: 'center',
+        menu: false,
+        column: [
+          {
+            label: '箱条码',
+            prop: 'boxBarcode',
+            search: true,
+            sortable: true,
+            span: 12,
+          },
+        //   {
+        //     label: '作业中心',
+        //     prop: 'wcName',
+        //     search: false,
+        //     sortable: true,
+        //     span: 12,
+        //   },
+        //   {
+        //     label: '作业中心',
+        //     prop: 'wcId',
+        //     search: false,
+        //     sortable: true,
+        //     span: 12,
+        //     hide: true,
+        //     type: 'select',
+        //     filterable: true,
+        //     dicUrl: '/blade-desk/order/bs-list',
+        //     props: {
+        //       label: 'wcName',
+        //       value: 'id',
+        //     },
+        //   },
+          {
+            label: '状态',
+            prop: 'statusDesc',
+            search: false,
+            sortable: true,
+            span: 12,
+            type: 'select',
+            dicData: [
+              { label: '未绑定', value: 0 },
+              { label: '已绑定', value: 1 },
+              { label: '已解绑', value: 2 },
+           
+            ],
+          },
+          {
+            label: '创建时间',
+            prop: 'createTime',
+            search: false,
+            sortable: true,
+            span: 12,
+          },
+          {
+            label: '时间范围',
+            prop: 'crDate',
+            sortable: true,
+            filter: true,
+            // selectWidth: 150,
+            span: 8,
+            search: true,
+            width: 150,
+            searchSpan: 6,
+            hide: true,
+            type: 'date',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
+            startPlaceholder: '开始日期',
+            endPlaceholder: '结束日期',
+            rangeSeparator: '-',
+            searchRange: true,
+          },
+        ],
+      },
+
+      data: [],
+    };
+  },
+  methods: {
+    addFn() {
+      this.showAddDialogd = true;
+    },
+    unbindFn(){
+        this.showUnbindDialogd = true;
+    },
+    closeDialog() {
+      this.showAddDialogd = false;
+      this.showReturnDialog = false;
+      this.showReceiveDialog = false;
+      this.showUnbindDialogd=false;
+      this.onLoad(this.page, this.query);
+    },
+    rowSave(row, done, loading) {
+      // addPersonAbility(row).then(
+      //   () => {
+      //     this.onLoad(this.page);
+      //     this.$message({
+      //       type: 'success',
+      //       message: '操作成功!',
+      //     });
+      //     done();
+      //   },
+      //   error => {
+      //     window.console.log(error);
+      //     loading();
+      //   }
+      // );
+    },
+    rowUpdate(row, index, done, loading) {
+      // updatePersonAbility(row).then(
+      //   () => {
+      //     this.onLoad(this.page);
+      //     this.$message({
+      //       type: 'success',
+      //       message: '操作成功!',
+      //     });
+      //     done();
+      //   },
+      //   error => {
+      //     window.console.log(error);
+      //     loading();
+      //   }
+      // );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          // return removePersonAbility(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    handleChange(file, fileList) {
+      // proxy.$Export.xlsx(file.raw).then((data) => {
+      //     data.value = data.results;
+      // });
+      this.$message({
+        type: 'success',
+        message: '操作成功!',
+      });
+    },
+
+    onLoad(page, params = {}) {
+      this.loading = true;
+      if (this.query.crDate && this.query.crDate.length > 0) {
+        this.query.startTime = this.query.crDate[0] + ' 00:00:00';
+        this.query.endTime = this.query.crDate[1] + ' 00:00:00';
+      }
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        this.data = res.data.data.records;
+        this.loading = false;
+        this.page.total = res.data.data.total;
+      });
+    },
+  },
+  mounted() {},
+};
+</script>