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

wangxinhui

昨天 526b70eecc5dac5aea91bfffbe0b98118f25827f

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/outbound/mesOutboundOrder.vue

@@ -14,7 +14,7 @@
    </view-grid>
  </template>
    <script>
  import extend from "@/extension/outbound/outboundOrderDetail.js";
  import extend from "@/extension/outbound/mesOutboundOrder.js";
  import { ref, defineComponent } from "vue";
  export default defineComponent({
    setup() {
@@ -27,73 +27,23 @@
        sortName: "id",
      });
      const editFormFields = ref({
        deviceCode: "",
        deviceName: "",
        deviceType: "",
        deviceStatus: "",
        deviceIp: "",
        devicePort: "",
        devicePlcType: "",
        deviceRemark: "",
      });
      const editFormOptions = ref([
        [
          {
            title: "设备编号",
            required: true,
            field: "deviceCode",
            type: "string",
          },
          {
            title: "设备名称",
            required: true,
            field: "deviceName",
            type: "string",
          },
          {
            title: "设备类型",
            required: true,
            field: "deviceType",
            type: "string",
          },
          {
            title: "设备状态",
            required: true,
            field: "deviceStatus",
            type: "string",
          },
        ],
        [
          { title: "设备IP", required: true, field: "deviceIp", type: "string" },
          {
            title: "设备端口",
            required: true,
            field: "devicePort",
            type: "string",
          },
          {
            title: "PLC类型",
            required: true,
            field: "devicePlcType",
            type: "string",
          },
          {
            title: "备注",
            field: "deviceRemark",
            type: "string",
          },
        ],
      ]);
      const searchFormFields = ref({
        deviceCode: "",
        deviceType: "",
        deviceStatus: "",
        orderNo: "",
        taskNo:"",
        materialCode: "",
        batchNo: "",
      });
      const searchFormOptions = ref([
        [
          { title: "设备编号", field: "deviceCode" },
          { title: "设备类型", field: "deviceType" },
          { title: "设备状态", field: "deviceStatus" },
          { title: "单据编号", field: "orderNo", type:"like" },
          { title: "MES任务单号", field: "taskNo", type:"like" },
          { title: "物料编号", field: "materialCode" ,type:"like"},
          { title: "批次号", field: "batchNo" ,type:"like"},
        ],
      ]);
      const columns = ref([
@@ -107,23 +57,23 @@
          align: "left",
        },
        {
          field: "orderId",
          title: "出库单主键",
          field: "warehouseId",
          title: "所属仓库",
          type: "string",
          width: 90,
          width: 80,
          align: "left",
          hidden: true,
          bind: { key: "warehouses", data: [] },
        },
        {
          field: "materielCode",
          title: "物料编号",
          field: "orderNo",
          title: "单据编号",
          type: "string",
          width: 150,
          align: "left",
        },
        {
          field: "materielName",
          title: "物料名称",
          field: "taskNo",
          title: "MES任务单号",
          type: "string",
          width: 150,
          align: "left",
@@ -135,40 +85,78 @@
          width: 90,
          align: "left",
        },
        // {
        //   field: "OrderStatus",
        //   title: "单据数量",
        //   type: "string",
        //   width: 90,
        //   align: "left",
        //   bind: { key: "orderDetailStatusEnum", data: [] }
        // },
        {
          field: "orderQuantity",
          title: "单据数量",
          field: "createType",
          title: "创建方式",
          type: "string",
          width: 90,
          align: "left",
        },
        {
          field: "lockQuantity",
          title: "锁定数量",
          type: "int",
          width: 120,
          align: "left",
          bind: { key: "createType", data: [] },
        },
        {
          field: "overOutQuantity",
          title: "已出数量",
          field: "materialCode",
          title: "物料编号",
          type: "string",
          width: 200,
          align: "left",
        },
        {
          field: "orderDetailStatus",
          title: "订单明细状态",
          field: "materialName",
          title: "物料名称",
          type: "string",
          width: 180,
          align: "left",
        },
        {
          field: "creater",
          title: "创建人",
          field: "unit",
          title: "单位",
          type: "string",
          width: 90,
          align: "left",
        },
        {
          field: "orderQuantity",
          title: "单据数量",
          type: "datetime",
          width: 160,
          align: "left",
        },
        {
          field: "lockQuantity",
          title: "锁定数量",
          type: "string",
          width: 100,
          align: "left",
        },
        // {
        //   field: "overOutQuantity",
        //   title: "已出数量",
        //   type: "datetime",
        //   width: 160,
        //   align: "left",
        // },
        {
          field: "line",
          title: "线体",
          type: "string",
          width: 100,
          align: "left",
        },
        {
          field: "targetAddressCode",
          title: "线边仓地址码",
          type: "string",
          width: 100,
          align: "left",
          hidden: true
        },
        {
          field: "createDate",
@@ -178,22 +166,8 @@
          align: "left",
        },
        {
          field: "modifier",
          title: "修改人",
          type: "string",
          width: 100,
          align: "left",
        },
        {
          field: "modifyDate",
          title: "修改时间",
          type: "datetime",
          width: 160,
          align: "left",
        },
        {
          field: "remark",
          title: "备注",
          field: "width",
          title: "裁切宽",
          type: "string",
          width: 100,
          align: "left",