Browse Source

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

intex_online20250427
songguoqiang 2 months ago
parent
commit
72363c5131
  1. 3
      src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
  2. 21
      src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
  3. 293
      src/views/wms/basicDataManage/labelManage/productionLineLabel/index.vue
  4. 217
      src/views/wms/basicDataManage/labelManage/productionLineLabel/productionLineLabel.data.ts
  5. 44
      src/views/wms/inventoryManage/balance/balance.data.ts
  6. 44
      src/views/wms/inventoryManage/transaction/transaction.data.ts
  7. 3
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
  8. 29
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
  9. 35
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
  10. 44
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
  11. 95
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
  12. 14
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
  13. 2
      src/views/wms/issueManage/repleinshItemCodeConsumeRecord/index.vue
  14. 6
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
  15. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
  16. 8
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  17. 37
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
  18. 39
      src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue

3
src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue

@ -372,7 +372,8 @@ const onChange = (field, e)=>{
} else { } else {
Area.allSchemas.formSchema.forEach((item) => { Area.allSchemas.formSchema.forEach((item) => {
if (item.field == 'manageMode') { if (item.field == 'manageMode') {
item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') item.componentProps.options = manageModeOptions.value
// item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY')
basicFormRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value basicFormRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value
} }
}) })

21
src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts

@ -370,6 +370,15 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
width: 100 width: 100
} , } ,
}, },
{
label: '产品类',
field: 'prodCla',
sort: 'custom',
isTable: true,
table: {
width: 100
} ,
},
{ {
label: '创建者', label: '创建者',
field: 'creator', field: 'creator',
@ -540,17 +549,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{
label: '产品类',
field: 'prodCla',
sort: 'custom',
isForm:false,
isTable: false,
isDetail:false,
table: {
width: 100
} ,
},
{ {
label: '种类', label: '种类',
field: 'category', field: 'category',

293
src/views/wms/basicDataManage/labelManage/productionLineLabel/index.vue

@ -0,0 +1,293 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="Package.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="Package.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table v-clientTable ref="tableRef" :selection="true"
: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"
@getSelectionRows="getSelectionRows"
>
<template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { getAccessToken } from '@/utils/auth'
import { Package,PackageRules } from './productionLineLabel.data'
import * as BarbasicApi from '@/api/wms/barbasic'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { formatTime } from '@/utils/index'
import { getJmreportBaseUrl } from '@/utils/systemParam'
import { formatDate } from '@/utils/formatTime'
import { usePageLoading } from '@/hooks/web/usePageLoading'
const { loadStart, loadDone } = usePageLoading()
//
defineOptions({ name: 'ProductionLineLabel' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(Package.allSchemas.tableColumns)
/**
* PurchasePackage type = PurchaseLabel 采购件标签记录页面
* ManufacturePackage type = MakeLabel 制造件标签记录页面
* UtensilPackage type = ContainerLabel 器具标签记录页面
* SupplierPackage type = PurchaseLabel 供应商发货标签记录(用采购标签)
* ProductionLineLabel type = ProductionLineLabel 库位标签记录页面
*/
const type = ref('ProductionLineLabel')
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: BarbasicApi.getBarbasicPage //
})
tableObject.params.type = type.value
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), //
defaultButtons.mainLisSelectiontPointBtn(null), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
]
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
searchFormClick({
filters: tableObject.params.filters
})
} else {
getList()
}
} else if (val == 'filtrate') { //
} else if (val=='selection_point'){//
handleSelectionPoint()
}else { //
console.log('其他按钮', item)
}
}
const isShowMainButton = (row, val) => {
if (val.indexOf(row.available) > -1) {
return false
} else {
return true
}
}
// -
const butttondata = (row) => {
return[
defaultButtons.mainListPointBtn(null), //
defaultButtons.mainListEnableBtn({hide: isShowMainButton(row, ['FALSE']),hasPermi: 'wms:barbasic:enable'}), //
defaultButtons.mainListDisableBtn({hide: isShowMainButton(row, ['TRUE']),hasPermi: 'wms:barbasic:disable'}), //
]}
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
} else if (val == 'point') { //
handlePoint(row)
} else if (val == 'enable') {
handleEnable(row.id)
} else if (val == 'disable') {
handleDisable(row.id)
}
}
const handleEnable = async (id: number) => {
try {
await BarbasicApi.enableOption(id)
message.success(t('common.updateSuccess'))
//
await getList()
} catch {}
}
const handleDisable = async (id: number) => {
try {
await BarbasicApi.disableOption(id)
message.success(t('common.updateSuccess'))
//
await getList()
} catch {}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: number) => {
basicFormRef.value.open(type, row)
if (type == 'create') {
nextTick(() => {
basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
})
}
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue,"labelBarbasic")
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
tableObject.loading = true
//
await BarbasicApi.deleteBarbasic(id)
tableObject.loading = false
message.success(t('common.delSuccess'))
//
buttonBaseClick('refresh',null)
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
loadStart()
const excelTitle = ref(route.meta.title)
const data = await BarbasicApi.exportLocationBarbasic(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {
loadDone()
}
}
const BASE_URL = getJmreportBaseUrl()
const src = ref(BASE_URL + '/jmreport/view/1075309898605109248?token=' + getAccessToken())
//
const handlePoint = async (row) => {
window.open(src.value+'&relateNumber='+row.id)
}
// const srcPoint = ref(BASE_URL + '/jmreport/view/929174607016689664?token=' + getAccessToken())
const handleSelectionPoint = async ()=>{
let rows:any = []
selectionRows.value.forEach(item=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
})
console.log('批量打印',rows.join(','))
window.open(src.value+'&relateNumber='+rows.join(','))
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters,
type:type.value
}
getList() //
}
const searchList = (model)=>{
selectionRows.value = []
// model.available='TRUE'
model.type='ProductionLineLabel'
setSearchParams(model)
}
watch(
() => tableObject.tableList,
() => {
const currentRows = selectionRows.value.find(item=>item.currentPage==tableObject.currentPage)
if(currentRows){
nextTick(() => {
currentRows.selectionRows.forEach(item=>{
tableRef.value.toggleRowSelection(item,true)
})
})
}
}
)
const selectionRows = ref<any>([])
const tableRef = ref()
const getSelectionRows = (currentPage,currentPageSelectionRows) => {
console.log("getSelectionRows",currentPage,currentPageSelectionRows)
const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
if(currentRows){
currentRows.selectionRows = currentPageSelectionRows
}else{
selectionRows.value.push({
currentPage,
selectionRows:currentPageSelectionRows
})
}
}
/** 初始化 **/
onMounted(async () => {
// tableObject.params = {
// available: 'TRUE',
// type: 'ProductionLineLabel'
// }
getList()
})
</script>

