计划外入库修改

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts

@@ -220,26 +220,26 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
+  // {
-    label: '过期时间',
+  //   label: '过期时间',
-    field: 'expiredTime',
+  //   field: 'expiredTime',
-    formatter: dateFormatter,
+  //   formatter: dateFormatter,
-    detail: {
+  //   detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+  //   },
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'DatePicker',
+  //     component: 'DatePicker',
-      componentProps: {
+  //     componentProps: {
-        type: 'datetime',
+  //       type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+  //       valueFormat: 'x',
-      }
+  //     }
-    },
+  //   },
-  },
+  // },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -298,14 +298,14 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTable:false,
   },
-  {
+  // {
-    label: '领用描述',
+  //   label: '领用描述',
-    field: 'usageDescription',
+  //   field: 'usageDescription',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '优先级',
     field: 'priority',
@@ -334,30 +334,30 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
     }
   },
-  {
+  // {
-    label: '业务类型',
+  //   label: '业务类型',
-    field: 'businessType',
+  //   field: 'businessType',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '部门',
+  //   label: '部门',
-    field: 'departmentCode',
+  //   field: 'departmentCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '备注',
+  //   label: '备注',
-    field: 'remark',
+  //   field: 'remark',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '自动完成',
     field: 'autoComplete',
@@ -879,14 +879,14 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
+  // {
-    label: '替代批次',
+  //   label: '替代批次',
-    field: 'altBatch',
+  //   field: 'altBatch',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '成本中心代码',
     field: 'costcentreCode',

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts

@@ -276,14 +276,14 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  {
+  // {
-    label: '到库区代码范围',
+  //   label: '到库区代码范围',
-    field: 'toAreaCodes',
+  //   field: 'toAreaCodes',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '领用代码',
     field: 'usageCode',

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -130,7 +130,6 @@ import * as ItembasicApi from "@/api/wms/itembasic";
 import * as PackageApi from "@/api/wms/package";
 import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
-import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 
 // 计划外入库申请
@@ -384,14 +383,14 @@ const butttondata = (row,$index) => {
         {
           label: '创建标签',
           name: 'cjbq',
-          hide: isShowMainButton(row,['3']),
+          hide: isShowMainButton(row,['1']),
           type: 'primary',
           icon: '',
           color: '',
           hasPermi: '',
           link: true, // 文本展现按钮
         },
-        defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6','8']) }), // 标签打印
+        defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['1','3','6','8']) }), // 标签打印
     ]
 }
 
@@ -503,50 +502,70 @@ const buttonTableClick = async (val, row) => {
 const handleClose = async (id: number) => {
   await message.confirm(t('common.confirmColse'))
   tableObject.loading = true
-  await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id)
+  try{
-  message.success(t('common.closeSuccess'))
+    await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id)
-  tableObject.loading = false
+    message.success(t('common.closeSuccess'))
-  await getList()
+    tableObject.loading = false
+    await getList()
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 /** 重新添加按钮操作 */
 const handleReAdd = async (id: number) => {
   await message.confirm(t('common.confirmReAdd'))
   tableObject.loading = true
-  await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id)
+  try{
-  message.success(t('common.reAddSuccess'))
+    await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id)
-  tableObject.loading = false
+    message.success(t('common.reAddSuccess'))
-  await getList()
+    tableObject.loading = false
+    await getList()
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 /** 提交按钮操作 */
 const handleSubmit = async (id: number) => {
   await message.confirm(t('common.confirmSubmit'))
   tableObject.loading = true
-  await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id)
+  try{
-  message.success(t('common.submitSuccess'))
+    await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id)
-  tableObject.loading = false
+    message.success(t('common.submitSuccess'))
-  await getList()
+    tableObject.loading = false
+    await getList()
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 /** 审批驳回按钮操作 */
 const handleRefused = async (id: number) => {
   await message.confirm(t('common.confirmRefused'))
   tableObject.loading = true
-  await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id)
+  try{
-  message.success(t('common.refusedSuccess'))
+    await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id)
-  tableObject.loading = false
+    message.success(t('common.refusedSuccess'))
-  await getList()
+    tableObject.loading = false
+    await getList()
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 /** 审批通过按钮操作 */
 const handleAgree = async (id: number) => {
   await message.confirm(t('common.confirmAgree'))
   tableObject.loading = true
-  await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id)
+  try{
-  message.success(t('common.agreeSuccess'))
+    await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id)
-  tableObject.loading = false
+    message.success(t('common.agreeSuccess'))
-  await getList()
+    tableObject.loading = false
+    await getList()
+  }catch{
+    tableObject.loading = false
+  }
 }
 
 /** 处理按钮操作 */
@@ -557,7 +576,6 @@ const handleHandle = async (id: number) => {
     await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id)
     message.success(t('common.handleSuccess'))
     await getList()
-
   } finally {
     tableObject.loading = false
   }
@@ -566,7 +584,6 @@ const handleHandle = async (id: number) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
-  
     UnplannedreceiptRequestMain.allSchemas.formSchema.forEach((item) => {
       if(type == "update"){
         if (item.field == 'costCenterCode') {

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -546,7 +546,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 350,
       fixed: 'right'
     },
   }
@@ -702,19 +702,19 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       disabled: true
     }
   },
-  {
+  // {
-    label: '包装号',
+  //   label: '包装号',
-    field: 'packingNumber',
+  //   field: 'packingNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    isTableForm:false,
+  //   isTableForm:false,
-    isForm:false,
+  //   isForm:false,
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    tableForm:{
+  //   tableForm:{
-      disabled: true
+  //     disabled: true
-    }
+  //   }
-  },
+  // },
   {
     label: '器具号',
     field: 'containerNumber',