From f10cf643e5be44f8dd525d91bb4953b46778a377 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期三, 25 二月 2026 17:16:34 +0800
Subject: [PATCH] 修复部分页面数据显示问题

---
 代码管理/WMS/WMSClient/src/views/stock/proStockInfo.vue |  337 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 173 insertions(+), 164 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo.vue"
index 021613b..a762b08 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo.vue"
@@ -1,168 +1,177 @@
 
 <template>
-    <view-grid
-      ref="grid"
-      :columns="columns"
-      :detail="detail"
-      :editFormFields="editFormFields"
-      :editFormOptions="editFormOptions"
-      :searchFormFields="searchFormFields"
-      :searchFormOptions="searchFormOptions"
-      :table="table"
-      :extend="extend"
-    >
-    </view-grid>
-  </template>
+  <view-grid
+    ref="grid"
+    :columns="columns"
+    :detail="detail"
+    :editFormFields="editFormFields"
+    :editFormOptions="editFormOptions"
+    :searchFormFields="searchFormFields"
+    :searchFormOptions="searchFormOptions"
+    :table="table"
+    :extend="extend"
+  >
+  </view-grid>
+</template>
     <script>
-  import extend from "@/extension/stock/proStockInfo.js";
-  import { ref, defineComponent } from "vue";
-  export default defineComponent({
-    setup() {
-      const table = ref({
-        key: "id",
-        footer: "Foots",
-        cnName: "鎴愬搧搴撳瓨淇℃伅",
-        name: "proStockInfo",
-        url: "/proStockInfo/",
-        sortName: "id",
-      });
-      const editFormFields = ref({
-        deviceCode: "",
-        deviceName: "",
-        deviceType: "",
-        deviceStatus: "",
-        deviceIp: "",
-        devicePort: "",
-        devicePlcType: "",
-        deviceRemark: "",
-      });
-      const editFormOptions = ref([
-       [
-        {field:'palletCode',title:'鑳舵鍙�',type:'string'},
-        {field:'locationCode',title:'璐т綅缂栧彿',type:'string'},
-       ]
-      ]);
-      const searchFormFields = ref({
-        palletCode: "",
-        locationCode: "",
-      });
-      const searchFormOptions = ref([
-        [
-          { title: "鑳舵鍙�", field: "palletCode" },
-          { title: "璐т綅缂栧彿", field: "locationCode" },
-        ],
-      ]);
-      const columns = ref([
-        {
-          field: "id",
-          title: "Id",
-          type: "int",
-          width: 90,
-          hidden: true,
-          readonly: true,
-          require: true,
-          align: "left",
-        },
-        {
-          field: "palletCode",
-          title: "鑳舵鍙�",
-          type: "string",
-          width: 90,
-          align: "left",
-        },  
-        {
-          field: "shipmentOrder",
-          title: "鍑鸿揣鍗曞彿",
-          type: "string",
-          width: 90,
-          align: "left",
-        },
-         {
-          field: "palletType",
-          title: "鑳舵绫诲瀷",
-          type: "string",
-          width: 90,
-          align: "left",
-        },
-        {
-          field: "locationCode",
-          title: "璐т綅缂栧彿",
-          type: "string",
-          width: 150,
-          align: "left",
-        },
-        // {
-        //   field: "isFull",
-        //   title: "鏄惁婊$洏",
-        //   type: "string",
-        //   width: 150,
-        //   align: "left",
-        //   bind: { key: "yesno", data: [] },
-        // },
-         {
-          field: "warehouseId",
-          title: "浠撳簱",
-          type: "select",
-          width: 100,
-          align: "left",
-          bind: { key: "warehouses", data: [] },
-        },
-        {
-          field: "creater",
-          title: "鍒涘缓浜�",
-          type: "string",
-          width: 90,
-          align: "left",
-        },
-        {
-          field: "createDate",
-          title: "鍒涘缓鏃堕棿",
-          type: "datetime",
-          width: 160,
-          align: "left",
-        },
-        {
-          field: "modifier",
-          title: "淇敼浜�",
-          type: "string",
-          width: 100,
-          align: "left",
-          hidden:true
-        },
-        {
-          field: "modifyDate",
-          title: "淇敼鏃堕棿",
-          type: "datetime",
-          width: 160,
-          align: "left",
-          hidden:true
-        },
-        {
-          field: "remark",
-          title: "澶囨敞",
-          type: "string",
-          width: 100,
-          align: "left",
-          hidden:true
-        },
-      ]);
-      const detail = ref({
-        cnName: "#detailCnName",
-        table: "",
-        columns: [],
-        sortName: "",
-      });
-      return {
-        table,
-        extend,
-        editFormFields,
-        editFormOptions,
-        searchFormFields,
-        searchFormOptions,
-        columns,
-        detail,
-      };
-    },
-  });
-  </script>
+import extend from "@/extension/stock/proStockInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+  setup() {
+    const table = ref({
+      key: "id",
+      footer: "Foots",
+      cnName: "鎴愬搧搴撳瓨淇℃伅",
+      name: "proStockInfo",
+      url: "/ProStockInfo/",
+      sortName: "id",
+    });
+    const editFormFields = ref({
+     
+    });
+    const editFormOptions = ref([
+      [
+      ],
+    ]);
+    const searchFormFields = ref({
+      locationCode: "",
+      containerCode: "",
+      containerType: "",
+      warehouseId: "",
+    });
+    const searchFormOptions = ref([
+      [
+        { title: "鏂欐缂栧彿", field: "containerCode", type: "like" },
+        { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
+        { title: "鏂欐绫诲瀷", field: "containerType" ,type: "select",dataKey: "containerTypeEnum",data: [],},
+        { title: "浠撳簱", field: "warehouseId" ,type: "select",dataKey: "warehouseEnum",data: [],},
+      ],
+    ]);
+    const columns = ref([
+      {
+        field: "id",
+        title: "Id",
+        type: "int",
+        width: 100,
+        hidden: true,
+        readonly: true,
+        require: true,
+        align: "left",
+      },
+      {
+        field: "containerCode",
+        title: "鏂欐缂栧彿",
+        type: "string",
+        width: 200,
+        align: "left",
+      },
+      {
+        field: "locationCode",
+        title: "璐т綅缂栧彿",
+        type: "string",
+        width: 280,
+        align: "left",
+      },
+      {
+        field: "containerType",
+        title: "鏂欐绫诲瀷",
+        type: "int",
+        width: 100,
+        align: "left",
+      },
+      {
+        field: "warehouseId",
+        title: "浠撳簱",
+        type: "int",
+        width: 90,
+        align: "left",
+        bind: { key: "warehouseEnum", data: [] },
+      },
+      {
+        field: "stockStatus",
+        title: "搴撳瓨鐘舵��",
+        type: "int",
+        width: 120,
+        align: "left",
+        bind: { key: "stockStatusEnum", data: [] },
+      },
+      {
+        field: "isEmpty",
+        title: "鏄惁绌烘",
+        type: "bool",
+        width: 90,
+        align: "left",
+        bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+      },
+      {
+        field: "isFill",
+        title: "鏄惁婊℃",
+        type: "bool",
+        width: 90,
+        align: "left",
+        bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+      },
+      {
+        field: "isPick",
+        title: "鏄惁鍒嗘嫞",
+        type: "bool",
+        width: 90,
+        align: "left",
+        bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+      },
+      {
+        field: "remark",
+        title: "澶囨敞",
+        type: "string",
+        width: 120,
+        align: "left",
+      },
+      {
+        field: "creater",
+        title: "鍒涘缓浜�",
+        type: "string",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "createDate",
+        title: "鍒涘缓鏃堕棿",
+        type: "datetime",
+        width: 160,
+        align: "left",
+      },
+      {
+        field: "modifier",
+        title: "淇敼浜�",
+        type: "string",
+        width: 100,
+        align: "left",
+      },
+      {
+        field: "modifyDate",
+        title: "淇敼鏃堕棿",
+        type: "datetime",
+        width: 160,
+        align: "left",
+      },
+    ]);
+    const detail = ref({
+      cnName: "#detailCnName",
+      table: "",
+      columns: [],
+      sortName: "",
+    });
+    return {
+      table,
+      extend,
+      editFormFields,
+      editFormOptions,
+      searchFormFields,
+      searchFormOptions,
+      columns,
+      detail,
+    };
+  },
+});
+</script>
     
\ No newline at end of file

--
Gitblit v1.9.3