217
src/views/wms/basicDataManage/labelManage/productionLineLabel/productionLineLabel.data.ts

@ -0,0 +1,217 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
// 表单校验
export const PackageRules = reactive({
number: [required],
itemCode: [required],
itemName: [required],
})
export const Package = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '标签号',
field: 'number',
sort: 'custom',
isSearch: true,
table: {
fixed: 'left',
width: 210
}
},
{
label: '标签类型',
field: 'type',
sort: 'custom',
isSearch: false,
dictType: DICT_TYPE.LABEL_TYPE,
dictClass: 'string',
table: {
width: 180
}
},
// {
// label: '标签模板',
// field: 'template',
// sort: 'custom',
// },
{
label: '标签状态',
field: 'status',
sort: 'custom',
isSearch: true,
dictType: DICT_TYPE.LABEL_STATUS,
dictClass: 'string',
table: {
width: 180
}
},
{
label: '库位代码',
field: 'relateNumber',
sort: 'custom',
table: {
width: 210
}
},
{
label: '库位名称',
field: 'locationName',
sort: 'custom',
table: {
width: 210
}
},
{
label: '标签条码字符串',
field: 'barcodeString',
sort: 'custom',
table: {
width: 380,
}
},
// {
// label: '打印次数',
// field: 'printTimes',
// sort: 'custom',
// form: {
// component: 'InputNumber',
// componentProps: {
// min: 0
// },
// value: 0
// },
// table: {
// width: 180
// }
// },
// {
// label: '最后打印时间',
// field: 'lastPrintTime',
// sort: 'custom',
// formatter: dateFormatter,
// form: {
// component: 'DatePicker',
// componentProps: {
// style: {width:'100%'},
// type: 'datetime',
// dateFormat: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'x',
// }
// },
// table: {
// width: 180
// }
// },
// {
// label: '最后打印人ID',
// field: 'lastPrintUserId',
// sort: 'custom',
// table: {
// width: 180
// }
// },
// {
// label: '最后打印人用户名',
// field: 'lastPrintUserName',
// sort: 'custom',
// table: {
// width: 170,
// }
// },
{
label: '是否可用',
field: 'available',
sort: 'custom',
isSearch:true,
isForm: false,
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
search: {
value: 'TRUE',
},
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
},
table: {
width: 110
}
},
{
label: '创建时间',
field: 'createTime',
isForm: false,
table: {
width: 180
},
formatter: dateFormatter,
detail: {
dateFormat : 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
}
},
{
label: '创建者',
field: 'creator',
table: {
width: 130
},
isForm: false,
isTable: true
},
{
label: '最后更新时间',
field: 'updateTime',
sort: 'custom',
isDetail: true,
isForm: false,
isTable: true,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: {
width: 180
},
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
}
},
{
label: '最后更新者',
field: 'updater',
isDetail: true,
isForm: false,
isTable: true,
table: {
width: 150
}
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

44
src/views/wms/inventoryManage/balance/balance.data.ts

@ -235,28 +235,28 @@ export const Balance = useCrudSchemas(
// }, // },
// isTable: false, // isTable: false,
// }, // },
{ // {
label: '到货日期', // label: '到货日期',
field: 'arriveDate', // field: 'arriveDate',
isTable: true, // isTable: true,
formatter: dateFormatter2, // formatter: dateFormatter2,
detail: { // detail: {
dateFormat: 'YYYY-MM-DD' // dateFormat: 'YYYY-MM-DD'
}, // },
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'DatePicker', // component: 'DatePicker',
componentProps: { // componentProps: {
style: { width: '100%' }, // style: { width: '100%' },
type: 'date', // type: 'date',
dateFormat: 'YYYY-MM-DD', // dateFormat: 'YYYY-MM-DD',
valueFormat: 'x' // valueFormat: 'x'
} // }
} // }
}, // },
{ {
label: '生产日期', label: '生产日期',
field: 'produceDate', field: 'produceDate',

44
src/views/wms/inventoryManage/transaction/transaction.data.ts

@ -205,28 +205,28 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{ // {
label: '到货日期', // label: '到货日期',
field: 'arriveDate', // field: 'arriveDate',
isTable: true, // isTable: true,
formatter: dateFormatter2, // formatter: dateFormatter2,
detail: { // detail: {
dateFormat: 'YYYY-MM-DD' // dateFormat: 'YYYY-MM-DD'
}, // },
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'DatePicker', // component: 'DatePicker',
componentProps: { // componentProps: {
style: {width: '100%'}, // style: {width: '100%'},
type: 'date', // type: 'date',
dateFormat: 'YYYY-MM-DD', // dateFormat: 'YYYY-MM-DD',
valueFormat: 'x', // valueFormat: 'x',
} // }
}, // },
}, // },
{ {
label: '生产日期', label: '生产日期',
field: 'produceDate', field: 'produceDate',

3
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@ -645,7 +645,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
value: 'warehouseCode', value: 'warehouseCode',
message: '请选择仓库代码!', message: '请选择仓库代码!',
isMainValue: true isMainValue: true
}], }],
isRepeat:true,
verificationParams: [{ verificationParams: [{
key: 'code', key: 'code',
action: '==', action: '==',

29
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue

@ -57,6 +57,7 @@
@handleDeleteTable="handleDeleteTable" @handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess" @searchTableSuccess="searchTableSuccess"
@submitForm="submitForm" @submitForm="submitForm"
@clearInput="clearInput"
/> />
<!-- 详情 --> <!-- 详情 -->
@ -124,23 +125,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['fromAreaCode'] = item['areaCode'] newRow['fromAreaCode'] = item['areaCode']
newRow['toAreaCode'] = item['areaCode'] newRow['toAreaCode'] = item['areaCode']
newRow['inventoryStatus'] = item['inventoryStatus'] newRow['inventoryStatus'] = item['inventoryStatus']
newRow['fromPackUnit'] = item['packUnit'] // newRow['fromPackUnit'] = item['packUnit']
newRow['fromPackQty'] = item['packQty'] newRow['fromPackQty'] = item['packQty']
tableData.value.push(newRow) tableData.value.push(newRow)
}) })
} else if (formField == 'toPackUnit') { } else if (formField == 'toPackUnit') {
row['toPackUnit'] = val[0]['packUnit'] row['toPackUnit'] = val[0]['packUnit']
row['toPackQty'] = val[0]['packQty'] row['fromPackUnit'] = val[0]['packUnit']
row['toPackQty'] = 0
} else { } else {
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
} }
} else { } else {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
if (formField == 'fromWarehouseCode') { if (formField == 'fromLocationCode') {
setV['fromWarehouseCode'] = val[0]['code'] setV['toLocationCode'] = val[0]['code']
setV['toWarehouseCode'] = val[0]['code']
} }
formRef.setValues(setV) formRef.setValues(setV)
} }
@ -403,13 +404,17 @@ const submitForm = async (formType, submitData) => {
data.id = data.masterId data.id = data.masterId
} }
data.subList = tableData.value // data.subList = tableData.value //
if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) { // if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) {
message.warning('从包装规格与到包装规格不能相同') // message.warning('')
return // return
} // }
if(tableData.value.find(item => (item.qty <= 0))) { if(tableData.value.find(item => (item.qty <= 0))) {
message.warning('数量必须大于0') message.warning('数量必须大于0')
return return
}
if(tableData.value.find(item => (item.toPackQty <= 0))) {
message.warning('到标包数量必须大于0')
return
} }
formRef.value.formLoading = true formRef.value.formLoading = true
try { try {
@ -477,7 +482,11 @@ const searchFormClick = (searchData) => {
} }
getList() // getList() //
} }
const clearInput = (field, row, index) => {
if (field == 'toPackUnit') {
row.fromPackUnit = ''
}
}
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()

