sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

hella_online_20240829
chenfang 5 months ago
parent
d25fabec42 050e600b64
commit
5ecec40d3b
19 changed files with 553 additions and 400 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 104
      src/components/SearchTable/src/SearchTable.vue
  2. 22
      src/components/Table/src/Table.vue
  3. 308
      src/components/TableForm/src/TableForm.vue
  4. 2
      src/components/XButton/src/ButtonBase.vue
  5. 4
      src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
  6. 4
      src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
  7. 4
      src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
  8. 4
      src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
  9. 4
      src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
  10. 4
      src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
  11. 4
      src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
  12. 4
      src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
  13. 4
      src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
  14. 4
      src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
  15. 4
      src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
  16. 4
      src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
  17. 4
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  18. 4
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  19. 5
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

104
src/components/SearchTable/src/SearchTable.vue
View File

@ -14,7 +14,8 @@
:allSchemas="allSchemasRef" :allSchemas="allSchemasRef"
/> />
<ContentWrap> <ContentWrap>
<Table v-clientSearchTable <Table
v-clientSearchTable
ref="searchTableRef" ref="searchTableRef"
:columns="tableColumns" :columns="tableColumns"
:data="tableObjectRef.tableList" :data="tableObjectRef.tableList"
@ -30,6 +31,7 @@
:selectionTotal="multipleBol" :selectionTotal="multipleBol"
:reserveSelection="true" :reserveSelection="true"
row-key="id" row-key="id"
@rowClick="rowClick"
/> />
</ContentWrap> </ContentWrap>
<template #footer> <template #footer>
@ -63,17 +65,19 @@ const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const multipleBol = ref(false) const multipleBol = ref(false)
// 列表头部按钮 // 列表头部按钮
const HeadButttondata = ref(multipleBol.value? const HeadButttondata = ref(
[ multipleBol.value
? [
defaultButtons.defaultWhenPageBtn(null), // 选择当页 defaultButtons.defaultWhenPageBtn(null), // 选择当页
defaultButtons.defaultUnselectPageBtn(null), // 反选当页 defaultButtons.defaultUnselectPageBtn(null), // 反选当页
// defaultButtons.defaultDeselectAllBtn(null), // 取消全选 // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
defaultButtons.defaultFilterBtn(null), // 筛选
]:[
defaultButtons.defaultFilterBtn(null) // 筛选 defaultButtons.defaultFilterBtn(null) // 筛选
]) ]
: [
defaultButtons.defaultFilterBtn(null) // 筛选
]
)
/** 打开弹窗 */ /** 打开弹窗 */
const getListRef = ref() const getListRef = ref()
@ -93,13 +97,15 @@ const searchQuery = ref(false)
const openData = (titleName: any, tableObject: any, allSchemas: any, multiple: any) => { const openData = (titleName: any, tableObject: any, allSchemas: any, multiple: any) => {
dialogWidth.value = '80%' dialogWidth.value = '80%'
multipleBol.value = multiple multipleBol.value = multiple
HeadButttondata.value = multiple?[ HeadButttondata.value = multiple
? [
defaultButtons.defaultWhenPageBtn(null), // 选择当页 defaultButtons.defaultWhenPageBtn(null), // 选择当页
defaultButtons.defaultUnselectPageBtn(null), // 反选当页 defaultButtons.defaultUnselectPageBtn(null), // 反选当页
// defaultButtons.defaultDeselectAllBtn(null), // 取消全选 // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null) // 筛选
]:[ ]
defaultButtons.defaultFilterBtn(null), // 筛选 : [
defaultButtons.defaultFilterBtn(null) // 筛选
] ]
dialogTitle.value = t(`ts.${titleName}`).replace('ts.', '') dialogTitle.value = t(`ts.${titleName}`).replace('ts.', '')
tableObjectRef.value = tableObject tableObjectRef.value = tableObject
@ -108,18 +114,35 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any
searchSchema.value = allSchemas.searchSchema searchSchema.value = allSchemas.searchSchema
tableColumns.value = allSchemas.tableColumns tableColumns.value = allSchemas.tableColumns
} }
const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any, searchTableSelections:any) => { const open = (
searchQuery.value = props.showSearchTableQueryFields.find(item=>item==formField)?true:false titleName: any,
allSchemas: any,
getApiPage: any,
formField: any,
searchField: any,
multiple: any,
type: any,
row: any,
searchCondition: any,
isCountRequestRe: any,
isConcatDetailSchemas = false,
detailSchemas: any,
searchTableSelections: any
) => {
searchQuery.value = props.showSearchTableQueryFields.find((item) => item == formField)
? true
: false
dialogWidth.value = '80%' dialogWidth.value = '80%'
multipleBol.value = multiple multipleBol.value = multiple
HeadButttondata.value = multiple?[ HeadButttondata.value = multiple
? [
defaultButtons.defaultWhenPageBtn(null), // 选择当页 defaultButtons.defaultWhenPageBtn(null), // 选择当页
defaultButtons.defaultUnselectPageBtn(null), // 反选当页 defaultButtons.defaultUnselectPageBtn(null), // 反选当页
// defaultButtons.defaultDeselectAllBtn(null), // 取消全选 // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null) // 筛选
]: ]
[ : [
defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultFilterBtn(null) // 筛选
] ]
searchDialogVisible.value = true searchDialogVisible.value = true
formFieldRef.value = formField formFieldRef.value = formField
@ -129,9 +152,11 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
if (isConcatDetailSchemas) { if (isConcatDetailSchemas) {
//主子表合并 //主子表合并
console.log('detailSchemas', detailSchemas) console.log('detailSchemas', detailSchemas)
tableColumns.value = [...allSchemas?.tableColumns,...detailSchemas?.tableMainColumns].filter(item => (item.field !== 'action')) tableColumns.value = [...allSchemas?.tableColumns, ...detailSchemas?.tableMainColumns].filter(
(item) => item.field !== 'action'
)
} else { } else {
tableColumns.value = allSchemas?.tableColumns.filter(item => (item.field !== 'action')) tableColumns.value = allSchemas?.tableColumns.filter((item) => item.field !== 'action')
} }
getPage.value = getApiPage getPage.value = getApiPage
typeRef.value = type typeRef.value = type
@ -145,7 +170,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
}) })
tableObjectRef.value = tableObject tableObjectRef.value = tableObject
searchConditionRef.value = searchCondition searchConditionRef.value = searchCondition
if (searchCondition) tableObjectRef.value.params = searchCondition; if (searchCondition) tableObjectRef.value.params = searchCondition
// 获得表格的各种操作 // 获得表格的各种操作
const { getList, setSearchParams } = tableMethods const { getList, setSearchParams } = tableMethods
@ -170,30 +195,30 @@ const searchFormClick = (searchData) => {
// 20240321 修改 判断 searchData 是否有条件 如果有 拼接 // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
if (searchData.filters) { if (searchData.filters) {
if (searchConditionRef.value.filters) { if (searchConditionRef.value.filters) {
Object.keys(searchConditionRef.value.filters).forEach(key => { Object.keys(searchConditionRef.value.filters).forEach((key) => {
searchData.filters.push(searchConditionRef.value.filters[key]) searchData.filters.push(searchConditionRef.value.filters[key])
}); })
} else { } else {
Object.keys(searchConditionRef.value).forEach(key => { Object.keys(searchConditionRef.value).forEach((key) => {
searchData.filters.push({ searchData.filters.push({
action: "==", action: '==',
column: key, column: key,
value: searchConditionRef.value[key] value: searchConditionRef.value[key]
}) })
}); })
} }
} else { } else {
if (searchConditionRef.value.filters) { if (searchConditionRef.value.filters) {
searchData.filters = searchConditionRef.value.filters searchData.filters = searchConditionRef.value.filters
} else { } else {
searchData.filters = [] searchData.filters = []
Object.keys(searchConditionRef.value).forEach(key => { Object.keys(searchConditionRef.value).forEach((key) => {
searchData.filters.push({ searchData.filters.push({
action: "==", action: '==',
column: key, column: key,
value: searchConditionRef.value[key] value: searchConditionRef.value[key]
}) })
}); })
} }
} }
tableObjectRef.value.params = { tableObjectRef.value.params = {
@ -216,7 +241,6 @@ const buttonBaseClick = (val, item) => {
} }
} }
defineExpose({ open, openData, hiddenFilterButton, changeDialogWidth }) // 提供 open 方法，用于打开弹窗 defineExpose({ open, openData, hiddenFilterButton, changeDialogWidth }) // 提供 open 方法，用于打开弹窗
// Table 组件 ref // Table 组件 ref
@ -247,11 +271,29 @@ const submitForm = async () => {
try { try {
searchDialogVisible.value = false searchDialogVisible.value = false
// 发送操作成功的事件 // 发送操作成功的事件
emit('searchTableSuccess', formFieldRef.value, searchFieldRef.value, selections, typeRef.value, rowRef.value) emit(
'searchTableSuccess',
formFieldRef.value,
searchFieldRef.value,
selections,
typeRef.value,
rowRef.value
)
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
} }
const rowClick = (row: any, column: any, event: Event) => {
const selected = searchTableRef.value?.elTableRef
?.getSelectionRows()
.some((item) => item.id === row.id)
if (!selected) {
searchTableRef.value?.elTableRef?.toggleRowSelection(row, true)
} else {
// 取消
searchTableRef.value?.elTableRef?.toggleRowSelection(row, false)
}
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>

22
src/components/Table/src/Table.vue
View File

@ -63,7 +63,7 @@ export default defineComponent({
searchTableSelectionsList:[],//回显列表 searchTableSelectionsList:[],//回显列表
selectionColor: propTypes.bool.def(false), selectionColor: propTypes.bool.def(false),
}, },
emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows'], emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows','rowClick'],
setup(props, { attrs, slots, emit, expose }) { setup(props, { attrs, slots, emit, expose }) {
const elTableRef = ref<ComponentRef<typeof ElTable>>() const elTableRef = ref<ComponentRef<typeof ElTable>>()
@ -120,12 +120,24 @@ export default defineComponent({
const sortRef = ref() const sortRef = ref()
// 选中某行 // 选中某行
const selectRow = ()=>{ const selectRow = ()=>{
console.log(currentPageRef.value,elTableRef.value?.getSelectionRows())
emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows()) emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
} }
//全选回调 //全选回调
const selectAll = ()=>{ const selectAll = ()=>{
emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows()) emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
} }
const rowClick = (row: any, column: any, event: Event)=>{
// const selected = elTableRef.value?.getSelectionRows().some(item => item.id === row.id)
// if (!selected) {
// elTableRef.value?.toggleRowSelection(row, true);
// } else {
// // 取消
// elTableRef.value?.toggleRowSelection(row, false);
// }
// console.log(elTableRef.value?.getSelectionRows())
emit('rowClick',row,column,event)
}
//反选 //反选
const togglePageSelection = ()=>{ const togglePageSelection = ()=>{
unref(getProps).data.forEach(row=>{ unref(getProps).data.forEach(row=>{
@ -165,7 +177,8 @@ export default defineComponent({
selectAll, selectAll,
toggleAllSelection, toggleAllSelection,
togglePageSelection, togglePageSelection,
clearSelection clearSelection,
elTableRef
}) })
const pagination = computed(() => { const pagination = computed(() => {
@ -388,6 +401,7 @@ export default defineComponent({
onSelect-all={selectAll} onSelect-all={selectAll}
onSelection-change={selectionChange} onSelection-change={selectionChange}
onSort-change={sortChange} onSort-change={sortChange}
onRow-click={rowClick}
{...unref(getBindValue)} {...unref(getBindValue)}
> >
{{ {{
@ -397,7 +411,7 @@ export default defineComponent({
}} }}
</ElTable> </ElTable>
{unref(getProps).selectionTotal ? ( {unref(getProps).selectionTotal ? (
<div class="mt-5px">已选{selections.value.length}条数据</div> <div class="mt-15px float-left" style='height:32px;line-height:32px'>已选{selections.value.length}条数据</div>
):undefined} ):undefined}
{unref(getProps).pagination ? ( {unref(getProps).pagination ? (
// update by 芋艿：保持和 Pagination 组件一致 // update by 芋艿：保持和 Pagination 组件一致
@ -427,7 +441,6 @@ export default defineComponent({
.el-table .selectionRow { .el-table .selectionRow {
--el-table-tr-bg-color: var(--el-color-primary-light-9); --el-table-tr-bg-color: var(--el-color-primary-light-9);
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.el-button.is-text) { :deep(.el-button.is-text) {
@ -439,5 +452,4 @@ export default defineComponent({
padding: 8px 4px; padding: 8px 4px;
margin-left: 0; margin-left: 0;
} }
</style> </style>

308
src/components/TableForm/src/TableForm.vue
View File

@ -1,7 +1,8 @@
<!-- 附件组件 --> <!-- 附件组件 -->
<template> <template>
<div class="table-form"> <div class="table-form">
<el-table class="multipleTableComponents" <el-table
class="multipleTableComponents"
ref="TableBaseComponents_Ref" ref="TableBaseComponents_Ref"
v-loading="tableLoading" v-loading="tableLoading"
:data="showTableData()" :data="showTableData()"
@ -13,7 +14,13 @@
@row-click="handleTableSelect" @row-click="handleTableSelect"
> >
<!-- 删除按钮多选 --> <!-- 删除按钮多选 -->
<el-table-column fixed="left" type="selection" width="50" v-if="isShowReduceButtonSelection" :reserve-selection="true" /> <el-table-column
fixed="left"
type="selection"
width="50"
v-if="isShowReduceButtonSelection"
:reserve-selection="true"
/>
<!-- 删除按钮 --> <!-- 删除按钮 -->
<el-table-column <el-table-column
fixed="left" fixed="left"
@ -21,7 +28,13 @@
v-else-if="isShowReduceButton" v-else-if="isShowReduceButton"
v-slot="{ row, $index }" v-slot="{ row, $index }"
> >
<Icon icon="ep:remove" color="#757575" :size="26" style="cursor: pointer;margin-top: -16px;" @click="handleDeleteTable (row, $index)" /> <Icon
icon="ep:remove"
color="#757575"
:size="26"
style="cursor: pointer; margin-top: -16px"
@click.stop="handleDeleteTable(row, $index)"
/>
</el-table-column> </el-table-column>
<!-- 多选 --> <!-- 多选 -->
<el-table-column <el-table-column
@ -30,7 +43,6 @@
:reserve-selection="true" :reserve-selection="true"
type="selection" type="selection"
:width="50" :width="50"
/> />
<!-- 序号 --> <!-- 序号 -->
<el-table-column <el-table-column
@ -43,73 +55,103 @@
/> />
<el-table-column <el-table-column
v-slot="{ row, $index }" v-slot="{ row, $index }"
v-for="(headerItem) in tableFields.filter(item=>(!item.hidden))" v-for="headerItem in tableFields.filter((item) => !item.hidden)"
:key="headerItem" :key="headerItem"
:fixed="headerItem.tableForm?.fixed" :fixed="headerItem.tableForm?.fixed"
:label="t(`ts.${headerItem.label}`).replace('ts.','')" :prop="headerItem.field" :label="t(`ts.${headerItem.label}`).replace('ts.', '')"
:prop="headerItem.field"
:align="headerItem?.tableForm?.align || 'center'" :align="headerItem?.tableForm?.align || 'center'"
:sortable="headerItem?.tableForm?.sortable || false" :sortable="headerItem?.tableForm?.sortable || false"
:width="headerItem?.tableForm?.width || '200px'" :width="headerItem?.tableForm?.width || '200px'"
:min-width="headerItem?.tableForm?.minWidth || 'auto'"> :min-width="headerItem?.tableForm?.minWidth || 'auto'"
>
<el-form <el-form
ref="TableBaseForm_Ref" ref="TableBaseForm_Ref"
:model="row" :model="row"
style="width: 100%;" style="width: 100%"
:rules="tableFormRules" :rules="tableFormRules"
:class="tableFormRules ? '' : 'noRulesForm'"> :class="tableFormRules ? '' : 'noRulesForm'"
@click.stop=""
>
<!-- 字符串输入框 --> <!-- 字符串输入框 -->
<el-form-item <el-form-item
v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'" v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
:prop="headerItem.field" style="display: flex;align-items: center;"> :prop="headerItem.field"
<el-input :key="headerItem.field+$index" style="display: flex; align-items: center"
>
<el-input
:key="headerItem.field + $index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
clearable clearable
:type="headerItem?.tableForm?.inputType" :type="headerItem?.tableForm?.inputType"
:placeholder="t(`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`).replace('ts.','')" :placeholder="
t(
`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`
).replace('ts.', '')
"
:disabled="disabledInput(headerItem, row)" :disabled="disabledInput(headerItem, row)"
style="flex: 1" style="flex: 1"
@blur="inputStringBlur(headerItem, row[headerItem.field], row,index)" @blur.stop="inputStringBlur(headerItem, row[headerItem.field], row, index)"
/> />
<Icon icon="ep:circle-close" v-if="headerItem?.tableForm?.isInpuFocusShow && headerItem?.tableForm?.disabled&& headerItem?.tableForm?.clearable" style='position:absolute;right:50px;cursor: pointer;' @click="clearInput(headerItem.field,row,index)"/> <Icon
<el-button :key="headerItem.field+$index+'button'" v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button> icon="ep:circle-close"
v-if="
headerItem?.tableForm?.isInpuFocusShow &&
headerItem?.tableForm?.disabled &&
headerItem?.tableForm?.clearable
"
style="position: absolute; right: 50px; cursor: pointer"
@click.stop="clearInput(headerItem.field, row, index)"
/>
<el-button
:key="headerItem.field + $index + 'button'"
v-if="headerItem?.tableForm?.isInpuFocusShow"
@click.stop="inpuFocus(headerItem, row, index)"
><Icon icon="ep:search" size="14"
/></el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="headerItem?.tableForm?.type == 'slot'"> <el-form-item v-if="headerItem?.tableForm?.type == 'slot'">
<slot :row="row"></slot> <slot :row="row"></slot>
</el-form-item> </el-form-item>
<!-- 金额输入框 --> <!-- 金额输入框 -->
<el-form-item <el-form-item v-if="headerItem?.tableForm?.type == 'number'" :prop="headerItem.field" >
v-if="headerItem?.tableForm?.type == 'number'" <el-input
:prop="headerItem.field"> :key="headerItem.field + $index"
<el-input :key="headerItem.field+$index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
clearable clearable
type="number" type="number"
:placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label" :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
:disabled="itemIsDisabled(headerItem, row)" :disabled="itemIsDisabled(headerItem, row)"
style="width: 100%;" style="width: 100%"
@input="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')" @input.stop="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')"
@click.stop=""
@focus.stop=""
/> />
</el-form-item> </el-form-item>
<!-- 数字输入框 --> <!-- 数字输入框 -->
<el-form-item <el-form-item
v-if="headerItem?.tableForm?.type == 'InputNumber'" v-if="headerItem?.tableForm?.type == 'InputNumber'"
:prop="headerItem.field"> :prop="headerItem.field"
>
<el-input-number <el-input-number
style="width: 100%;" style="width: 100%"
:key="headerItem.field + $index" :key="headerItem.field + $index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:max="headerItem?.tableForm?.max" :max="headerItem?.tableForm?.max"
:min="headerItem?.tableForm?.min" :min="headerItem?.tableForm?.min"
:precision="headerItem?.tableForm?.precision" :precision="headerItem?.tableForm?.precision"
:disabled="itemIsDisabled(headerItem, row)" :disabled="itemIsDisabled(headerItem, row)"
@change="(e)=>{inputNumberChange(headerItem.field, $index, row, e)}" @change.stop="
(e) => {
inputNumberChange(headerItem.field, $index, row, e)
}
"
/> />
</el-form-item> </el-form-item>
<!-- 下拉框 --> <!-- 下拉框 -->
<el-form-item <el-form-item v-if="headerItem?.tableForm?.type == 'Select'" :prop="headerItem.field">
v-if="headerItem?.tableForm?.type == 'Select'" <el-select
:prop="headerItem.field"> :key="headerItem.field + $index"
<el-select :key="headerItem.field+$index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:clearable="headerItem?.tableForm.clearable || true" :clearable="headerItem?.tableForm.clearable || true"
:multiple="headerItem?.tableForm.multiple" :multiple="headerItem?.tableForm.multiple"
@ -122,20 +164,24 @@
:allow-create="headerItem?.tableForm.allowCreate" :allow-create="headerItem?.tableForm.allowCreate"
style="width: 100%" style="width: 100%"
:placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label" :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
@change="formSelectChange(headerItem.field, $event,row)" @change.stop="formSelectChange(headerItem.field, $event, row)"
@blur="tableFormSelectOnBlur(headerItem.field, $event,row, $index)"> @blur.stop="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
>
<el-option <el-option
v-for="op in initSelectOptions(headerItem)" v-for="op in initSelectOptions(headerItem)"
:label="t(`ts.${op.label}`).replace('ts.', '')" :label="t(`ts.${op.label}`).replace('ts.', '')"
:value="op.value" :value="op.value"
:key="op.value" /> :key="op.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 下拉框 --> <!-- 下拉框 -->
<el-form-item <el-form-item
v-if="headerItem?.tableForm?.type == 'SelectGroup'" v-if="headerItem?.tableForm?.type == 'SelectGroup'"
:prop="headerItem.field"> :prop="headerItem.field"
<el-select :key="headerItem.field+$index" >
<el-select
:key="headerItem.field + $index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:clearable="headerItem?.tableForm.clearable || true" :clearable="headerItem?.tableForm.clearable || true"
:multiple="headerItem?.tableForm.multiple" :multiple="headerItem?.tableForm.multiple"
@ -148,8 +194,9 @@
:allow-create="headerItem?.tableForm.allowCreate" :allow-create="headerItem?.tableForm.allowCreate"
style="width: 100%" style="width: 100%"
:placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label" :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
@change="formSelectChange(headerItem.field, $event,row)" @change.stop="formSelectChange(headerItem.field, $event, row)"
@blur="tableFormSelectOnBlur(headerItem.field, $event,row, $index)"> @blur.stop="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
>
<el-option-group <el-option-group
v-for="group in initSelectOptions(headerItem)" v-for="group in initSelectOptions(headerItem)"
:key="group.type" :key="group.type"
@ -165,21 +212,20 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 时间选择器 --> <!-- 时间选择器 -->
<el-form-item <el-form-item v-if="headerItem?.tableForm?.type == 'FormTime'" :prop="headerItem.field">
v-if="headerItem?.tableForm?.type == 'FormTime'" <el-time-picker
:prop="headerItem.field"> :key="headerItem.field + $index"
<el-time-picker :key="headerItem.field+$index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:clearable="true" :clearable="true"
:placeholder="headerItem?.tableForm?.placeholder || '选择时间'" :placeholder="headerItem?.tableForm?.placeholder || '选择时间'"
style="width: 100%" :disabled="itemIsDisabled(headerItem, row)" style="width: 100%"
:disabled="itemIsDisabled(headerItem, row)"
:format="headerItem?.tableForm?.format || 'HH:mm:ss'" :format="headerItem?.tableForm?.format || 'HH:mm:ss'"
:value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'" /> :value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'"
/>
</el-form-item> </el-form-item>
<!-- 日期选择器 --> <!-- 日期选择器 -->
<el-form-item <el-form-item v-if="headerItem?.tableForm?.type == 'FormDate'" :prop="headerItem.field">
v-if="headerItem?.tableForm?.type == 'FormDate'"
:prop="headerItem.field">
<el-date-picker <el-date-picker
:key="headerItem.field + $index" :key="headerItem.field + $index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
@ -189,12 +235,14 @@
:placeholder="headerItem?.tableForm?.placeholder || '选择日期'" :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
:format="headerItem?.tableForm?.format || 'YYYY-MM-DD'" :format="headerItem?.tableForm?.format || 'YYYY-MM-DD'"
:value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'" :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'"
@change="formFormDateChange(headerItem.field, $event,row, $index)" /> @change.stop="formFormDateChange(headerItem.field, $event, row, $index)"
/>
</el-form-item> </el-form-item>
<!-- 日期时间选择器 --> <!-- 日期时间选择器 -->
<el-form-item <el-form-item
v-if="headerItem?.tableForm?.type == 'FormDateTime'" v-if="headerItem?.tableForm?.type == 'FormDateTime'"
:prop="headerItem.field"> :prop="headerItem.field"
>
<el-date-picker <el-date-picker
:key="headerItem.field + $index" :key="headerItem.field + $index"
type="datetime" type="datetime"
@ -204,13 +252,16 @@
style="width: 100%" style="width: 100%"
:format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'" :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
:value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'" :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
:disabled="itemIsDisabled(headerItem, row)" /> :disabled="itemIsDisabled(headerItem, row)"
/>
</el-form-item> </el-form-item>
<!--开始时间结束时间选择器 (原类型datetimerange已弃用 使用type+timeType结合方式)--> <!--开始时间结束时间选择器 (原类型datetimerange已弃用 使用type+timeType结合方式)-->
<el-form-item <el-form-item
v-if="headerItem?.tableForm?.type == 'FormTimerange'" v-if="headerItem?.tableForm?.type == 'FormTimerange'"
:prop="headerItem.field"> :prop="headerItem.field"
<el-date-picker :key="headerItem.field+$index" >
<el-date-picker
:key="headerItem.field + $index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:clearable="true" :clearable="true"
:disabled="itemIsDisabled(headerItem, row)" :disabled="itemIsDisabled(headerItem, row)"
@ -219,13 +270,13 @@
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
:format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'" :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
:value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'" /> :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
/>
</el-form-item> </el-form-item>
<!-- Switch 开关 --> <!-- Switch 开关 -->
<el-form-item <el-form-item v-if="headerItem?.tableForm?.type == 'Switch'" :prop="headerItem.field">
v-if="headerItem?.tableForm?.type == 'Switch'" <el-switch
:prop="headerItem.field"> :key="headerItem.field + $index"
<el-switch :key="headerItem.field+$index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:disabled="itemIsDisabled(headerItem, row)" :disabled="itemIsDisabled(headerItem, row)"
:loading="headerItem?.tableForm?.loading" :loading="headerItem?.tableForm?.loading"
@ -237,43 +288,45 @@
:active-value="headerItem?.tableForm?.activeValue" :active-value="headerItem?.tableForm?.activeValue"
:inactive-value="headerItem?.tableForm?.inactiveValue" :inactive-value="headerItem?.tableForm?.inactiveValue"
:active-color="headerItem?.tableForm?.inactiveColor" :active-color="headerItem?.tableForm?.inactiveColor"
:inactive-color="headerItem?.tableForm?.inactiveColor" /> :inactive-color="headerItem?.tableForm?.inactiveColor"
/>
</el-form-item> </el-form-item>
<!-- Radio 单选--> <!-- Radio 单选-->
<el-form-item <el-form-item v-if="headerItem?.tableForm?.type == 'Radio'" :prop="headerItem.field">
v-if="headerItem?.tableForm?.type == 'Radio'" <el-radio-group
:prop="headerItem.field"> :key="headerItem.field + $index"
<el-radio-group :key="headerItem.field+$index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:size="headerItem?.tableForm?.size" :size="headerItem?.tableForm?.size"
:disabled="itemIsDisabled(headerItem, row)" :disabled="itemIsDisabled(headerItem, row)"
:text-color="headerItem?.tableForm?.textColor" :text-color="headerItem?.tableForm?.textColor"
:fill="headerItem?.tableForm?.fill" :fill="headerItem?.tableForm?.fill"
:name="headerItem?.tableForm?.name" :name="headerItem?.tableForm?.name"
:id="headerItem?.tableForm?.id"> :id="headerItem?.tableForm?.id"
>
<el-radio <el-radio
v-for="(item, index) in initSelectOptions(headerItem)" v-for="(item, index) in initSelectOptions(headerItem)"
:key="index" :key="index"
:label="t(`ts.${item.value}`).replace('ts.', '')" :label="t(`ts.${item.value}`).replace('ts.', '')"
:size="headerItem?.tableForm?.size" :size="headerItem?.tableForm?.size"
:disabled="itemIsDisabled(headerItem, row)" :disabled="itemIsDisabled(headerItem, row)"
:border="headerItem?.tableForm?.border"> :border="headerItem?.tableForm?.border"
>
{{ item.label }} {{ item.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<!-- Checkbox 多选--> <!-- Checkbox 多选-->
<el-form-item <el-form-item v-if="headerItem?.tableForm?.type == 'Checkbox'" :prop="headerItem.field">
v-if="headerItem?.tableForm?.type == 'Checkbox'" <el-checkbox-group
:prop="headerItem.field"> :key="headerItem.field + $index"
<el-checkbox-group :key="headerItem.field+$index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:disabled="itemIsDisabled(headerItem, row)" :disabled="itemIsDisabled(headerItem, row)"
:size="headerItem?.tableForm?.size" :size="headerItem?.tableForm?.size"
:min="headerItem?.tableForm?.min" :min="headerItem?.tableForm?.min"
:max="headerItem?.tableForm?.max" :max="headerItem?.tableForm?.max"
:text-color="headerItem?.tableForm?.textColor" :text-color="headerItem?.tableForm?.textColor"
:fill="headerItem?.tableForm?.fill"> :fill="headerItem?.tableForm?.fill"
>
<el-checkbox <el-checkbox
v-for="(item, index) in initSelectOptions(headerItem)" v-for="(item, index) in initSelectOptions(headerItem)"
:key="index" :key="index"
@ -284,7 +337,8 @@
:border="headerItem?.tableForm?.border" :border="headerItem?.tableForm?.border"
:size="headerItem?.tableForm?.size" :size="headerItem?.tableForm?.size"
:name="headerItem?.tableForm?.name" :name="headerItem?.tableForm?.name"
:checked="headerItem?.tableForm?.checked"> :checked="headerItem?.tableForm?.checked"
>
{{ item.label }} {{ item.label }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
@ -296,9 +350,16 @@
v-for="(itemButton, indexButton) in headerItem?.tableForm?.buttonText.split('|')" v-for="(itemButton, indexButton) in headerItem?.tableForm?.buttonText.split('|')"
:key="indexButton" :key="indexButton"
type="text" type="text"
style="padding-top: 0px;align-items:unsafe;" style="padding-top: 0px; align-items: unsafe"
@click="buttonOperationClick(row, headerItem?.tableForm?.buttonName.split('|')[indexButton], $index)" @click.stop="
>{{itemButton}}</el-button> buttonOperationClick(
row,
headerItem?.tableForm?.buttonName.split('|')[indexButton],
$index
)
"
>{{ itemButton }}</el-button
>
</div> </div>
<!-- </el-form-item> --> <!-- </el-form-item> -->
</el-form> </el-form>
@ -312,11 +373,16 @@
v-if="isShowReduceButtonSelection" v-if="isShowReduceButtonSelection"
v-slot="{ row, $index }" v-slot="{ row, $index }"
> >
<ButtonBase :Butttondata="[defaultButtons.mainListDeleteBtn(),]" @button-base-click="handleDeleteTable (row, $index)" /> <ButtonBase
:Butttondata="[defaultButtons.mainListDeleteBtn()]"
@button-base-click="handleDeleteTable(row, $index)"
/>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- :page-sizes="[ 10,20, 30, 50, 100]" sizes--> <!-- :page-sizes="[ 10,20, 30, 50, 100]" sizes-->
<el-pagination v-show="tableData.length>10" style="margin-top:10px" <el-pagination
v-show="tableData.length > 10"
style="margin-top: 10px"
v-model:current-page="currentPage" v-model:current-page="currentPage"
v-model:page-size="pageSize" v-model:page-size="pageSize"
:small="true" :small="true"
@ -325,17 +391,30 @@
:total="tableData.length" :total="tableData.length"
/> />
<div class="button flex" v-if="isShowButton || isShowReduceButtonSelection"> <div class="button flex" v-if="isShowButton || isShowReduceButtonSelection">
<div class="p-12px" v-if="isShowButton" @click="handleAddTable"> <div class="p-12px" v-if="isShowButton" @click.stop="handleAddTable">
<Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" /> <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
<div>{{ t('ts.添加明细') }}</div> <div>{{ t('ts.添加明细') }}</div>
</div> </div>
<div class="p-12px" v-if="isShowReduceButtonSelection" @click="handleSelectionDelete"> <div class="p-12px" v-if="isShowReduceButtonSelection" @click.stop="handleSelectionDelete">
<Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer;" /> <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer" />
<div>{{ t('ts.批量删除') }}</div> <div>{{ t('ts.批量删除') }}</div>
</div> </div>
<div class="p-12px" v-if="routeName == 'PurchaseMain'||routeName == 'ProductionMain'||routeName == 'ZZBJDeliverPlanMain'||routeName == 'DeliverPlanMain'||routeName == 'DeliverRequestMain'||routeName == 'ZZBJDeliverRequestMain'||routeName == 'UnplannedreceiptRequestMain'"> <div
class="p-12px"
v-if="
routeName == 'PurchaseMain' ||
routeName == 'ProductionMain' ||
routeName == 'ZZBJDeliverPlanMain' ||
routeName == 'DeliverPlanMain' ||
routeName == 'DeliverRequestMain' ||
routeName == 'ZZBJDeliverRequestMain' ||
routeName == 'UnplannedreceiptRequestMain'
"
>
<el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加" /> <el-input v-model="keyWord" style="width: 240px" placeholder="回车自动添加" />
<el-button type="primary" style="margin-left: 10px" @click="batchAdd">{{t('批量添加')}}</el-button> <el-button type="primary" style="margin-left: 10px" @click.stop="batchAdd">{{
t('批量添加')
}}</el-button>
</div> </div>
</div> </div>
</div> </div>
@ -349,46 +428,46 @@ const props = defineProps({
// 是否显示添加按钮 // 是否显示添加按钮
isShowButton: { isShowButton: {
type: Boolean, type: Boolean,
default: true, default: true
}, },
// 是否显示选择框 :custom="headerItem.sortable?headerItem.sortable:false" // 是否显示选择框 :custom="headerItem.sortable?headerItem.sortable:false"
selectionTable: { selectionTable: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
// 是否显示序号 // 是否显示序号
isShowIndex: { isShowIndex: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
// 是否显示删除按钮--多选 // 是否显示删除按钮--多选
isShowReduceButtonSelection: { isShowReduceButtonSelection: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
// 是否显示删除按钮 // 是否显示删除按钮
isShowReduceButton: { isShowReduceButton: {
type: Boolean, type: Boolean,
default: true, default: true
}, },
// 加载状态 // 加载状态
tableLoading: { tableLoading: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
// 列表数据 // 列表数据
tableData: { tableData: {
type: Array, type: Array,
default: () => { default: () => {
return [] return []
}, }
}, },
// 列表头定义 // 列表头定义
tableFields: { tableFields: {
type: Array, type: Array,
default: () => { default: () => {
return [] return []
}, }
}, },
// table高度 // table高度
height: { height: {
@ -406,7 +485,7 @@ const props = defineProps({
// 是否有边框（可拖拽） // 是否有边框（可拖拽）
border: { border: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
// table输入表单的rules // table输入表单的rules
tableFormRules: { tableFormRules: {
@ -418,7 +497,7 @@ const props = defineProps({
type: String, type: String,
required: false, required: false,
default: '' default: ''
}, }
}) })
// 传递给父类 // 传递给父类
const emit = defineEmits([ const emit = defineEmits([
@ -475,7 +554,7 @@ const tableSelectionChange = (val) => {
const handleSelectionDelete = () => { const handleSelectionDelete = () => {
emit('tableSelectionDelete', deleteTableData.value) emit('tableSelectionDelete', deleteTableData.value)
nextTick(() => { nextTick(() => {
deleteTableData.value.forEach(row=>{ deleteTableData.value.forEach((row) => {
TableBaseComponents_Ref.value!.toggleRowSelection(row, false) TableBaseComponents_Ref.value!.toggleRowSelection(row, false)
}) })
}) })
@ -491,12 +570,25 @@ const tableSortChange = (column, prop, order) => {
// 行点击 // 行点击
const handleTableSelect = (row, column, event) => { const handleTableSelect = (row, column, event) => {
const selected = TableBaseComponents_Ref.value
?.getSelectionRows()
.some((item) => item.id === row.id)
if (!selected) {
TableBaseComponents_Ref.value?.toggleRowSelection(row, true)
} else {
// 取消
TableBaseComponents_Ref.value?.toggleRowSelection(row, false)
}
emit('handleTableSelect', row, column, event) emit('handleTableSelect', row, column, event)
} }
// 某个item是否禁用 // 某个item是否禁用
const itemIsDisabled = (colum, row) => { const itemIsDisabled = (colum, row) => {
return Boolean(colum.tableForm?.disabled) || Boolean(row.disabled) || Boolean(row['disabled_' + colum.field]) return (
Boolean(colum.tableForm?.disabled) ||
Boolean(row.disabled) ||
Boolean(row['disabled_' + colum.field])
)
} }
// const { t } = useI18n() // 国际化 // const { t } = useI18n() // 国际化
@ -513,10 +605,12 @@ const TableBaseForm_Ref = ref()
const validateForm = () => { const validateForm = () => {
console.log(TableBaseForm_Ref.value) console.log(TableBaseForm_Ref.value)
let _lists = TableBaseForm_Ref.value?.map(v => v.validate()) let _lists = TableBaseForm_Ref.value?.map((v) => v.validate())
return Promise.all(_lists).then(() => { return Promise.all(_lists)
.then(() => {
return true return true
}).catch(() => { })
.catch(() => {
return false return false
}) })
} }
@ -547,14 +641,17 @@ const clearInput= (field, row, index) => {
} }
//点击table操作列按钮 //点击table操作列按钮
const buttonOperationClick = (row, label, index) => { const buttonOperationClick = (row, label, index) => {
emit("buttonOperationClick", row, label, index); emit('buttonOperationClick', row, label, index)
} }
const currentPage = ref(1) const currentPage = ref(1)
const pageSize = ref(10) const pageSize = ref(10)
const showTableData = () => { const showTableData = () => {
if (props.tableData.length > 10) { if (props.tableData.length > 10) {
return props.tableData.slice((currentPage.value-1)*pageSize.value,currentPage.value*pageSize.value) return props.tableData.slice(
(currentPage.value - 1) * pageSize.value,
currentPage.value * pageSize.value
)
} else { } else {
return props.tableData return props.tableData
} }
@ -564,8 +661,8 @@ console.log(9999,props.tableFields)
const batchAdd = () => { const batchAdd = () => {
console.log(keyWord.value) console.log(keyWord.value)
let field = '' let field = ''
const itemCodeFields = props.tableFields.find(item=>item.field == 'itemCode') const itemCodeFields = props.tableFields.find((item) => item.field == 'itemCode')
const supplierFields = props.tableFields.find(item=>item.field == 'supplierCode') const supplierFields = props.tableFields.find((item) => item.field == 'supplierCode')
if (itemCodeFields) { if (itemCodeFields) {
field = itemCodeFields.field field = itemCodeFields.field
} else { } else {
@ -584,7 +681,12 @@ const disabledInput=(headerItem,row)=>{
return true return true
} }
} else { } else {
return headerItem?.tableForm?.disabled || Boolean(row.disabled) || Boolean(row['disabled_' + headerItem.field]) ||false return (
headerItem?.tableForm?.disabled ||
Boolean(row.disabled) ||
Boolean(row['disabled_' + headerItem.field]) ||
false
)
} }
} }
@ -594,13 +696,12 @@ defineExpose({
validateForm, validateForm,
keyWord keyWord
}) })
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep(.el-table__body) { ::v-deep(.el-table__body) {
padding:10px 0px padding: 10px 0px;
} }
::v-deep(.el-table--default .el-table__cell) { ::v-deep(.el-table--default .el-table__cell) {
padding: 2px 0px; padding: 2px 0px;
@ -623,6 +724,11 @@ defineExpose({
display: block; display: block;
} }
.table-form ::v-deep(.is-horizontal) {
height: 12px !important;
display: block !important;
}
.button { .button {
> div { > div {
display: flex; display: flex;
@ -636,7 +742,5 @@ defineExpose({
color: #409eff; color: #409eff;
} }
} }
} }
</style> </style>

2
src/components/XButton/src/ButtonBase.vue
View File

@ -8,7 +8,7 @@
:disabled="item.disabled" :disabled="item.disabled"
v-hasPermi="[item.hasPermi] || []" v-hasPermi="[item.hasPermi] || []"
v-if="item.name != 'set'" v-if="item.name != 'set'"
@click="buttonBaseClick(item.name, item, $event)" @click.stop="buttonBaseClick(item.name, item, $event)"
> >
<Icon v-if="item.icon" :icon="item.icon" class="mr-1px" /> <Icon v-if="item.icon" :icon="item.icon" class="mr-1px" />
<span :style="{width:item.width+'px'||'auto'}" :class="[item.width?'ellipsis':'']">{{ item.label }}</span> <span :style="{width:item.width+'px'||'auto'}" :class="[item.width?'ellipsis':'']">{{ item.label }}</span>

4
src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
View File

@ -1,7 +1,7 @@
<!-- 到货验货任务拆分策略弹出层 --> <!-- 到货验货任务拆分策略弹出层 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<!-- 规则 --> <!-- 规则 -->
<el-form <el-form
ref="formRef" ref="formRef"

4
src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
View File

@ -1,7 +1,7 @@
<!-- 批次策略弹窗 --> <!-- 批次策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"

4
src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
View File

@ -1,7 +1,7 @@
<!-- 下架策略弹窗 --> <!-- 下架策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"

4
src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
View File

@ -1,8 +1,8 @@
<!-- 检验策略弹窗 --> <!-- 检验策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px" >
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"

4
src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
View File

@ -1,7 +1,7 @@
<!-- 管理精度策略弹窗 --> <!-- 管理精度策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"

4
src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
View File

@ -1,8 +1,8 @@
<!-- 采购收货任务拆分策略弹出层 --> <!-- 采购收货任务拆分策略弹出层 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<!-- 规则 --> <!-- 规则 -->
<el-form <el-form
ref="formRef" ref="formRef"

4
src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
View File

@ -1,7 +1,7 @@
<!-- 补料策略弹窗 --> <!-- 补料策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"

4
src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
View File

@ -1,7 +1,7 @@
<!-- 存储容量策略弹窗 --> <!-- 存储容量策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"

4
src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
View File

@ -1,8 +1,8 @@
<!-- 采购计划策略弹出层 --> <!-- 采购计划策略弹出层 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"

4
src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
View File

@ -1,7 +1,7 @@
<!-- 上架策略弹窗 --> <!-- 上架策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"

4
src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
View File

@ -1,7 +1,7 @@
<!-- 器具容量策略弹窗 --> <!-- 器具容量策略弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"

4
src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
View File

@ -1,7 +1,7 @@
<!-- 库位存储策略弹窗弹窗 --> <!-- 库位存储策略弹窗弹窗 -->
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto"> <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"

4
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
View File

@ -127,7 +127,7 @@
:isShowFooterButtton="false" :isShowFooterButtton="false"
/> />
<!-- 标签打印 --> <!-- 标签打印 -->
<SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" /> <SearchTable width="905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
<el-dialog <el-dialog
v-model="showQualityReport" v-model="showQualityReport"
:title="t('质检明细')" :title="t('质检明细')"
@ -459,7 +459,7 @@ const labelPrint = async (row) => {
tableObject.loading = false tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
tableColumns.forEach((item) => { tableColumns.forEach((item) => {
item.width = item.table?.width || 150 item.width = item.table?.width
}) })
searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
} }

4
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
View File

@ -154,7 +154,7 @@
</BasicForm> </BasicForm>
<!-- 标签打印 --> <!-- 标签打印 -->
<SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" > <SearchTable width="905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
<!-- <template #actions> <!-- <template #actions>
<el-button type="primary" @click="printAllClick">打印全部</el-button> <el-button type="primary" @click="printAllClick">打印全部</el-button>
</template> --> </template> -->
@ -894,7 +894,7 @@ const labelPrint = async (row) => {
tableObject.loading = false tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
tableColumns.forEach((item) => { tableColumns.forEach((item) => {
item.width = item.table?.width || 150 item.width = item.table?.width
}) })
searchTableRef.value.openData(t('ts.标签信息'),tableObjectPrint,{tableColumns},true) searchTableRef.value.openData(t('ts.标签信息'),tableObjectPrint,{tableColumns},true)
} }

5
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
View File

@ -1694,7 +1694,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
table: { table: {
width: 180,
fixed: 'left' fixed: 'left'
}, },
}, },
@ -1704,7 +1703,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
table: { table: {
width: 150,
}, },
}, },
{ {
@ -1713,7 +1711,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
table: { table: {
width: 150,
}, },
}, },
{ {
@ -1721,7 +1718,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
field: 'qty', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150,
}, },
}, },
{ {
@ -1734,7 +1730,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
component: 'SelectV2' component: 'SelectV2'
}, },
table: { table: {
width: 150,
}, },
}, },

Write Preview
Loading…
Cancel
Save