Browse Source

《盘点配置表》新增时,如果选择的品番在《单位转换管理》中,维护了转换率,则带出该转换率;如果未维护转换率则默认为1

intex_online_yejiaxing
叶佳兴 2 weeks ago
parent
commit
5c1f97b67c
  1. 26
      src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
  2. 3
      src/views/wms/countManage/count/countConfig/countConfig.data.ts
  3. 136
      src/views/wms/countManage/count/countConfig/index.vue

26
src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts

@ -106,19 +106,19 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
isSearch : true, isSearch : true,
isTable : true isTable : true
}, },
// { {
// label: '价格', label: '价格',
// field: 'price', field: 'price',
// sort: 'custom', sort: 'custom',
// isSearch: true, isSearch: true,
// form: { form: {
// component: 'InputNumber', component: 'InputNumber',
// componentProps: { componentProps: {
// min: 0, min: 0,
// precision: 6 precision: 6
// } }
// } }
// }, },
{ {
label: '是否可用', label: '是否可用',
field: 'available', field: 'available',

3
src/views/wms/countManage/count/countConfig/countConfig.data.ts

@ -146,7 +146,8 @@ export const CountConfig = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
value: 0, value: 0,
componentProps: { componentProps: {
min:0, disabled: true,
min:1,
precision:2 precision:2
} }
}, },

136
src/views/wms/countManage/count/countConfig/index.vue