35
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts

@ -496,7 +496,7 @@ export const PackageoverRequestMain = useCrudSchemas(
// 表单校验 // 表单校验
export const PackageoverRequestMainRules = reactive({ export const PackageoverRequestMainRules = reactive({
fromWarehouseCode: [{ required: true, message: '请选择仓库代码', trigger: 'change' }] fromLocationCode: [{ required: true, message: '请选择从库位代码', trigger: 'change' }]
}) })
export const PackageoverRequestDetail = useCrudSchemas( export const PackageoverRequestDetail = useCrudSchemas(
@ -534,9 +534,9 @@ export const PackageoverRequestDetail = useCrudSchemas(
searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
searchCondition: [ searchCondition: [
{ {
key: 'warehouseCode', key: 'locationCode',
value: 'fromWarehouseCode', value: 'fromLocationCode',
message: '请填写从库代码!', message: '请填写从库代码!',
isMainValue: true isMainValue: true
}, },
{ {
@ -557,9 +557,9 @@ export const PackageoverRequestDetail = useCrudSchemas(
searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
searchCondition: [ searchCondition: [
{ {
key: 'warehouseCode', key: 'locationCode',
value: 'fromWarehouseCode', value: 'fromLocationCode',
message: '请填写从库代码!', message: '请填写从库代码!',
isMainValue: true isMainValue: true
}, },
{ {
@ -620,13 +620,15 @@ export const PackageoverRequestDetail = useCrudSchemas(
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
min: 0, min: 0,
precision: 6 precision: 6,
disabled:true
}, },
form: { form: {
component: 'InputNumber', component: 'InputNumber',
componentProps: { componentProps: {
min: 0, min: 0,
precision: 6 precision: 6,
disabled: true
} }
} }
}, },
@ -659,7 +661,8 @@ export const PackageoverRequestDetail = useCrudSchemas(
width: 120 width: 120
}, },
tableForm: { tableForm: {
enterSearch: true, disabled:true,
enterSearch: false,
isInpuFocusShow: true, isInpuFocusShow: true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本 searchListPlaceholder: '请选择包装规格', // 输入框占位文本
@ -694,7 +697,8 @@ export const PackageoverRequestDetail = useCrudSchemas(
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
isSearchList: true, // 开启查询弹窗 disabled: true,
isSearchList: false, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格', // 输入框占位文本 searchListPlaceholder: '请选择包装规格', // 输入框占位文本
searchField: 'packUnit', // 查询弹窗赋值字段 searchField: 'packUnit', // 查询弹窗赋值字段
searchTitle: '物料包装信息', // 查询弹窗标题 searchTitle: '物料包装信息', // 查询弹窗标题
@ -828,11 +832,13 @@ export const PackageoverRequestDetail = useCrudSchemas(
width: 120 width: 120
}, },
tableForm: { tableForm: {
disabled: true // disabled: true
type:'InputNumber'
}, },
form: { form: {
component:'InputNumber',
componentProps: { componentProps: {
disabled: true // disabled: true
} }
} }
}, },
@ -1020,5 +1026,6 @@ export const PackageoverRequestDetail = useCrudSchemas(
export const PackageoverRequestDetailRules = reactive({ export const PackageoverRequestDetailRules = reactive({
itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }], itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
fromPackUnit: [{ required: true, message: '请选择从包装规格', trigger: 'change' }], fromPackUnit: [{ required: true, message: '请选择从包装规格', trigger: 'change' }],
toPackUnit: [{ required: true, message: '请选择到包装规格', trigger: 'change' }] toPackUnit: [{ required: true, message: '请选择到包装规格', trigger: 'change' }],
toPackQty: [{ required: true, message: '请输入到标包数量', trigger: ['change','blur'] }],
}) })

44
src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@ -745,28 +745,28 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{ // {
label: '单价', // label: '单价',
field: 'singlePrice', // field: 'singlePrice',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
} // }
}, // },
{ // {
label: '金额', // label: '金额',
field: 'amount', // field: 'amount',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
} // }
}, // },
{ {
label: '从库位组代码', label: '从库位组代码',
field: 'fromLocationGroupCode', field: 'fromLocationGroupCode',

95
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@ -243,9 +243,9 @@ export const ScrapRequestMain = useCrudSchemas(
componentProps: { componentProps: {
enterSearch: true, enterSearch: true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本 searchListPlaceholder: '请选择责任部门', // 输入框占位文本
searchField: 'costcentreDescription', // 查询弹窗赋值字段 searchField: 'costcentreDescription', // 查询弹窗赋值字段
searchTitle: '成本中心代码', // 查询弹窗标题 searchTitle: '责任部门', // 查询弹窗标题
searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类 searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法 searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
searchCondition: [{ searchCondition: [{
@ -675,6 +675,7 @@ export const ScrapRequestMain = useCrudSchemas(
width: 150 width: 150
}, },
form: { form: {
value: '',
componentProps: { componentProps: {
filterable: true filterable: true
} }
@ -693,6 +694,7 @@ export const ScrapRequestMain = useCrudSchemas(
width: 150 width: 150
}, },
form: { form: {
value:'',
componentProps: { componentProps: {
filterable: true filterable: true
} }
@ -711,6 +713,7 @@ export const ScrapRequestMain = useCrudSchemas(
width: 150 width: 150
}, },
form: { form: {
value: '',
componentProps: { componentProps: {
filterable: true filterable: true
} }
@ -1220,50 +1223,50 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
precision: 2 precision: 2
} }
}, },
{ // {
label: '单价', // label: '单价',
field: 'singlePrice', // field: 'singlePrice',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
componentProps: { // componentProps: {
disabled: true, // disabled: true,
min: 0, // min: 0,
precision: 2, // precision: 2,
}, // },
}, // },
tableForm: { // tableForm: {
disabled: true, // disabled: true,
type: 'InputNumber', // type: 'InputNumber',
min: 0, // min: 0,
precision: 2, // precision: 2,
} // }
}, // },
{ // {
label: '金额', // label: '金额',
field: 'amount', // field: 'amount',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
componentProps: { // componentProps: {
disabled:true, // disabled:true,
min: 0, // min: 0,
precision: 2, // precision: 2,
} // }
}, // },
tableForm: { // tableForm: {
type: 'InputNumber', // type: 'InputNumber',
disabled:true, // disabled:true,
min: 0, // min: 0,
precision: 2, // precision: 2,
}, // },
}, // },
{ {
label: '计量单位', label: '计量单位',
field: 'uom', field: 'uom',

14
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue

@ -501,13 +501,13 @@ const submitForm = async (formType, submitData) => {
if(data.masterId){ if(data.masterId){
data.id = data.masterId data.id = data.masterId
} }
if(!data.destination){ // if(!data.destination){
await ElMessageBox.confirm('未填写目的地,是否保存申请?', '提示', { // await ElMessageBox.confirm('', '', {
confirmButtonText: '是', // confirmButtonText: '',
cancelButtonText: '否', // cancelButtonText: '',
type: 'warning' // type: 'warning'
}) // })
} // }
data.subList = tableData.value // data.subList = tableData.value //
try { try {
if (formType === 'create') { if (formType === 'create') {

2
src/views/wms/issueManage/repleinshItemCodeConsumeRecord/index.vue

@ -100,7 +100,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:repleinshItemCodeConsumeRecord:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:repleinshItemCodeConsumeRecord:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:repleinshItemCodeConsumeRecord:import'}), // defaultButtons.defaultImportBtn(null), //
defaultButtons.defaultExportBtn(null), // defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //

6
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@ -2221,9 +2221,9 @@ export const ProductreceiptRequestLabelRules = reactive({
productionLineCodePackage: [ productionLineCodePackage: [
{ required: true, message: '请选择生产线', trigger: 'change' } { required: true, message: '请选择生产线', trigger: 'change' }
], ],
batch: [ // batch: [
{ required: true, message: '请选择批次', trigger: ['change','blur'] } // { required: true, message: '请选择批次', trigger: ['change','blur'] }
], // ],
packUnit: [ packUnit: [
{ required: true, message: '请选择包装规格', trigger: ['change','blur'] } { required: true, message: '请选择包装规格', trigger: ['change','blur'] }
], ],

2
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

@ -2189,7 +2189,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(
export const ProductreceiptRequestLabelRules = reactive({ export const ProductreceiptRequestLabelRules = reactive({
supplierItemCode: [{ required: true, message: '请选择供应商', trigger: 'change' }], supplierItemCode: [{ required: true, message: '请选择供应商', trigger: 'change' }],
productionLineCodePackage: [{ required: true, message: '请选择生产线', trigger: 'change' }], productionLineCodePackage: [{ required: true, message: '请选择生产线', trigger: 'change' }],
batch: [{ required: true, message: '请选择批次', trigger: ['change', 'blur'] }], // batch: [{ required: true, message: '请选择批次', trigger: ['change', 'blur'] }],
packUnit: [ packUnit: [
{ required: true, message: '请选择包装规格', trigger: ['change','blur'] } { required: true, message: '请选择包装规格', trigger: ['change','blur'] }
], ],

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

@ -76,7 +76,7 @@
@onBlur="onEnter"> @onBlur="onEnter">
<template #TableFormHead> <template #TableFormHead>
<div style="border-top:1px solid #ebeef5;padding:10px 10px 0 10px ;margin-right:10px"> <div style="border-top:1px solid #ebeef5;padding:10px 10px 0 10px ;margin-right:10px" v-if="clickType =='create'">
<el-form :inline="true" :model="tableDataSearch"> <el-form :inline="true" :model="tableDataSearch">
<el-form-item label="筛选: 品番"> <el-form-item label="筛选: 品番">
<el-input v-model="tableDataSearch.itemCode" placeholder="请输入品番" clearable @change="changeTableDataSearch"/> <el-input v-model="tableDataSearch.itemCode" placeholder="请输入品番" clearable @change="changeTableDataSearch"/>
@ -544,9 +544,11 @@ const isShowMainButton1 = (row, val) => {
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm = async (type : string, row ?: number) => { const clickType = ref('')
const openForm = async (type : string, row ?: number) => {
clearTableDataSearch() clearTableDataSearch()
clickType.value = type
formRef.value.open(type, row) formRef.value.open(type, row)
if('create'==type){ if('create'==type){
nextTick(async () => { nextTick(async () => {

37
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@ -938,24 +938,24 @@ export const PurchasePlanDetail = useCrudSchemas(
} }
} }
}, },
{ // {
label: '箱数', // label: '箱数',
field: 'orderQty', // field: 'orderQty',
sort: 'custom', // sort: 'custom',
sortSearchDefault: 8, // sortSearchDefault: 8,
sortTableDefault:23, // sortTableDefault:23,
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
componentProps: { // componentProps: {
disabled: true // disabled: true
} // }
}, // },
tableForm: { // tableForm: {
disabled: true // disabled: true
} // }
}, // },
{ {
label: '采购标包数量', label: '采购标包数量',
field: 'purchaseStdQty', field: 'purchaseStdQty',
@ -1039,7 +1039,6 @@ export const PurchasePlanDetail = useCrudSchemas(
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
isTable: true, isTable: true,
hiddenInMain: true,
}, },
{ {
label: '已收采购数量', label: '已收采购数量',

39
src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue

@ -116,24 +116,27 @@ const { getList, setSearchParams } = tableMethods
} }
} }
// const HeadButttondata = ref([])
const HeadButttondata = [ if(routeName.value == 'SupplierinvoiceInvoiced'){
// defaultButtons.defaultAddBtn({hasPermi:'wms:supplierinvoice-invoiced:create'}), // HeadButttondata.value = [
// defaultButtons.defaultImportBtn({hasPermi:'wms:supplierinvoice-invoiced:import'}), // defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultExportBtn(null), // defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPass'}), //
defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPass'}), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultSetBtn(null), //
defaultButtons.defaultSetBtn(null), // ]
// { } else {
// label: '', console.log(routeName.value)
// name: 'zdy', HeadButttondata.value = [
// hide: false, defaultButtons.defaultExportBtn(null), //
// type: 'primary', defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPassWork'}), //
// icon: 'Select', defaultButtons.defaultFreshBtn(null), //
// color: '' defaultButtons.defaultFilterBtn(null), //
// }, defaultButtons.defaultSetBtn(null), //
] ]
}
// //
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {

Loading…
Cancel
Save