翻包bug修改

src/views/wms/inventoryManage/package/package.data.ts

@@ -99,7 +99,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '背番',
-    field: 'itemDesc1',
+    field: 'backNumber',
     sort: 'custom',
     isSearch:true,
     table: {

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

@@ -300,7 +300,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '背番',
-    field: 'itemDesc1',
+    field: 'backNumber',
     isSearch:true,
     sort: 'custom',
     table: {

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

@@ -118,6 +118,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['uom'] = item['uom']
           newRow['qty'] = item['qty']
           newRow['batch'] = item['batch']
+          newRow['backNumber'] = item['backNumber']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['toLocationCode'] = item['locationCode']
           newRow['fromLocationGroupCode'] = item['locationGroupCode']
@@ -156,6 +157,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['uom'] = val[0]['uom']
       setV['qty'] = val[0]['qty']
       setV['batch'] = val[0]['batch']
+      setV['backNumber'] = val[0]['backNumber']
       setV['fromLocationCode'] = val[0]['locationCode']
       setV['toLocationCode'] = val[0]['locationCode']
       setV['fromLocationGroupCode'] = val[0]['locationGroupCode']
@@ -240,12 +242,12 @@ 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.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',
@@ -487,15 +487,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'
-    //   }
+      }
-    // }
+    }
   ])
 )
 
@@ -589,7 +589,7 @@ export const PackageoverRequestDetail = useCrudSchemas(
     },
     {
       label: '背番',
-      field: 'itemDesc1',
+      field: 'backNumber',
       sort: 'custom',
       table: {
         width: 150