@ -1,18 +1,22 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="CountConfig.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search
:schema="CountConfig.allSchemas.searchSchema"
@search="setSearchParams"
@reset="setSearchParams"
/>
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
<TableHead <TableHead
:HeadButttondata="HeadButttondata" :HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick" @button-base-click="buttonBaseClick"
:routeName="routeName" :routeName="routeName"
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="CountConfig.allSchemas" :allSchemas="CountConfig.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
@ -27,13 +31,13 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
> >
<template #code="{row}"> <template #code="{ row }">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)"> <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span> <span>{{ row.code }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -47,6 +51,7 @@
:apiUpdate="CountConfigApi.updateCountConfig" :apiUpdate="CountConfigApi.updateCountConfig"
:apiCreate="CountConfigApi.createCountConfig" :apiCreate="CountConfigApi.createCountConfig"
@searchTableSuccess="searchTableSuccess" @searchTableSuccess="searchTableSuccess"
@clearSearchInput="clearSearchInput"
:isBusiness="false" :isBusiness="false"
/> />
@ -54,11 +59,12 @@
<Detail ref="detailRef" :isBasic="true" :allSchemas="CountConfig.allSchemas" /> <Detail ref="detailRef" :isBasic="true" :allSchemas="CountConfig.allSchemas" />
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" <ImportForm
url="/wms/count-config/import" ref="importFormRef"
:importTemplateData="importTemplateData" url="/wms/count-config/import"
@success="importSuccess" :importTemplateData="importTemplateData"
:updateIsDisable="true" @success="importSuccess"
:updateIsDisable="true"
:appendIsDisable="true" :appendIsDisable="true"
:mode="3" :mode="3"
/> />
@ -66,7 +72,7 @@
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { CountConfig,CountConfigRules } from './countConfig.data' import { CountConfig, CountConfigRules } from './countConfig.data'
import * as CountConfigApi from '@/api/wms/countConfig' import * as CountConfigApi from '@/api/wms/countConfig'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
@ -90,13 +96,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
if (formField == 'itemCode') { if (formField == 'itemCode') {
setV['itemName'] = val[0].name setV['itemName'] = val[0].name
setV['desc1'] = val[0].backNumber setV['desc1'] = val[0].backNumber
setV['uom'] = val[0].uom setV['uom'] = val[0].uom
setV['packUnit'] = val[0].defaultPackUnit setV['packUnit'] = val[0].defaultPackUnit
setV['packQty'] = val[0].defaultPackQty setV['packQty'] = val[0].defaultPackQty
setV['conversionRate'] = val[0].convertRate
} }
formRef.setValues(setV) formRef.setValues(setV)
}) })
} }
@ -115,12 +121,12 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:count-config:create'}), // defaultButtons.defaultAddBtn({ hasPermi: 'wms:count-config:create' }), //
defaultButtons.defaultImportBtn({hasPermi:'wms:count-config:import'}), // defaultButtons.defaultImportBtn({ hasPermi: 'wms:count-config:import' }), //
defaultButtons.defaultExportBtn({hasPermi:'wms:count-config:export'}), // defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-config:export' }), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null) //
// { // {
// label: '', // label: '',
// name: 'zdy', // name: 'zdy',
@ -133,16 +139,22 @@ const HeadButttondata = [
// //
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
if (val == 'add') { // if (val == 'add') {
//
openForm('create') openForm('create')
} else if (val == 'import') { // } else if (val == 'import') {
//
handleImport() handleImport()
} else if (val == 'export') { // } else if (val == 'export') {
//
handleExport() handleExport()
} else if (val == 'refresh') { // } else if (val == 'refresh') {
//
getList() getList()
} else if (val == 'filtrate') { // } else if (val == 'filtrate') {
} else { // //
} else {
//
console.log('其他按钮', item) console.log('其他按钮', item)
} }
} }
@ -150,14 +162,16 @@ const buttonBaseClick = (val, item) => {
// - // -
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn(), // defaultButtons.mainListEditBtn(), //
defaultButtons.mainListDeleteBtn(), // defaultButtons.mainListDeleteBtn() //
] ]
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'edit') { // if (val == 'edit') {
//
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // } else if (val == 'delete') {
//
handleDelete(row.id) handleDelete(row.id)
} }
} }
@ -165,16 +179,16 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */ /** 添加/修改操作 */
const basicFormRef = ref() const basicFormRef = ref()
const openForm = (type: string, row?: any) => { const openForm = (type: string, row?: any) => {
if(type=='create'){ if (type == 'create') {
CountConfig.allSchemas.formSchema.forEach(item =>{ CountConfig.allSchemas.formSchema.forEach((item) => {
if(item.field == "itemCode"){ if (item.field == 'itemCode') {
item.componentProps.isSearchList = true item.componentProps.isSearchList = true
item.componentProps.disabled = false item.componentProps.disabled = false
} }
}) })
} else if(type=='update'){ } else if (type == 'update') {
CountConfig.allSchemas.formSchema.forEach(item =>{ CountConfig.allSchemas.formSchema.forEach((item) => {
if(item.field == "itemCode"){ if (item.field == 'itemCode') {
item.componentProps.isSearchList = false item.componentProps.isSearchList = false
item.componentProps.disabled = true item.componentProps.disabled = true
} }
@ -184,18 +198,18 @@ const openForm = (type: string, row?: any) => {
} }
// form // form
const formsSuccess = async (formType,data) => { const formsSuccess = async (formType, data) => {
var isHave =CountConfig.allSchemas.formSchema.some(function (item) { var isHave = CountConfig.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime'; return item.field === 'activeTime' || item.field === 'expireTime'
}); })
if(isHave){ if (isHave) {
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
message.error('失效时间要大于生效时间') message.error('失效时间要大于生效时间')
return; return
} }
} }
if(data.activeTime==0)data.activeTime = null; if (data.activeTime == 0) data.activeTime = null
if(data.expireTime==0)data.expireTime = null; if (data.expireTime == 0) data.expireTime = null
if (formType === 'create') { if (formType === 'create') {
await CountConfigApi.createCountConfig(data) await CountConfigApi.createCountConfig(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
@ -257,6 +271,21 @@ const importSuccess = () => {
getList() getList()
} }
const clearSearchInput = (formField) => {
if (formField == 'itemCode') {
//
basicFormRef.value.formRef.setValues({
itemName: '',
desc1: '',
uom: '',
packUnit: '',
packQty: '',
conversionRate: 1
})
// tableData.value = []
}
}
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
tableObject.params = { tableObject.params = {
@ -271,5 +300,4 @@ onMounted(async () => {
getList() getList()
importTemplateData.templateUrl = await CountConfigApi.importTemplate() importTemplateData.templateUrl = await CountConfigApi.importTemplate()
}) })
</script> </script>

Loading…
Cancel
Save