From da4257bc32483409af02a06dd342c6981ec786ec Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期一, 17 十一月 2025 17:14:14 +0800
Subject: [PATCH] 更新大屏幕页面和任务信息页面

---
 项目代码/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue |  439 +++++++++++++++++++++++++++---------------------------
 1 files changed, 219 insertions(+), 220 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue"
index 5046820..16acdf8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue"
@@ -1,221 +1,220 @@
-
 <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/inbound/inboundOrderDetail.js";
-  import { ref, defineComponent } from "vue";
-  export default defineComponent({
-    setup() {
-      const table = ref({
-        key: "id",
-        footer: "Foots",
-        cnName: "鍏ュ簱鍗曟槑缁�",
-        name: "inboundOrderDetail",
-        url: "/InboundOrderDetail/",
-        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: "",
-      });
-      const searchFormOptions = ref([
-        [
-          { title: "璁惧缂栧彿", field: "deviceCode" },
-          { title: "璁惧绫诲瀷", field: "deviceType" },
-          { title: "璁惧鐘舵��", field: "deviceStatus" },
-        ],
-      ]);
-      const columns = ref([
-        {
-          field: "id",
-          title: "Id",
-          type: "int",
-          width: 90,
-          hidden: true,
-          readonly: true,
-          require: true,
-          align: "left",
-        },
-        {
-          field: "orderId",
-          title: "鍏ュ簱鍗曚富閿�",
-          type: "string",
-          width: 90,
-          align: "left",
-        },
-        {
-          field: "materielCode",
-          title: "鐗╂枡缂栧彿",
-          type: "string",
-          width: 150,
-          align: "left",
-        },
-        {
-          field: "materielName",
-          title: "鐗╂枡鍚嶇О",
-          type: "string",
-          width: 150,
-          align: "left",
-        },
-        {
-          field: "batchNo",
-          title: "鎵规鍙�",
-          type: "decimal",
-          width: 90,
-          align: "left",
-        },
-        {
-          field: "orderQuantity",
-          title: "鍗曟嵁鏁伴噺",
-          type: "string",
-          width: 90,
-          align: "left",
-        },
-        {
-          field: "receiptQuantity",
-          title: "缁勭洏鏁伴噺",
-          type: "int",
-          width: 120,
-          align: "left",
-        },
-        {
-          field: "overInQuantity",
-          title: "涓婃灦鏁伴噺",
-          type: "string",
-          width: 200,
-          align: "left",
-        },
-        {
-          field: "orderDetailStatus",
-          title: "璁㈠崟鏄庣粏鐘舵��",
-          type: "string",
-          width: 180,
-          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",
-        },
-        {
-          field: "remark",
-          title: "澶囨敞",
-          type: "string",
-          width: 100,
-          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
+  <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/inbound/inboundOrderDetail.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+  setup() {
+    const table = ref({
+      key: "id",
+      footer: "Foots",
+      cnName: "鏂板巶鍏ュ簱鍗曟槑缁�",
+      name: "inboundOrderDetail",
+      url: "/InboundOrderDetail/",
+      sortName: "id",
+    });
+    const editFormFields = ref({
+
+    });
+    const editFormOptions = ref([
+     
+    ]);
+    const searchFormFields = ref({
+      orderId: "",
+      detailId: "",
+      barCode: "",
+      materielCode: "",
+      materielName: "",
+      batchNo: "",
+      orderDetailStatus: "",
+      createDate: "",
+    });
+    const searchFormOptions = ref([
+      [
+        { title: "鍏ュ簱鍗�", field: "orderId", type: "like" },
+        { title: "涓婃父鏄庣粏Id", field: "detailId", type: "like" },
+        { title: "鐗╂枡鏉$爜", field: "barCode", type: "like" },
+        { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+      ],
+      [
+        { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
+        { title: "鐗╂枡鎵规", field: "batchNo", type: "like" },
+        { title: "鐘舵��", field: "orderDetailStatus", type: "select", dataKey: "inboundState", data: [], },
+        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime", },
+      ],
+    ]);
+    const columns = ref([
+      {
+        field: "id",
+        title: "Id",
+        type: "int",
+        width: 90,
+        hidden: true,
+        readonly: true,
+        require: true,
+        align: "left",
+      },
+      {
+        field: "orderId",
+        title: "鍏ュ簱鍗�",
+        type: "string",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "detailId",
+        title: "涓婃父鏄庣粏Id",
+        type: "string",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "barCode",
+        title: "鐗╂枡鏉$爜",
+        type: "string",
+        width: 150,
+        align: "left",
+      },
+      {
+        field: "materialCode",
+        title: "鐗╂枡缂栧彿",
+        type: "string",
+        width: 150,
+        align: "left",
+      },
+      {
+        field: "materialName",
+        title: "鐗╂枡鍚嶇О",
+        type: "string",
+        width: 150,
+        align: "left",
+      },
+      {
+        field: "materialLot",
+        title: "鐗╂枡鎵规",
+        type: "decimal",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "materialWide",
+        title: "骞呭",
+        type: "string",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "materialThick",
+        title: "鍗峰緞",
+        type: "int",
+        width: 120,
+        align: "left",
+      },
+      {
+        field: "materialWeight",
+        title: "閲嶉噺",
+        type: "string",
+        width: 200,
+        align: "left",
+      },
+      {
+        field: "materialSpec",
+        title: "瑙勬牸",
+        type: "string",
+        width: 180,
+        align: "left",
+      },
+      {
+        field: "orderQuantity",
+        title: "鍗曟嵁鏁伴噺",
+        type: "decimal",
+        width: 120,
+        align: "left",
+      },
+      {
+        field: "bindQuantity",
+        title: "缁勭洏鏁伴噺",
+        type: "decimal",
+        width: 120,
+        align: "left",
+      },
+      {
+        field: "inQuantity",
+        title: "宸插叆搴撴暟閲�",
+        type: "decimal",
+        width: 120,
+        align: "left",
+      },
+      {
+        field: "orderDetailStatus",
+        title: "鏄庣粏鐘舵��",
+        type: "string",
+        width: 120,
+        align: "left",
+      },
+      {
+        field: "unit",
+        title: "鍗曚綅",
+        type: "string",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "remark",
+        title: "澶囨敞",
+        type: "string",
+        width: 200,
+        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