翻包PC以及后端修改

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts

@@ -11,23 +11,23 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
-  // {
-  //   label: '申请单号',
-  //   field: 'requestNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  // },
   {
-    label: '任务单据号',
+    label: '申请单号',
-    field: 'jobNumber',
+    field: 'requestNumber',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 180
     },
   },
+  // {
+  //   label: '任务单据号',
+  //   field: 'jobNumber',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 180
+  //   },
+  // },
   {
     label: '仓库代码',
     field: 'warehouseCode',

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue

@@ -185,7 +185,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:packageover-request-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-request-main:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -240,13 +240,13 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:packageover-request-main:close'}), // 关闭
+        // defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:packageover-request-main:close'}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:packageover-request-main:reAdd'}), // 重新添加
+        // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:packageover-request-main:reAdd'}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:submit'}), // 提交审批
+        // defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:submit'}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:refused'}), // 驳回
+        // defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:refused'}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:agree'}), // 审批通过
+        // defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:agree'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:packageover-request-main:handle'}), // 处理
+        // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:packageover-request-main:handle'}), // 处理
-        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:update'}), // 编辑
+        // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:update'}), // 编辑
         // defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除
     ]
 }

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts

@@ -42,25 +42,25 @@ export const PackageoverRequestMain = useCrudSchemas(
       isForm: false,
       isSearch: true
     },
-    {
+    // {
-      label: '状态',
+    //   label: '状态',
-      field: 'status',
+    //   field: 'status',
-      dictType: DICT_TYPE.REQUEST_STATUS,
+    //   dictType: DICT_TYPE.REQUEST_STATUS,
-      dictClass: 'string',
+    //   dictClass: 'string',
-      isSearch: true,
+    //   isSearch: true,
-      isTable: true,
+    //   isTable: true,
-      isForm: false,
+    //   isForm: false,
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 150
+    //     width: 150
-      },
+    //   },
-      form: {
+    //   form: {
-        value: '1',
+    //     value: '1',
-        componentProps: {
+    //     componentProps: {
-          disabled: true
+    //       disabled: true
-        }
+    //     }
-      }
+    //   }
-    },
+    // },
     {
       label: '申请时间',
       field: 'requestTime',
@@ -103,7 +103,7 @@ export const PackageoverRequestMain = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      isTable: false
+      isTable: true
     },
 
     {
@@ -129,7 +129,7 @@ export const PackageoverRequestMain = useCrudSchemas(
           searchCondition: [
             {
               key: 'businessType',
-              value: 'HoldToOk',
+              value: 'OverPackage',
               isMainValue: false
             },
             {
@@ -482,15 +482,15 @@ export const PackageoverRequestMain = useCrudSchemas(
       isTable: false,
       isForm: false
     },
-    {
+    // {
-      label: '操作',
+    //   label: '操作',
-      field: 'action',
+    //   field: 'action',
-      isForm: false,
+    //   isForm: false,
-      table: {
+    //   table: {
-        width: 180,
+    //     width: 180,
-        fixed: 'right'
+    //     fixed: 'right'
-      }
+    //   }
-    }
+    // }
   ])
 )
 
@@ -600,16 +600,16 @@ export const PackageoverRequestDetail = useCrudSchemas(
       isTableForm: false,
       isForm: false
     },
-    {
+    // {
-      label: '项目代码',
+    //   label: '项目代码',
-      field: 'projectCode',
+    //   field: 'projectCode',
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 150
+    //     width: 150
-      },
+    //   },
-      isTableForm: false,
+    //   isTableForm: false,
-      isForm: false
+    //   isForm: false
-    },
+    // },
     {
       label: '数量',
       field: 'qty',