Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/api/wms/unplannedreceiptRequestMain/index.ts

@@ -62,9 +62,37 @@ export const exportUnplannedreceiptRequestMain = async (params) => {
   }
 }
 
-
-
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedreceipt-request-main/get-import-template' })
 }
+
+// 关闭-计划外入库申请
+export const closeUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/close?id=` + id })
+}
+
+// 重新添加-计划外入库申请
+export const reAddUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-计划外入库申请
+export const submitUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/submit?id=` + id })
+}
+
+// 审批驳回-计划外入库申请
+export const refusedUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/refused?id=` + id })
+}
+
+// 审批通过-计划外入库申请
+export const agreeUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/agree?id=` + id })
+}
+
+// 处理-计划外入库申请
+export const handleUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/handle?id=` + id })
+}

src/components/ImportForm/src/ImportForm.vue

@@ -13,7 +13,9 @@
         '&updatePart=' +
         updatePart +
         '&outFile=' +
-        outFile
+        outFile + 
+        '&fromInventoryStatus=' + fromInventoryStatus +
+        '&toInventoryStatus=' + toInventoryStatus 
       "
       :auto-upload="false"
       :disabled="formLoading"
@@ -168,6 +170,18 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: false
+  },
+  // 库存修改 扩展额外属性
+  fromInventoryStatus: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 库存修改 扩展额外属性
+  toInventoryStatus: {
+    type: String,
+    required: false,
+    default: ''
   }
 })
 const importTemplateData = ref(props.importTemplateData)

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

@@ -174,9 +174,9 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }

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

@@ -198,30 +198,37 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedreceipt-request-main:close'}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedreceipt-request-main:reAdd'}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:submit'}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:refused'}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:agree'}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:unplannedreceipt-request-main:update'}), // 编辑
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:unplannedreceipt-request-main:handle'}), // 处理
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceipt-request-main:delete'}), // 删除
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceipt-request-main:delete'}), // 删除
     ]
 }
 
-
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    console.log('列表-操作按钮事件-处理')
+    handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -229,6 +236,66 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -67,13 +67,12 @@
     :apiUpdate="InventorychangeRequestDetailApi.updateInventorychangeRequestDetail"
     :apiPage="InventorychangeRequestDetailApi.getInventorychangeRequestDetailPage"
     :apiDelete="InventorychangeRequestDetailApi.deleteInventorychangeRequestDetail"
-    :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/inventorychange-request-main/import" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />
 </template>
 
 <script setup lang="ts">
@@ -83,7 +82,7 @@ import * as InventorychangeRequestMainApi from '@/api/wms/inventorychangeRequest
 import * as InventorychangeRequestDetailApi from '@/api/wms/inventorychangeRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// 库存修改申请
+// 库存修改申请 合格转隔离
 defineOptions({ name: 'InventorychangeRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -94,6 +93,32 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(InventorychangeRequestMain.allSchemas.tableColumns)
 
+console.log(99 ,  routeName.value)
+const fromInventoryStatus = ref()
+const toInventoryStatus = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: InventorychangeRequestMainApi.getInventorychangeRequestMainPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ * OktoholdRequestMain 合格转隔离
+ */
+ if ( routeName.value == 'OktoholdRequestMain') {
+  tableObject.params = {
+    fromInventoryStatus: 'OK'
+  }
+  fromInventoryStatus.value = 'OK'
+  toInventoryStatus.value = "HODxxx"
+} else if ( routeName.value == 'xxxx') {
+  tableObject.params = {
+    fromInventoryStatus: 'xxx'
+  }
+  fromInventoryStatus.value = 'xxx'
+  toInventoryStatus.value = "xxx"
+}
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -129,13 +154,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   })
 }
 
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
-
-const { tableObject, tableMethods } = useTable({
-  getListApi: InventorychangeRequestMainApi.getInventorychangeRequestMainPage // 分页接口
-})
 
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
@@ -251,7 +269,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await InventorychangeRequestMainApi.exportInventorychangeRequestMain(setSearchParams)
+    const data = await InventorychangeRequestMainApi.exportInventorychangeRequestMain(tableObject.params)
     download.excel(data, '库存修改申请主.xlsx')
   } catch {
   } finally {
@@ -280,6 +298,8 @@ const handleDeleteTable = (item, index) => {
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
+  data.fromInventoryStatus = fromInventoryStatus.value
+  data.toInventoryStatus = toInventoryStatus.value
   try {
     if (formType === 'create') {
       await InventorychangeRequestMainApi.createInventorychangeRequestMain(data)

src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts

@@ -177,8 +177,8 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '承接人用户名',
+    label: '承接人',
-    field: 'acceptUserId',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -205,8 +205,8 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '完成人用户名',
+    label: '完成人',
-    field: 'completeUserId',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@@ -271,7 +271,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '承接人',
-    field: 'acceptUserId',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -299,7 +299,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '完成人',
-    field: 'completeUserId',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts

@@ -170,8 +170,8 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '承接人用户名',
+    label: '承接人',
-    field: 'acceptUserId',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -198,8 +198,8 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '完成人用户名',
+    label: '完成人',
-    field: 'completeUserId',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -172,9 +172,9 @@
       defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
       defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
       defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
-      defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['6']) }), // 接受
+      defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
-      defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['6']) }), // 不接受
+      defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
-      defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['6']) }), // 下架
+      defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架
       defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
       // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
     ]

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@@ -121,7 +121,7 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListGenerateApplicationBtn(null), // 生成采购申请
+    // defaultButtons.mainListGenerateApplicationBtn(null), // 生成采购申请
   ]
 }