Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

647556386

3 天以前 696edbff3c8812e4b820f624d66a02ae6ddb1a06

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue

@@ -1,37 +1,24 @@

<template>
  <view-grid
    ref="grid"
    @openPalletDialog="handleOpenPalletDialog"
    :columns="columns"
    :detail="detail"
    :editFormFields="editFormFields"
    :editFormOptions="editFormOptions"
    :searchFormFields="searchFormFields"
    :searchFormOptions="searchFormOptions"
    :table="table"
    :extend="extend"
  >
  <view-grid ref="grid" @openPalletDialog="handleOpenPalletDialog" :columns="columns" :detail="detail"
    :editFormFields="editFormFields" :editFormOptions="editFormOptions" :searchFormFields="searchFormFields"
    :searchFormOptions="searchFormOptions" :table="table" :extend="extend">
  </view-grid>
      <!-- 2. ç»„盘弹窗：确保props和事件绑定正确 -->
    <PalletDialog
      v-model:visible="palletVisible"  
      :docNo="currentPalletDocNo"     
      @back-success="handlePalletBackSuccess"  
    ></PalletDialog>

  <!-- 2. ç»„盘弹窗：确保props和事件绑定正确 -->
  <PalletDialog v-model:visible="palletVisible" :docNo="currentPalletDocNo" @back-success="handlePalletBackSuccess">
  </PalletDialog>
</template>
    <script>
<script>
import extend from "@/extension/inbound/allocateinboundOrder.js";
import ViewGrid from '@/components/basic/ViewGrid/ViewGrid.vue'; 
import ViewGrid from '@/components/basic/ViewGrid/ViewGrid.vue';
import { ref, defineComponent } from "vue";
import PalletDialog from "@/extension/inbound/extend/Pallet.vue";
export default defineComponent({
   components: {
  components: {
    // å…³é”®ä¿®å¤2：组件注册名与模板标签名适配（kebab-case对应view-grid）
    viewGrid: ViewGrid,  // æ³¨å†Œä¸ºkebab-case，模板用<view-grid>
    PalletDialog      // æ³¨å†Œç»„盘弹窗
 

  },
  setup() {
    const table = ref({
@@ -86,8 +73,7 @@
    });
    const searchFormOptions = ref([
      [
        { title: "单据编号", field: "orderNo", type: "like" },
        { title: "上游单据编号", field: "upperOrderNo", type: "like" },
        { title: "请扫描单据或条码", field: "orderNo", type: "like" },
        {
          title: "单据类型",
          field: "orderType",
@@ -105,14 +91,17 @@
      ],
      [
        {
          title: "创建方式",
          field: "createType",
          title: "回传MES状态",
          field: "returnToMESStatus",
          type: "select",
          dataKey: "createType",
          dataKey: "outboundReturnToMESStatus",
          data: [],
        },
        { title: "创建者", field: "creater", type: "like" },
        { title: "物料编号", field: "materielCode", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
      [
        { title: "物料名称", field: "materielName", type: "like" },
      ],
    ]);
    const columns = ref([
@@ -156,6 +145,7 @@
        width: 150,
        align: "left",
        bind: { key: "businessType", data: [] },
        hidden: true,
      },
      {
        field: "orderStatus",
@@ -174,11 +164,30 @@
        bind: { key: "createType", data: [] },
      },
      {
        field: "fromWarehouse",
        title: "调出仓库",
        type: "string",
        width: 120,
        align: "left",
      },
      {
        field: "toWarehouse",
        title: "调入仓库",
        type: "string",
        width: 120,
        align: "left",
      },
      {
        field: "factoryArea",
        title: "厂区",
        type: "string",
        width: 120,
        align: "left"
      },{
        field: "returnToMESStatus",
        title: "回传MES状态",
        width: 120,
        bind: { key: "createType", data: [{ key: 0, value: "未回传" }, { key: 1, value: "已回传成功" }, { key: 2, value: "回传失败" },{ key: 3, value: "部分回传成功" },{ key: 4, value: "部分回传失败" },{ key: 5, value: "无需回传" }] },
      },
      {
        field: "creater",
@@ -248,12 +257,12 @@
          required: true,
        },
        {
          field: "materielCode",
          field: "materielName",
          title: "物料名称",
          type: "string",
          width: 100,
          align: "left",
          bind: { key: "MaterielNames", data: [] },
          bind: { key: "materielInfo", data: [] },
        },
        {
          field: "batchNo",
@@ -291,6 +300,14 @@
          required: true,
        },
        {
          field: "outBoxbarcodes",
          title: "外箱条码",
          type: "decimal",
          width: 90,
          align: "left",
          required: true,
        },
        {
          field: "orderQuantity",
          title: "单据数量",
          type: "decimal",
@@ -320,6 +337,13 @@
          width: 180,
          align: "left",
          bind: { key: "orderDetailStatusEnum", data: [] },
        },
        {
          field: "pallet",
          title: "已组托盘号",
          type: "string",
          width: 180,
          align: "left",
        },
        {
          field: "creater",
@@ -360,7 +384,7 @@
      sortName: "id",
      key: "id",
    });
     // 6. ç»„盘弹窗联动（所有变量必须返回）
    // 6. ç»„盘弹窗联动（所有变量必须返回）
    const palletVisible = ref(false);
    const currentPalletDocNo = ref("");

@@ -384,7 +408,7 @@
      searchFormOptions,
      columns,
      detail,
       // ç»„盘弹窗相关
      // ç»„盘弹窗相关
      PalletDialog,    // å¼¹çª—组件（无需返回，注册即可，但变量需返回）
      palletVisible,
      currentPalletDocNo,