From 9ec715d2deb18a269dd49c48da91a36632d08c81 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 18 六月 2025 00:56:26 +0800
Subject: [PATCH] 最新代码上传,优化功能等

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue |  387 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 324 insertions(+), 63 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
index 09f6687..22e6b03 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
@@ -5,70 +5,331 @@
  *涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_CheckOrder.js姝ゅ缂栧啓
  -->
 <template>
-    <view-grid ref="grid"
-               :columns="columns"
-               :detail="detail"
-               :editFormFields="editFormFields"
-               :editFormOptions="editFormOptions"
-               :searchFormFields="searchFormFields"
-               :searchFormOptions="searchFormOptions"
-               :table="table"
-               :extend="extend">
-    </view-grid>
+  <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/check/checkOrder.js";
-    import { ref, defineComponent } from "vue";
-    export default defineComponent({
-        setup() {
-            const table = ref({
-                key: 'checkOrderId',
-                footer: "Foots",
-                cnName: '妫�楠屽崟',
-                name: 'checkOrder',
-                url: "/CheckOrder/",
-                sortName: "checkOrderId"
-            });
-            const editFormFields = ref({});
-            const editFormOptions = ref([]);
-            const searchFormFields = ref({});
-            const searchFormOptions = ref([]);
-            const columns = ref([{field:'checkOrderId',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
-                       {field:'checkOrderNo',title:'妫�楠屽崟鍙�',type:'string',width:110,require:true,align:'left',sort:true},
-                       {field:'receiveOrderNo',title:'鏀惰揣鍗曞彿',type:'string',width:110,require:true,align:'left'},
-                       {field:'checkOrderStatus',title:'璐ㄦ鍗曠姸鎬�',type:'int',width:110,require:true,align:'left'},
-                       {field:'auditStatus',title:'瀹℃壒鐘舵��',type:'int',width:110,require:true,align:'left'},
-                       {field:'receiveDetailRowNo',title:'鏀惰揣鍗曟槑缁嗚鍙�',type:'int',width:110,require:true,align:'left'},
-                       {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
-                       {field:'qualifiedQuantity',title:'鍚堟牸鏁伴噺',type:'float',width:110,align:'left'},
-                       {field:'defectedQuantity',title:'鐗归噰鏁伴噺',type:'float',width:110,align:'left'},
-                       {field:'returnQuantity',title:'閫�璐ф暟閲�',type:'float',width:110,align:'left'},
-                       {field:'scrappedQuantity',title:'鎶ュ簾鏁伴噺',type:'float',width:110,align:'left'},
-                       {field:'receivedQuantity',title:'妫�楠屾�绘暟',type:'float',width:110,require:true,align:'left'},
-                       {field:'result',title:'妫�楠岀粨鏋�',type:'string',width:110,align:'left'},
-                       {field:'defectedNote',title:'鐗归噰璇存槑',type:'string',width:110,align:'left'},
-                       {field:'checkUserName',title:'妫�楠屼汉',type:'string',width:110,align:'left'},
-                       {field:'creater',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
-                       {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
-                       {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
-                       {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
-            const detail = ref({
-                cnName: "#detailCnName",
-                table: "#detailTable",
-                columns: [],
-                sortName: "",
-                key: ""
-            });
-            return {
-                table,
-                extend,
-                editFormFields,
-                editFormOptions,
-                searchFormFields,
-                searchFormOptions,
-                columns,
-                detail,
-            };
-        },
+import extend from "@/extension/check/checkOrder.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+  setup() {
+    const table = ref({
+      key: "checkOrderId",
+      footer: "Foots",
+      cnName: "妫�楠屽崟",
+      name: "checkOrder",
+      url: "/CheckOrder/",
+      sortName: "checkOrderId",
     });
+    const editFormFields = ref({});
+    const editFormOptions = ref([]);
+    const searchFormFields = ref({
+      checkOrderNo: "",
+      receiveOrderNo: "",
+      checkOrderStatus: "",
+      auditStatus: "",
+      orderType: "0",
+    });
+    const searchFormOptions = ref([
+      [
+        { title: "妫�楠屽崟鍙�", field: "checkOrderNo", type: "like" },
+        { title: "鏀惰揣鍗曞彿", field: "receiveOrderNo", type: "like" },
+        {
+          title: "璐ㄦ鍗曠姸鎬�",
+          field: "checkOrderStatus",
+          type: "select",
+          dataKey: "checkOrderStatusEnum",
+          data: [],
+        },
+      ],
+      [
+        { title: "鏀惰揣鍗曟槑缁嗚鍙�", field: "receiveDetailRowNo", type: "like" },
+        { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+        {
+          title: "妫�楠岀粨鏋�",
+          field: "result",
+          type: "select",
+          dataKey: "checkAcceptEnum",
+          data: [],
+        },
+      ],
+      [
+        {
+          title: "涓婁紶鐘舵��",
+          field: "UploadStatus",
+          type: "select",
+          dataKey: "checkUploadEnum",
+          data: [],
+        },
+      ],
+    ]);
+    const columns = ref([
+      {
+        field: "checkOrderId",
+        title: "涓婚敭",
+        type: "int",
+        width: 150,
+        hidden: true,
+        readonly: true,
+        require: true,
+        align: "left",
+      },
+      {
+        field: "checkOrderNo",
+        title: "妫�楠屽崟鍙�",
+        type: "string",
+        width: 180,
+        require: true,
+        align: "left",
+      },
+      {
+        field: "orderType",
+        title: "妫�楠屽崟绫诲瀷",
+        type: "string",
+        width: 120,
+        align: "left",
+        bind: { key: "checkTypeEnum", data: [] },
+      },
+      {
+        field: "receiveOrderNo",
+        title: "鏀惰揣鍗曞彿",
+        type: "string",
+        width: 180,
+        require: true,
+        align: "left",
+      },
+      {
+        field: "warehouseId",
+        title: "浠撳簱",
+        type: "string",
+        width: 90,
+        align: "left",
+        bind: { key: "warehouses", data: [] },
+      },
+      //    {field:'auditStatus',title:'瀹℃壒鐘舵��',type:'int',width:110,require:true,align:'left'},
+      {
+        field: "receiveDetailRowNo",
+        title: "鏀惰揣鏄庣粏琛�",
+        type: "int",
+        width: 100,
+        require: true,
+        align: "left",
+      },
+      {
+        field: "materielCode",
+        title: "鐗╂枡缂栧彿",
+        type: "string",
+        width: 110,
+        require: true,
+        align: "left",
+      },
+      {
+        field: "materielSpec",
+        title: "鐗╂枡瑙勬牸",
+        type: "select",
+        type: "string",
+        width: 160,
+        align: "left",
+      },
+      {
+        field: "lotNo",
+        title: "鎵规鍙�",
+        type: "string",
+        width: 150,
+        require: true,
+        align: "left",
+      },
+      {
+        field: "checkOrderStatus",
+        title: "璐ㄦ鍗曠姸鎬�",
+        type: "string",
+        width: 110,
+        require: true,
+        align: "left",
+        bind: { key: "checkOrderStatusEnum", data: [] },
+      },
+      {
+        field: "qualifiedQuantity",
+        title: "鍚堟牸鏁伴噺",
+        type: "float",
+        width: 110,
+        align: "left",
+      },
+      {
+        field: "returnQuantity",
+        title: "閫�璐ф暟閲�",
+        type: "float",
+        width: 110,
+        align: "left",
+      },
+      {
+        field: "receivedQuantity",
+        title: "妫�楠屾�绘暟",
+        type: "float",
+        width: 110,
+        require: true,
+        align: "left",
+      },
+      {
+        field: "unit",
+        title: "鍗曚綅",
+        type: "string",
+        width: 90,
+        align: "left",
+      },
+      {
+        field: "result",
+        title: "妫�楠屽垽鏂�",
+        type: "string",
+        width: 120,
+        align: "left",
+        bind: { key: "checkAcceptEnum", data: [] },
+      },
+      {
+        field: "uploadStatus",
+        title: "涓婁紶鐘舵��",
+        type: "string",
+        width: 100,
+        align: "left",
+        bind: { key: "checkUploadEnum", data: [] },
+      },
+      //    {field:'defectedNote',title:'鐗归噰璇存槑',type:'string',width:110,align:'left'},
+      {
+        field: "checkUserName",
+        title: "妫�楠屼汉",
+        type: "string",
+        width: 110,
+        align: "left",
+      },
+      // {
+      //   field: "creater",
+      //   title: "鍒涘缓鑰�",
+      //   type: "string",
+      //   width: 110,
+      //   require: true,
+      //   align: "left",
+      // },
+      {
+        field: "createDate",
+        title: "鍒涘缓鏃堕棿",
+        type: "datetime",
+        width: 180,
+        require: true,
+        align: "left",
+      },
+      //    {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+      //    {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}
+    ]);
+    const detail = ref({
+      cnName: "妫�楠岀粨鏋�",
+      table: "CheckOrderResult",
+      columns: [
+        {
+          field: "id",
+          title: "涓婚敭",
+          type: "int",
+          width: 110,
+          hidden: true,
+          readonly: true,
+          require: true,
+          align: "left",
+        },
+        {
+          field: "checkOrderId",
+          title: "妫�楠屽崟涓婚敭",
+          type: "int",
+          width: 110,
+          require: true,
+          align: "left",
+          sort: true,
+        },
+        {
+          field: "defectCode",
+          title: "缂洪櫡浠g爜",
+          type: "string",
+          width: 110,
+          require: true,
+          align: "left",
+        },
+        {
+          field: "result",
+          title: "妫�楠岀粨鏋�",
+          type: "string",
+          width: 110,
+          require: true,
+          align: "left",
+        },
+        {
+          field: "quantity",
+          title: "鏁伴噺",
+          type: "float",
+          width: 110,
+          require: true,
+          align: "left",
+        },
+        {
+          field: "note",
+          title: "澶囨敞",
+          type: "string",
+          width: 220,
+          align: "left",
+        },
+        {
+          field: "creater",
+          title: "鍒涘缓鑰�",
+          type: "string",
+          width: 110,
+          require: true,
+          align: "left",
+        },
+        {
+          field: "createDate",
+          title: "鍒涘缓鏃堕棿",
+          type: "datetime",
+          width: 150,
+          require: true,
+          align: "left",
+          sort: true,
+        },
+        {
+          field: "modifier",
+          title: "淇敼浜�",
+          type: "string",
+          width: 100,
+          align: "left",
+        },
+        {
+          field: "modifyDate",
+          title: "淇敼鏃ユ湡",
+          type: "datetime",
+          width: 150,
+          align: "left",
+          sort: true,
+        },
+      ],
+      sortName: "id",
+      key: "id",
+    });
+    return {
+      table,
+      extend,
+      editFormFields,
+      editFormOptions,
+      searchFormFields,
+      searchFormOptions,
+      columns,
+      detail,
+    };
+  },
+});
 </script>

--
Gitblit v1.9.3