合并

wangxinhui

2026-03-13 8dc2427e1c5e5e349bce2d72759034c406eb0848

 ÏîÄ¿´úÂë/WCS/WCSClient/src/views/PackInfo/packaxis.vue

@@ -1,21 +1,6 @@

<template>
  <view-grid
<<<<<<< HEAD
    ref="grid"
    :columns="columns"
    :detail="detail"
    :editFormFields="editFormFields"
    :editFormOptions="editFormOptions"
    :searchFormFields="searchFormFields"
    :searchFormOptions="searchFormOptions"
    :table="table"
    :extend="extend"
  >
  </view-grid>
</template>
  <script>
=======
      ref="grid"
      :columns="columns"
      :detail="detail"
@@ -29,7 +14,6 @@
  </view-grid>
</template>
<script>
>>>>>>> main
import extend from "@/extension/PackInfo/packaxis.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -42,41 +26,6 @@
      url: "/Packaxis/",
      sortName: "CreateDate",
    });
<<<<<<< HEAD
    const editFormFields = ref({});
    const editFormOptions = ref([]);
    const searchFormFields = ref({
      
    });
    const searchFormOptions = ref([
      [
        { title: "任务号", field: "taskNum", type: "int" },
        { title: "托盘编号", field: "palletCode", type: "like" },
        {
          title: "任务类型",
          field: "taskType",
          type: "selectList",
          dataKey: "taskType",
          data: [],
        },
        {
          title: "任务状态",
          field: "taskState",
          type: "selectList",
          dataKey: "taskState",
          data: [],
        },
      ],
      [
        { title: "起始地址", field: "sourceAddress", type: "like" },
        { title: "目标地址", field: "targetAddress", type: "like" },
        { title: "当前位置", field: "currentAddress", type: "like" },
        { title: "下一位置", field: "nextAddress", type: "like" },
      ],
      [
        { title: "巷道号", field: "roadway", type: "like", type: "select",dataKey: "Stacker",data: [],},
        { title: "创建人", field: "creater", type: "like" },
=======
    const editFormFields = ref({
      deviceCode:"",
      stationCode:"",
@@ -89,7 +38,7 @@
      axisYSpacing:"",
      axisZ:"",
      axisZCount:"",
      axisZSpacing:"",
      axisZSpacing:""
    });
    const editFormOptions = ref([
      [{
@@ -282,7 +231,6 @@
          field: "axisZCount",
          type: "like",
        },
>>>>>>> main
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
    ]);
@@ -300,16 +248,10 @@
      {
        field: "deviceCode",
        title: "设备编号",
<<<<<<< HEAD
        type: "int",
        width: 90,
        align: "left",
=======
        type: "string",
        width: 90,
        align: "left",
        bind: {key:"deviceCodes",data: []}
>>>>>>> main
      },
      {
        field: "stationCode",
@@ -317,24 +259,15 @@
        type: "string",
        width: 200,
        align: "left",
<<<<<<< HEAD
=======
        bind: {key:"stationCodes",data: []}
>>>>>>> main
      },
      {
        field: "packType",
        title: "垛型",
<<<<<<< HEAD
        type: "string",
        width: 150,
        align: "left",
=======
        type: "int",
        width: 150,
        align: "left",
        bind:{key:"packTypes",data:[]}
>>>>>>> main
      },
      {
        field: "packNum",
@@ -381,11 +314,7 @@
      {
        field: "axisYSpacing",
        title: "Y坐标码垛间距",
<<<<<<< HEAD
        type: "string",
=======
        type: "int",
>>>>>>> main
        width: 120,
        align: "left",
      },
@@ -406,11 +335,7 @@
      {
        field: "axisZSpacing",
        title: "Z坐标码垛间距",
<<<<<<< HEAD
        type: "string",
=======
        type: "int",
>>>>>>> main
        width: 120,
        align: "left",
      },
@@ -463,7 +388,3 @@
  },
});
</script>
<<<<<<< HEAD
  
=======
>>>>>>> main