eam
/
eam-ui
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

BUG修改

master
yejiaxing 10 months ago
parent
f65bdfea2d
commit
5753ac921d
4 changed files with 626 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/api/eam/item/applicationRecordMain/index.ts
  2. 574
      src/components/Detail/src/approveDetail.vue
  3. 30
      src/utils/disposition/defaultButtons.ts
  4. 21
      src/views/eam/item/applicationRecord/index.vue

10
src/api/eam/item/applicationRecordMain/index.ts
View File

@ -46,6 +46,16 @@ export const deleteApplicationRecordMain = async (id: number) => {
return await request.delete({ url: `/eam/item-apply-main/delete?id=` + id })
}
// 审批通过备件申领记录主
export const agreeApplicationRecordMain = async (id: number) => {
return await request.delete({ url: `/eam/item-apply-main/agree?id=` + id })
}
// 审批驳回备件申领记录主
export const disAgreeApplicationRecordMain = async (id: number) => {
return await request.delete({ url: `/eam/item-apply-main/disAgree?id=` + id })
}
// 导出备件申领记录主 Excel
export const exportApplicationRecordMain = async (params) => {
return await request.download({ url: `/eam/item-apply-main/export-excel`, params })

574
src/components/Detail/src/approveDetail.vue
View File

@ -0,0 +1,574 @@
<template>
<div>
<Dialog v-model="isShowDrawer" title="审批详情" direction="rtl" size="80%" v-loading="detailLoading">
<template #header>
<div class="font-size-18px">
{{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
</div>
</template>
<ContentWrap v-if="!isBasic">
<Descriptions :data="detailData" labelClassName="label-class-name" label-align="left" direction="vertical"
:column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px" />
</ContentWrap>
<Tabs :tabsList="tabsList" :current="current" @change="change" />
<div class="flex">
<!-- 详情 -->
<ContentWrap class="w-[100%]">
<!-- 列表头部 -->
<!-- <TableHead
v-if="!isBasic"
:HeadButttondata="HeadButttondata"
:number="masterParmas.maintenanceNumber"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@searchFormClick="searchFormClick"
:allSchemas="detailAllSchemas"
/> -->
<!-- 默认单表展现 -->
<Descriptions v-if="isBasic && !tabsExtend" :data="detailData" :schema="allSchemas.detailSchema"
:columns="2" />
<!-- 单表切换tabs 展现table -->
<Table v-if="isBasic && tabsExtend" :columns="detailAllSchemasRef.tableColumns"
:data="tableObjectRef.tableList" :loading="tableObjectRef.loading"
:pagination="{ total: tableObjectRef.total }" v-model:pageSize="tableObjectRef.pageSize"
v-model:currentPage="tableObjectRef.currentPage">
<!-- <template #action="{ row }">
<ButtonBase
:Butttondata="buttondata"
@button-base-click="buttonTableClick($event, row)"
/>
</template> -->
</Table>
<Table v-if="!isBasic && fromeWhere != 'countPlan'" :columns="detailAllSchemasRef.tableColumns"
:data="tableObjectRef.tableList" :loading="tableObjectRef.loading"
:pagination="{ total: tableObjectRef.total }" v-model:pageSize="tableObjectRef.pageSize"
v-model:currentPage="tableObjectRef.currentPage">
<template #photos="{ row }">
<div v-for="(item, index) in row.photos.split(',')" :key="index" style="color: #409eff; cursor: pointer"
@click="openImage(item)">{{ item }}</div>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="buttondata" @button-base-click="buttonTableClick($event, row)" />
</template>
</Table>
<DetailTable v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
:columns="detailAllSchemasRef.tableColumns" :data="tableObjectRef.tableList" :allList="allList"
:countScopeType="countScopeType" :key="updateKey">
<template #action="{ row }">
<ButtonBase :Butttondata="buttondata" @button-base-click="buttonTableClick($event, row)" />
</template>
</DetailTable>
</ContentWrap>
</div>
<template #footer>
<ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
</template>
</Dialog>
</div>
</template>
<script lang="ts" setup>
import Tabs from '@/components/Tabs/src/Tabs.vue'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
import { isString } from '@/utils/is'
import { Console } from 'console'
defineOptions({ name: 'Detail' })
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
const updateKey = ref(0)
const props = defineProps({
// 标签参数
tabs: {
type: Object,
required: true,
default: null
},
// 是否是基础数据 展现详情顶部表单
isBasic: {
type: Boolean,
required: false,
default: false
},
// 表单，列表 相关信息
allSchemas: {
type: Object,
required: true,
default: null
},
// 明细列表相关信息
detailAllSchemas: {
type: Object,
required: true,
default: null
},
// 明细验证
detailAllSchemasRules: {
type: Object,
required: true,
default: null
},
// 子表新增API
apiCreate: {
type: Function,
required: false,
default: null
},
// 子表编辑API
apiUpdate: {
type: Function,
required: false,
default: null
},
// 子表分页列表API
apiPage: {
type: Function,
required: false,
default: null
},
// 子表删除API
apiDelete: {
type: Function,
required: false,
default: null
},
// 审批通过API
apiAgree: {
type: Function,
required: false,
default: null
},
// 驳回通过API
apiDisAgree: {
type: Function,
required: false,
default: null
},
// 子表新增修改校验
detailValidate: {
type: Function,
required: false,
default: null
},
// 来源 countPlan盘点计划进入
fromeWhere: {
type: String,
required: false,
default: ''
},
// 获取接口列表集合
allList: {
type: Object,
required: true,
default: null
},
// 盘点范围类型
countScopeType: {
type: Array,
required: false,
default: null
},
//盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
formTypeDetail: {
type: String,
required: false,
default: 'InputString'
},
//盘点详情子表新增的时候判断盘点范围值的下拉列表
countPlanAllList: {
type: Array,
required: false,
default: null
},
// 详情列表扩展操作按钮
buttondataTable: {
type: Array,
required: false,
default: () => {
return []
}
},
// 针对基础数据tabs扩展 显示table列表 默认false
tabsExtend: {
type: Boolean,
required: false,
default: false
},
// tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件
tableObjectExtend: {
type: Array,
required: false,
default: null
},
// 子列表 新增 编辑 删除的展示与隐藏，默认展示
detailButtonIsShow: {
type: Boolean,
required: false,
default: false
},
// 是否是选择备件列表
isSearchTableItem: {
type: Boolean,
required: false,
default: false
},
})
const isShowDrawer = ref(false)
const detailLoading = ref(false)
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
if (props.isBasic == true) {
if (tabsList.value && tabsList.value.length > 0) {
tabsList.value.unshift({
label: '详情',
prop: 'Detail'
})
}
} else {
if (tabsList.value && tabsList.value.length > 0) {
} else {
tabsList.value = [
{
label: '明细',
prop: 'Detail'
}
]
}
}
if (tabsList.value) {
}
// Tabs当前选择
const current = ref(0)
const change = (item, index) => {
current.value = index
emit('changeTabs', item)
}
//主表所需的参数
const masterParmas = ref({
maintenanceNumber: '' //主表id
// number: '', //主表单据号
// status: '' //主表状态 用于控制子表新增编辑按钮显示情况
})
// 列表头部按钮
const HeadButttondata = ref()
// 列表-操作按钮
const buttondata = ref()
/** 打开弹窗 */
const detailData = ref()
const titleNameRef = ref()
const titleValueRef = ref()
const openDetail = async (row : any, titleName : any, titleValue : any, tableName : any) => {
titleNameRef.value = titleName
titleValueRef.value = titleValue
// 加载明细列表
if (!props.isBasic) {
// 设置主表id
masterParmas.value.maintenanceNumber = row.number
// masterParmas.value.number = row.number
// masterParmas.value.status = row.status
tableObjectRef.value.params = {
maintenanceNumber: row.number
}
await getList()
}
isShowDrawer.value = true
if (row) {
detailLoading.value = true
try {
detailData.value = row
setBeiJian()
let detailButtonAdd : any = []
detailButtonAdd = [
defaultButtons.defaultAddBtn({
hide: isShowMainButton(row, ['1'])
})
]
HeadButttondata.value = [...detailButtonAdd]
} finally {
detailLoading.value = false
}
}
}
// 设置备件回显
const setBeiJian = () => {
let isItemNUmbersTrue = false
isItemNUmbersTrue = detailAllSchemasRef.value.tableColumns.some(
(item) => item.field == 'itemNumbers1'
)
if (!isItemNUmbersTrue) return
tableObjectRef.value.tableList.forEach((item) => {
if (item.itemNumbers?.length > 0) {
let str = ''
item.itemNumbers.forEach((element) => {
str += element.name + ':' + element.qty + ','
})
item.itemNumbers1 = str.substring(0, str.length - 1)
}
})
}
const tableObjectRef = ref()
const tableMethodsRef = ref()
const detailAllSchemasRef = ref()
const { tableObject, tableMethods } = useTable({
getListApi: props.apiPage // 分页接口
})
tableObjectRef.value = tableObject
tableMethodsRef.value = tableMethods
detailAllSchemasRef.value = props.detailAllSchemas
// 根据状态返回该按钮是否显示
const isShowMainButton = (row, val) => {
return false
}
// 获得表格的各种操作
const { getList } = tableMethodsRef.value
// 头部按钮事件
const buttonBaseClick = (val, item) => {
if (val == 'add') {
// 新增
openForm('create')
} else if (val == 'import') {
// 导入
handleImport()
} else if (val == 'export') {
// 导出
handleExport()
} else if (val == 'refresh') {
// 刷新
getList()
} else if (val == 'filtrate') {
// 筛选
}
else if (val == 'agree') {
// 同意按钮
agree()
}
else if (val == 'disAgree') {
// 同意按钮
disAgree()
}
// else if (val == 'disagree') {
// // 驳回按钮
// disagree()
// }
else {
// 其他按钮
console.log('其他按钮', item)
}
}
/** 审批通过按钮操作 */
const agree = async (id : number) => {
try {
// 通过的二次确认
await message.confirm("是否确认审批通过该数据项?")
// 发起通过
await props.apiAgree(id)
message.success(t('common.success'))
// 刷新列表
await getList()
updateKey.value += 1
setBeiJian()
} catch { }
}
/** 审批驳回按钮操作 */
const disAgree = async (id : number) => {
try {
// 驳回的二次确认
await message.confirm("是否确认审批驳回该数据项?")
// 发起驳回
await props.apiDisAgree(id)
message.success(t('common.success'))
// 刷新列表
await getList()
updateKey.value += 1
setBeiJian()
} catch { }
}
// 字段设置 更新主列表字段
// const updataTableColumns = (val) => {
// detailAllSchemas.tableColumns.value = val
// }
// 列表-操作按钮事件
const buttonTableClick = async (val, row) => {
if (val == 'edit') {
// 编辑
openForm('update', row)
emit('detailOpenForm', row)
} else if (val == 'delete') {
// 删除
handleDelete(row.id)
} else {
emit('tableFormButton', val, row)
}
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = async (type : string, row ?: number) => {
if (row) {
if (detailAllSchemasRef.value?.tableColumns?.length > 0) {
let isTrue = false
let isItemNUmbersTrue = false
isTrue = detailAllSchemasRef.value.tableColumns.some((item) => item.field == 'maintenances')
isItemNUmbersTrue = detailAllSchemasRef.value.tableColumns.some(
(item) => item.field == 'itemNumbers'
)
if (isTrue) {
if (row.maintenances && isString(row.maintenances)) {
row.maintenances = row.maintenances.split(',').map(Number)
}
}
}
}
formRef.value.open(type, row, masterParmas.value)
}
// form 提交
const submitForm = async (formType, data) => {
try {
emit('detailSubmitForm', formType, data, getList, formRef.value)
} finally {
// formRef.value.formLoading = false
}
}
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef) => {
emit('searchTableSuccessDetail', formField, searchField, val, formRef)
}
// 传递给父类
const emit = defineEmits([
'searchTableSuccessDetail',
'changeTabs',
'selectChangeDetail',
'detailOpenForm',
'tableFormButton',
'openImage',
'detailSubmitForm'
])
/** 删除按钮操作 */
const handleDelete = async (id : number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await props.apiDelete(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
updateKey.value += 1
setBeiJian()
} catch { }
}
// 筛选提交
const searchFormClick = async (searchData) => {
const { tableObject, tableMethods } = useTable({
getListApi: props.apiPage // 分页接口
})
tableObject.params = {
isSearch: true,
filters: searchData.filters
? searchData.filters
: [{ column: 'number', action: '==', value: masterParmas.value.maintenanceNumber }]
}
detailAllSchemasRef.value = props.detailAllSchemas
tableObjectRef.value = tableObject
tableMethodsRef.value = tableMethods
tableObjectRef.value.tableList = []
const { getList } = tableMethods
await getList()
updateKey.value += 1
// tableObjectRef.value.params = {
// isSearch: true,
// filters: searchData.filters
// ? searchData.filters
// : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
// }
// getList() // 刷新当前列表
}
// 选择盘点类型的时候针对限值的操作
const selectChangeDetail = (field, val) => {
emit('selectChangeDetail', field, val)
}
// 打开图片
const openImage = (item) => {
emit('openImage', item)
}
/** 弹窗按钮 */
const Butttondata = [
defaultButtons.agree(null), // 同意
defaultButtons.disAgree(null) // 驳回
]
defineExpose({ openDetail, tableObject }) // 提供 open 方法，用于打开弹窗
//监视属性
watch(
() => props.apiPage,
() => {
const { tableObject, tableMethods } = useTable({
getListApi: props.apiPage // 分页接口
})
tableObject.params.maintenanceNumber = masterParmas.value.maintenanceNumber
detailAllSchemasRef.value = props.detailAllSchemas
if (props.tableObjectExtend) {
props.tableObjectExtend.forEach((item) => {
tableObject.params[item.key] = item.value
})
}
tableObjectRef.value = tableObject
tableMethodsRef.value = tableMethods
const { getList } = tableMethods
getList()
}
)
</script>
<style lang="scss">
.el-drawer__body {
background: #f5f5f5 !important;
}
::v-deep(.label-class-name) {
color: #dedede;
}
</style>
<style scoped lang="scss"></style>

30
src/utils/disposition/defaultButtons.ts
View File

@ -788,6 +788,32 @@ export function chooseDeviceBtn(option:any) {
})
}
// 审批通过按钮
export function agree(option:any) {
return __defaultBtnOption(option,{
label: '通过',
name: 'agree',
hide: false,
type: 'primary',
// icon: 'ep:plus',
color: 'green',
hasPermi: ''
})
}
// 审批驳回按钮
export function disAgree(option:any) {
return __defaultBtnOption(option,{
label: '驳回',
name: 'disAgree',
hide: false,
type: 'primary',
// icon: 'ep:plus',
color: 'red',
hasPermi: ''
})
}
// 主列表-撤销
export function backoutBtn(option:any) {
return __defaultBtnOption(option,{
@ -892,10 +918,6 @@ export function finishOrderBtn(option:any) {
})
}
// 默认按钮规则
function __defaultBtnOption(option:any,specific:any){
return {

21
src/views/eam/item/applicationRecord/index.vue
View File

@ -44,7 +44,13 @@
:apiPage="ApplicationRecordDetailApi.getApplicationRecordDetailPage"
:apiDelete="ApplicationRecordDetailApi.deleteApplicationRecordDetail"
@searchTableSuccessDetail="searchTableSuccessDetail" />
<!-- 审批详情 -->
<approveDetail ref="detailRef1" :isBasic="false" :allSchemas="ApplicationRecordMain.allSchemas"
:detailAllSchemas="ApplicationRecordDetail.allSchemas" :detailAllSchemasRules="ApplicationRecordDetailRules"
:apiAgree="ApplicationRecordMainApi.agreeApplicationRecordMain"
:apiDisAgree="ApplicationRecordMainApi.disAgreeApplicationRecordMain"
:apiPage="ApplicationRecordDetailApi.getApplicationRecordDetailPage"
@searchTableSuccessDetail="searchTableSuccessDetail" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :isShowOut="true" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@ -58,6 +64,7 @@
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import approveDetail from '@/components/Detail/src/approveDetail.vue'
// 采购订单
defineOptions({ name: 'ApplicationRecord' })
@ -163,8 +170,8 @@
// 列表-操作按钮
const butttondata = (row) => {
return [
defaultButtons.approveBtn({ hide: isShowMainButton(row, ['0']) }), // 撤回
// defaultButtons.mainListEditBtn(null), // 编辑
defaultButtons.approveBtn({ hide: isShowMainButton(row, ['0']) }), // 审批
defaultButtons.mainListEditBtn(null), // 编辑
// defaultButtons.mainListDeleteBtn(null), // 删除
]
}
@ -173,8 +180,8 @@
const buttonTableClick = async (val, row) => {
if (val == 'edit') { // 编辑
openForm('update', row)
}else if (val == 'approve') { // 删除
// handleDelete(row.id)
} else if (val == 'approve') { // 删除
handleApprove(row, '单据号', row.number)
} else if (val == 'delete') { // 删除
handleDelete(row.id)
}
@ -192,6 +199,10 @@
const openDetail = (row : any, titleName : any, titleValue : any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicApplicationRecordMain')
}
const detailRef1 = ref()
const handleApprove = (row : any, titleName : any, titleValue : any) => {
detailRef1.value.openDetail(row, titleName, titleValue, 'basicApplicationRecordMain')
}
/** 删除按钮操作 */
const handleDelete = async (id : number) => {

Write Preview
Loading…
Cancel
Save