Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-08-12 7d180121d133a3f2400ca2870cfb6cacd605d6cf

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/takeStockOrder.vue

@@ -1,5 +1,8 @@

<template>
    <!-- <div>
      <assemble-dist></assemble-dist>
    </div> -->
    <view-grid
      ref="grid"
      :columns="columns"
@@ -13,12 +16,17 @@
    >
    </view-grid>
  </template>
        <script>
<script>
  import extend from "@/extension/inbound/takeStockOrder.js";
  import { ref, defineComponent } from "vue";
  // import AssembleDistVue from '../charts/AssembleDist.vue';
  export default defineComponent({
    // components: {
    //   'assemble-dist': AssembleDistVue,
    // },
    setup() {
      const table = ref({
      //使用组件AssembleDist
      const table = ref({ 
        key: "id",
        footer: "Foots",
        cnName: "盘点单",
@@ -89,7 +97,7 @@
          type: "string",
          width: 120,
          align: "left",
          bind: { key: "returnStatus", data: [] },
          bind: { key: "takeStockStatusEnum", data: [] },
        },
        {
          field: "warehouseId",
@@ -136,8 +144,8 @@
        },
      ]);
      const detail = ref({
        cnName: "退料单明细",
        table: "Dt_ReturnOrderDetail",
        cnName: "盘点明细",
        table: "Dt_TakeStockOrderDetail",
        columns: [
          {
            field: "id",
@@ -158,22 +166,52 @@
            hidden: true,
          },
          {
            field: "takePalletCode",
            title: "盘点托盘",
            type: "string",
            width: 150,
            align: "left",
            required: true,
          },
          {
            field: "takeDetalStatus",
            title: "盘点明细状态",
            type: "int",
            width: 130,
            align: "left",
            bind: { key: "takeStockDetailStatusEnum", data: [] },
          },
          {
            field: "materielCode",
            title: "物料编码",
            type: "string",
            width: 90,
            width: 110,
            align: "left",
            required: true,
            edit: { type: "string" }
          },
          {
            field: "materielName",
            title: "物料名称",
            type: "string",
            width: 120,
            align: "left",
            required: true,
          },
          {
            field: "batchNo",
            title: "批次号",
            type: "string",
            width: 90,
            width: 130,
            align: "left",
            required: true,
            edit: { type: "string" }
          },
          {
            field: "materielSpec",
            title: "物料名称",
            type: "string",
            width: 120,
            align: "left",
            required: true,
          },
          {
            field: "sysQty",
@@ -192,20 +230,6 @@
            align: "left",
            required: true,
            edit: { type: "decimal" }
          },
          {
            field: "materielName",
            title: "物料名称",
            type: "string",
            width: 90,
            align: "left"
          },
          {
            field: "materielSpec",
            title: "物料规格",
            type: "string",
            width: 90,
            align: "left",
          },
          {
            field: "unit",