Browse Source

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

master_hella_20240701
zhaoxuebing 8 months ago
parent
commit
4b22a8e918
  1. 14
      src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
  2. 264
      src/views/wms/basicDataManage/labelManage/callMaterials/index.vue

14
src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@ -67,7 +67,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '入库包装规格',
field: 'inPackUnit',
sort: 'custom',
isSearch: true,
isSearch: false,
table: {
width: 150
},
@ -94,7 +94,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '出库包装规格',
field: 'outPackUnit',
sort: 'custom',
isSearch: true,
isSearch: false,
table: {
width: 150
},
@ -186,7 +186,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '补料来源库区',
field: 'repleinshFromArea',
sort: 'custom',
isSearch: true,
isSearch: false,
table: {
width: 150
},
@ -228,7 +228,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '管理精度',
field: 'manageMode',
sort: 'custom',
isSearch: true,
isSearch: false,
dictType: DICT_TYPE.MANAGEMENT_MODE,
dictClass: 'string',
// colorType: 'danger',
@ -301,7 +301,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '是否可用',
field: 'available',
sort: 'custom',
isSearch: true,
isSearch: false,
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
// colorType: 'danger',
@ -322,13 +322,13 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
label: '出库后剩余库存自动转换为出库包装规格',
field: 'surplusToOutpackunit',
sort: 'custom',
isSearch: true,
isSearch: false,
},
{
label: '超过高储是否允许叫料',
field: 'allowIssueRequest',
sort: 'custom',
isSearch: true,
isSearch: false,
},
{
label: '优先空库位',

264
src/views/wms/basicDataManage/labelManage/callMaterials/index.vue

@ -1,264 +0,0 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="Callmaterials.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="Callmaterials.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total
}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #itemCode="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
<span>{{ row.itemCode }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="CallmaterialsRules"
:formAllSchemas="Callmaterials.allSchemas"
:apiUpdate="CallmaterialsApi.updateCallmaterials"
:apiCreate="CallmaterialsApi.createCallmaterials"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="Callmaterials.allSchemas" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/callmaterials/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { Callmaterials,CallmaterialsRules } from './callmaterials.data'
import * as CallmaterialsApi from '@/api/wms/callmaterials'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
import { formatTime } from '@/utils/index'
import { getAccessToken } from '@/utils/auth'
defineOptions({ name: 'Callmaterials' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(Callmaterials.allSchemas.tableColumns)
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: CallmaterialsApi.getCallmaterialsPage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:callmaterials:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:callmaterials:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:callmaterials:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
// hide: false,
// type: 'primary',
// icon: 'Select',
// color: ''
// },
]
//
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 { //
console.log('其他按钮', item)
}
}
// -
const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'wms:callmaterials:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:callmaterials:delete'}), //
defaultButtons.mainListPointBtn(null), //
]
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
} else if (val == 'point') { //
handlePoint(row)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
if (type == 'create') {
nextTick(() => {
basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
})
}
}
// form
const formsSuccess = async (formType,data) => {
var isHave =Callmaterials.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime';
});
if(isHave){
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
message.error('失效时间要大于生效时间')
return;
}
}
if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null;
if (formType === 'create') {
await CallmaterialsApi.createCallmaterials(data)
message.success(t('common.createSuccess'))
} else {
await CallmaterialsApi.updateCallmaterials(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicCallmaterials')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await CallmaterialsApi.deleteCallmaterials(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await CallmaterialsApi.exportCallmaterials(tableObject.params)
download.excel(data, '叫料标签.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/924811818898698240?token=' + getAccessToken())
//
const handlePoint = async (row) => {
window.open(src.value+'&relateNumber='+row.itemCode)
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '叫料标签导入模版.xlsx'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await CallmaterialsApi.importTemplate()
})
</script>
Loading…
Cancel
Save