Browse Source

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

intex_online20241228
ljlong_2630 4 months ago
parent
commit
61c1fc84e4
  1. 2
      src/api/system/role/index.ts
  2. 2
      src/api/wms/balance/index.ts
  3. 12
      src/api/wms/inventorymoveRecordMain/index.ts
  4. 6
      src/api/wms/itembasic/index.ts
  5. 2
      src/api/wms/productionlineitem/index.ts
  6. 5
      src/api/wms/supplierdeliverRecordMain/index.ts
  7. 21
      src/components/BasicForm/src/BasicForm.vue
  8. 1
      src/components/Table/src/Table.vue
  9. 2
      src/hooks/web/useCrudSchemas.ts
  10. 5
      src/locales/en-US.ts
  11. 2
      src/locales/zh-CN.ts
  12. 8
      src/utils/dict.ts
  13. 12
      src/utils/disposition/defaultButtons.ts
  14. 2
      src/utils/disposition/formFields.ts
  15. 6
      src/views/infra/config/ConfigForm.vue
  16. 2
      src/views/infra/config/index.vue
  17. 2
      src/views/mes/dismantlingMain/dismantlingMain.data.ts
  18. 8
      src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
  19. 8
      src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
  20. 14
      src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
  21. 4
      src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
  22. 2
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
  23. 17
      src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
  24. 16
      src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
  25. 4
      src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
  26. 32
      src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
  27. 36
      src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue
  28. 36
      src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
  29. 14
      src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
  30. 18
      src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
  31. 26
      src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
  32. 28
      src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
  33. 26
      src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
  34. 1
      src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
  35. 16
      src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
  36. 2
      src/views/wms/countManage/count/countPlanMain/index.vue
  37. 1
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
  38. 1
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
  39. 5
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  40. 26
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
  41. 11
      src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
  42. 2
      src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
  43. 8
      src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts
  44. 3
      src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
  45. 3
      src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
  46. 7
      src/views/wms/inventoryManage/balance/balance.data.ts
  47. 9
      src/views/wms/inventoryManage/expectin/expectin.data.ts
  48. 9
      src/views/wms/inventoryManage/expectout/expectout.data.ts
  49. 9
      src/views/wms/inventoryManage/package/index.vue
  50. 2
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  51. 13
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
  52. 2
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  53. 26
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
  54. 19
      src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
  55. 4
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  56. 2
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
  57. 4
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  58. 4
      src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
  59. 2
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue
  60. 29
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
  61. 2
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
  62. 2
      src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
  63. 2
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  64. 9
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
  65. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
  66. 9
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
  67. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
  68. 13
      src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
  69. 10
      src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
  70. 15
      src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
  71. 15
      src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
  72. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
  73. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts
  74. 4
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
  75. 2
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
  76. 30
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
  77. 48
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
  78. 5
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
  79. 22
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
  80. 34
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  81. 12
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
  82. 2
      src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
  83. 2
      src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
  84. 29
      src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue

2
src/api/system/role/index.ts

@ -55,7 +55,7 @@ export const deleteRole = async (id: number) => {
// 导出角色
export const exportRole = (params) => {
return request.download({
url: '/system/role/export-excel',
url: '/system/role/export',
params
})
}

2
src/api/wms/balance/index.ts

@ -109,7 +109,7 @@ export const getBalancePageByBusinessType = async (params) => {
}
// 查询库存余额列表根据业务类型的物料类型
// 查询库存余额列表根据业务类型的品番类型
export const getBalancePageByBusinessTypeByItemType = async (params) => {
if (params.isSearch) {
delete params.isSearch

12
src/api/wms/inventorymoveRecordMain/index.ts

@ -81,6 +81,18 @@ export const exportOkToHoldRecordMain = async (params) => {
return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params })
}
}
// 导出物料隔离记录主 Excel
export const exportOkToHoldRecordOkToHoldMain = async (params) => {
params.businessType = 'OkToHold'
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior-OkToHold', data })
} else {
return await request.download({ url: `/wms/inventorymove-record-main/export-excel-OkToHold`, params })
}
}
// 导出合格转隔离记录主 Excel
export const exportNokToHoldRecordMain = async (params) => {
params.businessType = 'NokToHold'

6
src/api/wms/itembasic/index.ts

@ -92,7 +92,7 @@ export const importTemplate = () => {
// 导入地址
export const importUrl = '/wms/itembasic/import'
// 查询物料类型为成品/半成品的信息列表
// 查询品番类型为成品/半成品的信息列表
export const selectItembasicPageToFgAndSemibasicPage = async (params) => {
if (params.isSearch) {
const data = {...params}
@ -102,7 +102,7 @@ export const selectItembasicPageToFgAndSemibasicPage = async (params) => {
}
}
// 查询物料类型为原料/半成品的信息列表
// 查询品番类型为原料/半成品的信息列表
export const selectTypeToItembasic = async (params) => {
if (params.isSearch) {
const data = {...params}
@ -112,7 +112,7 @@ export const selectTypeToItembasic = async (params) => {
}
}
// 查询物料类型为器具的信息列表
// 查询品番类型为器具的信息列表
export const selectConfigToItembasic = async (params) => {
if (params.isSearch) {
const data = {...params}

2
src/api/wms/productionlineitem/index.ts

@ -33,7 +33,7 @@ export const getProductionlineitemPageBom = async (params) => {
}
// 查询生产线物料关系列表——根据 生产线 物料类型为原料和半成品
// 查询生产线物料关系列表——根据 生产线 品番类型为原料和半成品
export const getProductionlineitemPageByItemtype = async (params) => {
if (params.isSearch) {
delete params.isSearch

5
src/api/wms/supplierdeliverRecordMain/index.ts

@ -86,6 +86,11 @@ export const getItemStatus = async (id) => {
return await request.post({ url: `/wms/supplierdeliver-record-main/getItemStatus?id=` + id })
}
// 打印发货单前查询物料的状态,从而确定使用哪个积木模版
export const getPoLineType = async (id) => {
return await request.post({ url: `/wms/supplierdeliver-record-main/getPoLineType?id=` + id })
}
// 创建采购申请
export const createPurchasereceiptRequest = async (number:string) => {
return await request.post({ url: `/wms/supplierdeliver-record-main/createPurchasereceiptRequest?number=`+number })

21
src/components/BasicForm/src/BasicForm.vue

@ -519,12 +519,20 @@ const opensearchTable = (
// searchCondition.forEach((item) => {
// row
if (searchCondition[i].isMainValue) {
console.log(99,searchCondition[i].paramsFrom)
if (searchCondition[i].isFilterValue) {
//filters
filters.push({
action: searchCondition[i].action,
column: searchCondition[i].key,
value: formRef.value.formModel[searchCondition[i].value]
value:
searchCondition[i].paramsFrom == 'form'
? formRef.value.formModel[searchCondition[i].value]
: searchCondition[i].paramsFrom == 'detailData'
? props.detailData[searchCondition[i].value]
: searchCondition[i].paramsFrom == 'tableForm'
? row[searchCondition[i].value]
: formRef.value.formModel[searchCondition[i].value]
? formRef.value.formModel[searchCondition[i].value]
: props.detailData
? props.detailData[searchCondition[i].value]
@ -533,9 +541,14 @@ const opensearchTable = (
: ''
})
} else {
_searchCondition[searchCondition[i].key] = formRef.value.formModel[
searchCondition[i].value
]
_searchCondition[searchCondition[i].key] =
searchCondition[i].paramsFrom == 'form'
? formRef.value.formModel[searchCondition[i].value]
: searchCondition[i].paramsFrom == 'detailData'
? props.detailData[searchCondition[i].value]
: searchCondition[i].paramsFrom == 'tableForm'
? row[searchCondition[i].value]
:formRef.value.formModel[ searchCondition[i].value]
? formRef.value.formModel[searchCondition[i].value]
: props.detailData
? props.detailData[searchCondition[i].value]

1
src/components/Table/src/Table.vue

@ -385,6 +385,7 @@ export default defineComponent({
headerAlign={headerAlign}
{...props}
prop={v.field}
minWidth={v.minWidth}
>
{{
default: (data: TableSlotDefault) =>

2
src/hooks/web/useCrudSchemas.ts

@ -43,6 +43,8 @@ type CrudTableParams = {
show?: boolean
// 列宽配置
width?: number | string
// 最小列宽配置
minWidth?: number | string
// 列是否固定在左侧或者右侧
fixed?: 'left' | 'right'
} & Omit<FormSchema, 'field'>

5
src/locales/en-US.ts

@ -1321,8 +1321,7 @@ export default {
: 'Create an invoice request?',
:'Detail',
退:'Return',
:'Invalid successfully'
: 'Invalid successfully',
'索赔金额不能为0,请修改后提交。': 'The claim amount cannot be 0, please modify and submit.'
},
}

2
src/locales/zh-CN.ts

@ -1126,7 +1126,6 @@ export default {
:'供应商审批时间',
:'快递单号',
:'开票日历管理',
:'描述',
:'批量删除',
:'查看质检报告',
:'长春',
@ -1322,6 +1321,7 @@ export default {
: '创建开票申请',
:'作废成功',
退: '退回',
'索赔金额不能为0,请修改后提交。':'索赔金额不能为0,请修改后提交。'
},
}

8
src/utils/dict.ts

@ -184,8 +184,8 @@ export enum DICT_TYPE {
PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
// ========== 业务 - WMS ==========
ITEM_STATUS = 'item_status', // 物料状态
ITEM_TYPE = 'item_type', // 物料类型
ITEM_STATUS = 'item_status', // 品番状态
ITEM_TYPE = 'item_type', // 品番类型
UOM = 'uom', // 计量单位
ABC_CLASS = 'abc_class', // ABC类
TRUE_FALSE = 'true_false', // 是否
@ -345,7 +345,7 @@ export enum DICT_TYPE {
REWORK_STATUS = 'rework_status', //返工返修状态:待返修,返修中,返修完成
REWORK_REPLACE_FLAG = 'rework_replace_flag', //是否有替换件
DISMANTLING_BILL_TYPE = 'dismantling_bill_type', //工单类型
DISMANTLING_MATERIAL_STATUS = 'dismantling_material_status', //报废拆解物料状态
DISMANTLING_MATERIAL_STATUS = 'dismantling_material_status', //报废拆解品番状态
DISMANTLING_MATERIAL_HANDLE_STATUS = 'dismantling_material_handle_status', //报废拆解处理状态
MES_REQUEST_TYPE = 'mes_request_type', //生产物料申请类型
@ -420,6 +420,8 @@ export enum DICT_TYPE {
SUPPLIER_TOOL_APPORT_STATEMENT_DETAIL = 'supplier_tool_apport_statement_detail', // 供应商模具费用子
PRODUCTION_LINE_ITEM = 'production_line_item', //顺引生产线项
CLASS_ITEM = 'class_item', //顺引班组项
DUTY = 'duty', //责任
DUTY_DETAILS ="duty_details",//责任明细字典
}

12
src/utils/disposition/defaultButtons.ts

@ -1480,6 +1480,18 @@ export function mainSendBackBtn(option: any) {
hasPermi: ''
})
}
// 主列表-查看明细
export function mainSeeDetailBtn(option: any) {
return __defaultBtnOption(option, {
label: t(`ts.查看明细`).replace('ts.', ''),
name: 'seeDetail',
hide: false,
type: 'primary',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
})
}
// 默认按钮规则
function __defaultBtnOption(option: any, specific: any) {
return {

2
src/utils/disposition/formFields.ts

@ -1729,7 +1729,7 @@ export const OuterPillarDeliverNote = [
{ label: "物流名称", prop: 'name' },
{ label: "背番", prop: 'desc1' },
{ label: "描述", prop: 'desc2' },
{ label: "物料状态", prop: 'status' },
{ label: "品番状态", prop: 'status' },
{ label: "允许制造", prop: 'canMake' },
{ label: "允许采购", prop: 'canBuy' },
{ label: "计量单位", prop: 'um' },

6
src/views/infra/config/ConfigForm.vue

@ -19,8 +19,8 @@
<el-form-item label="参数键值" prop="value">
<el-input v-model="formData.value" placeholder="请输入参数键值" />
</el-form-item>
<el-form-item label="物料类型">
<el-select v-model="formData.itemTypeList" multiple placeholder="配置物料类型">
<el-form-item label="品番类型">
<el-select v-model="formData.itemTypeList" multiple placeholder="配置品番类型">
<el-option v-for="item in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@ -92,7 +92,7 @@ const formRules = reactive({
visible: [{ required: true, message: '是否可见不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
// const itemTypeList = ref([]) //
// const itemTypeList = ref([]) //

2
src/views/infra/config/index.vue

@ -45,7 +45,7 @@
<el-table-column label="参数名称" align="left" prop="name" :show-overflow-tooltip="true" :width="200"/>
<el-table-column label="参数键名" align="left" prop="key" :show-overflow-tooltip="true" :width="250"/>
<el-table-column label="参数键值" align="left" prop="value" :width="200"/>
<el-table-column label="物料类型" align="left" prop="itemType" :width="250">
<el-table-column label="品番类型" align="left" prop="itemType" :width="250">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ITEM_TYPE" :value="scope.row.itemType" />
</template>

2
src/views/mes/dismantlingMain/dismantlingMain.data.ts

@ -324,7 +324,7 @@ export const DismantlingDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '物料状态',
label: '品番状态',
field: 'materialStauts',
sort: 'custom',
dictType: DICT_TYPE.DISMANTLING_MATERIAL_STATUS,

8
src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts

@ -43,7 +43,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
},
{
label: '可用物料类型范围',
label: '可用品番类型范围',
field: 'itemTypes',
dictType: DICT_TYPE.ITEM_TYPE,
dictClass: 'string',
@ -63,7 +63,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
},
{
label: '可用物料状态范围',
label: '可用品番状态范围',
field: 'itemStatuses',
dictType: DICT_TYPE.ITEM_STATUS,
dictClass: 'string',
@ -473,10 +473,10 @@ export const BusinesstypeRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
itemTypes: [
{ required: true, message: '请选择可用物料类型范围', trigger: 'change' }
{ required: true, message: '请选择可用品番类型范围', trigger: 'change' }
],
itemStatuses: [
{ required: true, message: '请选择可用物料状态范围', trigger: 'change' }
{ required: true, message: '请选择可用品番状态范围', trigger: 'change' }
],
// outTransactionType: [
// { required: true, message: '请输入出库事务类型', trigger: 'blur' }

8
src/views/wms/basicDataManage/documentSetting/businesstype/index.vue

@ -162,7 +162,7 @@ const buttonTableClick = async (val, row) => {
//
const rowSplit = JSON.parse(JSON.stringify(row))
// rowSplit.itemTypes = rowSplit.itemTypes.split(',')
//
//
const allItemTypesValue = getStrDictOptions(DICT_TYPE.ITEM_TYPE).map(item=>(item.value))
if(rowSplit.itemTypes == allItemTypesValue){
rowSplit.itemTypes = ['全选']
@ -170,7 +170,7 @@ const buttonTableClick = async (val, row) => {
rowSplit.itemTypes = rowSplit.itemTypes.split(',')
}
//
//
const allItemStatusesValue = getStrDictOptions(DICT_TYPE.ITEM_STATUS).map(item=>(item.value))
if(rowSplit.itemStatuses == allItemStatusesValue){
rowSplit.itemStatuses = ['全选']
@ -242,7 +242,7 @@ const formsSuccess = async (formType, submitData) => {
data.itemTypes = data.itemTypes.join(',')
}
//
//
const allItemStatusesValue = getStrDictOptions(DICT_TYPE.ITEM_STATUS).map(item=>(item.value))
if(data.itemStatuses[data.itemStatuses.length-1]=='全选'){
data.itemStatuses = allItemStatusesValue.join(',')
@ -323,7 +323,7 @@ const formsSuccess = async (formType, submitData) => {
const onChange = (field, value)=>{
console.log('onChange',field,value)
if(field=='outAreaTypes'||field=='inAreaTypes'||field=='itemTypes'||field=='itemStatuses'||field=='outInventoryStatuses'||field=='inInventoryStatuses'){
//
//
if(value.length>0){
if(value[value.length-1]=='全选'){
//

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

@ -10,7 +10,7 @@ import { Process } from '../../factoryModeling/process/process.data'
const { t } = useI18n() // 国际化
/**
* @returns {Array}
* @returns {Array}
*/
export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
{
@ -29,7 +29,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择品番', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物料基础信息', // 查询弹窗标题
searchTitle: '品番基础信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.selectItembasicPageToFgAndSemibasicPage, // 查询弹窗所需分页方法
verificationParams: [{
@ -103,7 +103,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '子物料计量单位',
label: '子品番计量单位',
field: 'componentUom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
@ -120,7 +120,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
}
},
{
label: '子物料数量',
label: '子品番数量',
field: 'componentQty',
isSearch: true,
sort: 'custom',
@ -174,7 +174,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
field: 'version',
sort: 'custom',
form: {
labelMessage: '子物料要和父物料版本相同',
labelMessage: '子品番要和父品番版本相同',
}
},
{
@ -341,10 +341,10 @@ export const BomRules = reactive({
{ required: true, message: '请输入子品番', trigger: 'change' }
],
componentUom: [
{ required: true, message: '请选择子物料计量单位', trigger: 'change' }
{ required: true, message: '请选择子品番计量单位', trigger: 'change' }
],
componentQty: [
{ required: true, message: '请输入子物料数量', trigger: 'blur' }
{ required: true, message: '请输入子品番数量', trigger: 'blur' }
],
processCode: [
{ required: true, message: '请输入工序代码', trigger: 'blur' },

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

@ -72,7 +72,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
} ,
},
{
label: '物料类型',
label: '品番类型',
field: 'type',
sort: 'custom',
dictType: DICT_TYPE.ITEM_TYPE,
@ -83,7 +83,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
} ,
},
{
label: '物料状态',
label: '品番状态',
field: 'status',
sort: 'custom',
dictType: DICT_TYPE.ITEM_STATUS,

2
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@ -531,7 +531,7 @@ const buttonTableClick = async (val, row) => {
console.log(item);
// item.batch = '000000'
// 线
// 线
ItembasicApi.getItembasicPage({
pageSize: 10,
pageNo: 1,

17
src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@ -77,6 +77,23 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '背番',
field: 'itemDesc1',
sort: 'custom',
isSearch: true,
isForm:false,
hiddenSearchHigh:true,
sortTableDefault:1,
table: {
width: 150
},
form:{
componentProps:{
disabled: true,
}
}
},
{
label: '包装规格',
field: 'packUnit',

16
src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts

@ -398,7 +398,10 @@ export const PackageInventory = useCrudSchemas(
dictType: DICT_TYPE.UOM,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
component: 'Select'
component: 'Select',
componentProps:{
disabled:true
}
},
table: {
width: 150
@ -424,6 +427,9 @@ export const PackageInventory = useCrudSchemas(
label: '替代计量单位',
field: 'altUom',
sort: 'custom',
isDetail:false,
isForm:false,
isTable:false,
dictType: DICT_TYPE.UOM,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: {
@ -440,6 +446,9 @@ export const PackageInventory = useCrudSchemas(
table: {
width: 150
},
isDetail:false,
isForm:false,
isTable:false,
form: {
component: 'InputNumber',
componentProps: {
@ -543,6 +552,11 @@ export const PackageInventory = useCrudSchemas(
sort: 'custom',
table: {
width: 150
},
form:{
componentProps:{
disabled:true,
}
}
},
// {

4
src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts

@ -350,7 +350,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
dictType: DICT_TYPE.ITEM_TYPE,
@ -365,7 +365,7 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '物料状态',
label: '品番状态',
field: 'status',
sort: 'custom',
dictType: DICT_TYPE.ITEM_STATUS,

32
src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue

@ -95,9 +95,9 @@
</template>
</el-input>
</el-form-item>
<!-- 选择物料类型 -->
<el-form-item :key="'物料类型formItem'+index" label="" label-width="0" class="err-240" v-if="index == 1">
<el-select :key="'物料类型title'+index"
<!-- 选择品番类型 -->
<el-form-item :key="'品番类型formItem'+index" label="" label-width="0" class="err-240" v-if="index == 1">
<el-select :key="'品番类型title'+index"
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
@ -108,10 +108,10 @@
:label="item.label"
:value="item.value"
v-for="item in options.itemTypeOptions"
:key="'物料类型title'+index+item.value"
:key="'品番类型title'+index+item.value"
/>
</el-select>
<el-select :key="'物料类型Operator'+index"
<el-select :key="'品番类型Operator'+index"
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
@ -121,12 +121,12 @@
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="'物料类型Operator'+index+cur.value"
:key="'品番类型Operator'+index+cur.value"
/>
</el-select>
<el-select :key="'物料类型Value'+index"
<el-select :key="'品番类型Value'+index"
v-model="item.Value"
placeholder="请选择物料类型"
placeholder="请选择品番类型"
style="flex: 1"
clearable
multiple
@ -136,7 +136,7 @@
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="'物料类型Value'+index+cur.value"
:key="'品番类型Value'+index+cur.value"
:label="cur.label"
:value="cur.value"
/>
@ -245,12 +245,12 @@
</div>
</div>
</div>
<div class="button flex">
<!-- <div class="button flex">
<div @click="handleAddTable(formData.configuration.ManagementPrecision)">
<Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
<div>添加条件</div>
</div>
</div>
</div> -->
</el-form-item>
</el-col>
</el-row>
@ -307,7 +307,7 @@ const formData = ref({
condition: [
//
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' }
],
configuration: {
@ -362,9 +362,9 @@ const options = reactive({
],
//
supplierList: [],
//
//
itemTypeOptions: [
{ value: 'ItemType', label: '物料类型' },
{ value: 'ItemType', label: '品番类型' },
{ value: 'ItemGroup', label: '物料分组' },
{ value: 'ItemCode', label: '物料' },
{ value: 'Project', label: '项目' },
@ -405,7 +405,7 @@ const changeSupplierCustomer = (e) => {
}
}
getFormSupplierList()
// //abc//
// //abc//
const changeItemsType = () => {
formData.value.condition[1].Value = ''
}
@ -551,7 +551,7 @@ const resetForm = () => {
condition: [
//
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' }
],
configuration: {

36
src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue

@ -53,9 +53,9 @@
<div key="规则条件title" class="title">规则条件</div>
<el-row key="规则条件row" :gutter="10">
<el-col key="供应商和客户col" :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 选择物料类型 -->
<el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 0">
<el-select key="物料类型"
<!-- 选择品番类型 -->
<el-form-item key="品番类型formItem" label="" label-width="0" class="err-240" v-if="index == 0">
<el-select key="品番类型"
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
@ -66,10 +66,10 @@
:label="item.label"
:value="item.value"
v-for="item in options.itemTypeOptions"
:key="'物料类型'+item.value"
:key="'品番类型'+item.value"
/>
</el-select>
<el-select key="物料类型Operator"
<el-select key="品番类型Operator"
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
@ -79,12 +79,12 @@
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="'物料类型Operator'+cur.value"
:key="'品番类型Operator'+cur.value"
/>
</el-select>
<el-select key="物料类型Value"
<el-select key="品番类型Value"
v-model="item.Value"
placeholder="请选择物料类型"
placeholder="请选择品番类型"
style="flex: 1"
clearable
multiple
@ -94,7 +94,7 @@
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="'物料类型Value'+cur.value"
:key="'品番类型Value'+cur.value"
:label="cur.label"
:value="cur.value"
/>
@ -117,9 +117,9 @@
/>
</el-select>
<el-select key="物料状态"
<el-select key="品番状态"
v-model="item.Value"
placeholder="请选择物料状态"
placeholder="请选择品番状态"
style="flex: 1"
clearable
multiple
@ -129,7 +129,7 @@
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_STATUS)"
:key="'物料状态'+cur.value"
:key="'品番状态'+cur.value"
:label="cur.label"
:value="cur.value"
/>
@ -513,7 +513,7 @@ const formData = ref({
status: true, //
//
condition: [
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
//
{ ParamCode: 'CustomerCode', Operator: 'IN', Value: '' },
@ -602,14 +602,14 @@ const options = reactive({
//
supplierList: [],
originSupplierList: [],
//
//
itemTypeOptions: [
{ value: 'ItemType', label: '物料类型' },
{ value: 'ItemType', label: '品番类型' },
{ value: 'ItemGroup', label: '物料分组' },
{ value: 'ItemCode', label: '物料' },
// { value: 'Project', label: '' },
{ value: 'AbcClass', label: 'ABC类' },
{ value: 'ItemStatus', label: '物料状态' }
{ value: 'ItemStatus', label: '品番状态' }
],
//
calculationTypeOptions: [
@ -682,7 +682,7 @@ const changeSupplierCustomer = (e) => {
}
}
getFormSupplierList()
// //abc//
// //abc//
const changeItemsType = () => {
formData.value.condition[0].Value = ''
}
@ -1194,7 +1194,7 @@ const resetForm = () => {
status: true, //
//
condition: [
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
//
{ ParamCode: 'CustomerCode', Operator: 'IN', Value: '' },

36
src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@ -54,9 +54,9 @@
<el-row key="规则条件row" :gutter="10">
<el-col key="供应商和客户col" :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 选择物料类型 -->
<el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
<el-select key="物料类型"
<!-- 选择品番类型 -->
<el-form-item key="品番类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
<el-select key="品番类型"
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
@ -67,10 +67,10 @@
:label="item.label"
:value="item.value"
v-for="item in options.itemTypeOptions"
:key="'物料类型'+item.value"
:key="'品番类型'+item.value"
/>
</el-select>
<el-select key="物料类型Operator"
<el-select key="品番类型Operator"
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
@ -80,12 +80,12 @@
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="'物料类型Operator'+cur.value"
:key="'品番类型Operator'+cur.value"
/>
</el-select>
<el-select key="物料类型Value"
<el-select key="品番类型Value"
v-model="item.Value"
placeholder="请选择物料类型"
placeholder="请选择品番类型"
style="flex: 1"
clearable
multiple
@ -95,7 +95,7 @@
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="'物料类型Value'+cur.value"
:key="'品番类型Value'+cur.value"
:label="cur.label"
:value="cur.value"
/>
@ -118,9 +118,9 @@
/>
</el-select>
<el-select key="物料状态"
<el-select key="品番状态"
v-model="item.Value"
placeholder="请选择物料状态"
placeholder="请选择品番状态"
style="flex: 1"
clearable
multiple
@ -130,7 +130,7 @@
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_STATUS)"
:key="'物料状态'+cur.value"
:key="'品番状态'+cur.value"
:label="cur.label"
:value="cur.value"
/>
@ -422,7 +422,7 @@ const formData = ref({
status: true, //
//
condition: [
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
// 线
{ ParamCode: 'Productionline', Operator: 'IN', Value: '' }
@ -486,14 +486,14 @@ const options = reactive({
//
rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
//
//
itemTypeOptions: [
{ value: 'ItemType', label: '物料类型' },
{ value: 'ItemType', label: '品番类型' },
{ value: 'ItemGroup', label: '物料分组' },
{ value: 'ItemCode', label: '物料' },
// { value: 'Project', label: '' },
{ value: 'AbcClass', label: 'ABC类' },
{ value: 'ItemStatus', label: '物料状态' }
{ value: 'ItemStatus', label: '品番状态' }
],
//
warehouseTypeOptions: [
@ -525,7 +525,7 @@ const buttonBaseClick = (val, item) => {
}
}
// //abc//
// //abc//
const changeItemsType = () => {
formData.value.condition[1].Value = ''
}
@ -932,7 +932,7 @@ const resetForm = () => {
condition: [
//
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
// ///
{ ParamCode: 'Weight', Operator: '>', Value: [] },

14
src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue

@ -97,7 +97,7 @@
/>
</el-select>
</el-form-item>
<!-- 选择物料类型 -->
<!-- 选择品番类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
<el-select
v-model="item.ParamCode"
@ -128,7 +128,7 @@
</el-select>
<el-select
v-model="item.Value"
placeholder="请选择物料类型"
placeholder="请选择品番类型"
style="flex: 1"
clearable
multiple
@ -358,7 +358,7 @@ const formData = ref({
condition: [
//
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
//
{ ParamCode: 'LocationCode', Operator: 'IN', Value: '' },
@ -411,9 +411,9 @@ const options = reactive({
],
//
supplierList: [],
//
//
itemTypeOptions: [
{ value: 'ItemType', label: '物料类型' },
{ value: 'ItemType', label: '品番类型' },
{ value: 'ItemGroup', label: '物料分组' },
{ value: 'ItemCode', label: '物料' },
{ value: 'Project', label: '项目' },
@ -470,7 +470,7 @@ const changeSupplierCustomer = (e) => {
}
}
getFormSupplierList()
// //abc//
// //abc//
const changeItemsType = () => {
formData.value.condition[1].Value = ''
}
@ -605,7 +605,7 @@ const resetForm = () => {
condition: [
//
{ ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
//
{ ParamCode: 'LocationCode', Operator: 'IN', Value: '' },

18
src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue

@ -51,7 +51,7 @@
<div class="title">规则条件</div>
<el-row gutter="10">
<el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
<!-- 选择物料类型 -->
<!-- 选择品番类型 -->
<el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
<el-select
v-model="item.ParamCode"
@ -82,7 +82,7 @@
</el-select>
<el-select
v-model="item.Value"
placeholder="请选择物料类型"
placeholder="请选择品番类型"
style="flex: 1"
clearable
multiple
@ -99,7 +99,7 @@
</el-select>
<el-select
v-model="item.Value"
placeholder="请选择物料状态"
placeholder="请选择品番状态"
style="flex: 1"
clearable
multiple
@ -348,7 +348,7 @@ const formData = ref({
status: true, //
//
condition: [
// ///abc//
// ///abc//
{ ParamCode: 'itemType', Operator: 'IN', Value: '' },
//
{ ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
@ -402,10 +402,10 @@ const options = reactive({
//
rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
//
//
itemTypeOptions: [
{ value: 'ItemType', label: '物料类型' },
{ value: 'ItemStatus', label: '物料状态' },
{ value: 'ItemType', label: '品番类型' },
{ value: 'ItemStatus', label: '品番状态' },
{ value: 'ItemCode', label: '物料' }
],
@ -437,7 +437,7 @@ const buttonBaseClick = (val, item) => {
dialogVisible.value = false
}
}
// //abc//
// //abc//
const changeItemsType = () => {
formData.value.condition[0].Value = ''
}
@ -567,7 +567,7 @@ const resetForm = () => {
status: true, //
//
condition: [
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
//
{ ParamCode: 'LocationCode', Operator: 'IN', Value: '' }

26
src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue

@ -51,9 +51,9 @@
<div class="title">规则条件</div>
<el-row gutter="10" key="规则条件row">
<el-col :span="24" v-for="(item, index) in formData.condition" :key="'规则条件col'+index">
<!-- 选择物料类型 -->
<el-form-item :key="'物料类型'+index" label="" label-width="0" class="err-240" v-if="index == 0">
<el-select :key="'物料类型title'+index"
<!-- 选择品番类型 -->
<el-form-item :key="'品番类型'+index" label="" label-width="0" class="err-240" v-if="index == 0">
<el-select :key="'品番类型title'+index"
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
@ -64,10 +64,10 @@
:label="cur.label"
:value="cur.value"
v-for="cur in options.itemTypeOptions"
:key="'物料类型titleOption'+cur.value"
:key="'品番类型titleOption'+cur.value"
/>
</el-select>
<el-select :key="'物料类型Operator'+index"
<el-select :key="'品番类型Operator'+index"
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
@ -77,12 +77,12 @@
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="'物料类型OperatorOption'+cur.value"
:key="'品番类型OperatorOption'+cur.value"
/>
</el-select>
<el-select :key="'物料类型Value'+index"
<el-select :key="'品番类型Value'+index"
v-model="item.Value"
placeholder="请选择物料类型"
placeholder="请选择品番类型"
style="flex: 1"
clearable
multiple
@ -92,7 +92,7 @@
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="'物料类型Value'+cur.value"
:key="'品番类型Value'+cur.value"
:label="cur.label"
:value="cur.value"
/>
@ -344,7 +344,7 @@ const formData = ref({
status: true, //
//
condition: [
// ///abc//
// ///abc//
{ ParamCode: 'ItemGroup', Operator: 'IN', Value: '' },
//
{ ParamCode: 'LocationCode', Operator: 'IN', Value: '' }
@ -396,7 +396,7 @@ const options = reactive({
//
rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
//
//
itemTypeOptions: [
{ value: 'ItemGroup', label: '物料分组' },
{ value: 'ItemCode', label: '物料' },
@ -430,7 +430,7 @@ const buttonBaseClick = (val, item) => {
dialogVisible.value = false
}
}
// //abc//
// //abc//
const changeItemsType = () => {
formData.value.condition[0].Value = ''
}
@ -553,7 +553,7 @@ const resetForm = () => {
status: true, //
//
condition: [
// ///abc//
// ///abc//
{ ParamCode: 'ItemGroup', Operator: 'IN', Value: '' },
//
{ ParamCode: 'LocationCode', Operator: 'IN', Value: '' }

28
src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@ -163,9 +163,9 @@
/>
</el-select>
</el-form-item> -->
<!-- 选择物料类型 -->
<el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
<el-select key="物料类型"
<!-- 选择品番类型 -->
<el-form-item key="品番类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
<el-select key="品番类型"
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
@ -176,10 +176,10 @@
:label="item.label"
:value="item.value"
v-for="item in options.itemTypeOptions"
:key="'物料类型'+item.value"
:key="'品番类型'+item.value"
/>
</el-select>
<el-select key="物料类型Operator"
<el-select key="品番类型Operator"
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
@ -189,12 +189,12 @@
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="'物料类型Operator'+cur.value"
:key="'品番类型Operator'+cur.value"
/>
</el-select>
<el-select key="物料类型Value"
<el-select key="品番类型Value"
v-model="item.Value"
placeholder="请选择物料类型"
placeholder="请选择品番类型"
style="flex: 1"
clearable
multiple
@ -204,7 +204,7 @@
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="'物料类型Value'+cur.value"
:key="'品番类型Value'+cur.value"
:label="cur.label"
:value="cur.value"
/>
@ -742,7 +742,7 @@ const formData = ref({
{ ParamCode: 'WarehouseCode', Operator: 'IN', Value: '' },
// //
// { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
// // //
// { ParamCode: 'Weight', Operator: '>', Value: [] },
@ -827,9 +827,9 @@ const options = reactive({
//
supplierList: [],
originSupplierList: [],
//
//
itemTypeOptions: [
{ value: 'ItemType', label: '物料类型' },
{ value: 'ItemType', label: '品番类型' },
{ value: 'ItemGroup', label: '物料分组' },
{ value: 'ItemCode', label: '物料' },
{ value: 'Project', label: '项目' },
@ -916,7 +916,7 @@ const changeSupplierCustomer = (e) => {
}
}
getFormSupplierList()
// //abc//
// //abc//
const changeItemsType = () => {
formData.value.condition[1].Value = ''
}
@ -1441,7 +1441,7 @@ const resetForm = () => {
{ ParamCode: 'WarehouseCode', Operator: 'IN', Value: '' },
// //
// { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
// ///abc//
// ///abc//
{ ParamCode: 'ItemType', Operator: 'IN', Value: '' },
// // ///
// { ParamCode: 'Weight', Operator: '>', Value: [] },

26
src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue

@ -94,9 +94,9 @@
/>
</el-select>
</el-form-item>
<!-- 选择物料类型 -->
<el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
<el-select :key="'物料类型title'+index"
<!-- 选择品番类型 -->
<el-form-item key="品番类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
<el-select :key="'品番类型title'+index"
v-model="item.ParamCode"
placeholder=""
@change="changeItemsType"
@ -107,10 +107,10 @@
:label="cur.label"
:value="cur.value"
v-for="cur in options.itemTypeOptions"
:key="'物料类型titleOption'+index+cur.value"
:key="'品番类型titleOption'+index+cur.value"
/>
</el-select>
<el-select :key="'物料类型Operator'+index"
<el-select :key="'品番类型Operator'+index"
v-model="item.Operator"
placeholder="请选择范围"
style="width: 110px; margin-right: 10px"
@ -120,12 +120,12 @@
:label="cur.label"
:value="cur.value"
v-for="cur in options.rangeOptions1"
:key="'物料类型Operator'+index+cur.value"
:key="'品番类型Operator'+index+cur.value"
/>
</el-select>
<el-select :key="'物料类型Value'+index"
<el-select :key="'品番类型Value'+index"
v-model="item.Value"
placeholder="请选择物料类型"
placeholder="请选择品番类型"
style="flex: 1"
clearable
multiple
@ -135,7 +135,7 @@
>
<el-option
v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
:key="'物料类型ValueOption'+index+cur.value"
:key="'品番类型ValueOption'+index+cur.value"
:label="cur.label"
:value="cur.value"
/>
@ -244,7 +244,7 @@ const formData = ref({
condition: [
//
{ ParamCode: 'ContainerType', Operator: 'IN', Value: '' },
// ///abc//
// ///abc//
{ ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }
],
configuration: {
@ -284,7 +284,7 @@ const options = reactive({
//
rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
//
//
itemTypeOptions: [
{ value: 'ItemGroup', label: '物料分组' },
{ value: 'ItemCode', label: '物料' },
@ -308,7 +308,7 @@ const buttonBaseClick = (val, item) => {
}
}
// //abc//
// //abc//
const changeItemsType = () => {
formData.value.condition[1].Value = ''
}
@ -434,7 +434,7 @@ const resetForm = () => {
condition: [
//
{ ParamCode: 'ContainerType', Operator: 'IN', Value: '' },
// ///abc//
// ///abc//
{ ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }
],
configuration: {

1
src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts

@ -91,6 +91,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
label: '背番',
field: 'backNumber',
sort: 'custom',
isForm:false,
hiddenSearchHigh:true,
isSearch: true,
table: {

16
src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts

@ -456,7 +456,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable:false,
isForm: false,
},{
label: '物料忽略名单',
label: '品番忽略名单',
field: 'ignoreListOfItem',
sort: 'custom',
table: {
@ -467,9 +467,9 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: {
isSearchList: true, // 开启查询弹窗
multiple:true,//是否可以多选
searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
searchListPlaceholder: '请选择品番忽略名单', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物料信息', // 查询弹窗标题
searchTitle: '品番信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
}
@ -799,7 +799,7 @@ export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
searchListPlaceholder: '请选择盘点范围类型',
searchField: 'type',
multiple:true,//是否可以多选
searchTitle: '物料信息',
searchTitle: '品番信息',
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
verificationPage: ItembasicApi.getItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
@ -825,7 +825,7 @@ export const CountPlanDetail = useCrudSchemas(<CrudSchema[]>([
multiple:true,//是否可以多选
searchListPlaceholder: '请选择盘点范围类型', // 输入框占位文本
searchField: 'type', // 查询弹窗赋值字段
searchTitle: '物料信息', // 查询弹窗标题
searchTitle: '品番信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
}
@ -857,7 +857,7 @@ export const CountPlanDetailRules = reactive({
*/
export const CountPlanMain1 = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '物料忽略名单',
label: '品番忽略名单',
field: 'ignoreListOfItem',
sort: 'custom',
table: {
@ -868,9 +868,9 @@ export const CountPlanMain1 = useCrudSchemas(reactive<CrudSchema[]>([
enterSearch:true,
isSearchList: true, // 开启查询弹窗
multiple:true,//是否可以多选
searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
searchListPlaceholder: '请选择品番忽略名单', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '物料信息', // 查询弹窗标题
searchTitle: '品番信息', // 查询弹窗标题
searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
verificationPage: ItembasicApi.getItemListByCodes,

2
src/views/wms/countManage/count/countPlanMain/index.vue

@ -168,7 +168,7 @@ const updataTableColumns = (val) => {
const searchTableParams = ref([
{
formField: 'productItemCode',
searchTableTitle: '物料信息',
searchTableTitle: '品番信息',
searchTableAllSchemas: Itembasic.allSchemas,
searchTablePage: ItembasicApi.getItembasicPage
}

1
src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts

@ -784,7 +784,6 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '描述',

1
src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts

@ -576,7 +576,6 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true
},
{
label: '描述',

5
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@ -869,9 +869,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain:true,
isForm: false,
isTableForm: false
isTableForm: false,
isForm: false
},
{
label: '描述',

26
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@ -614,7 +614,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'itemCode',
sort: 'custom',
table: {
width: 150
minWidth: 150
},
tableForm:{
multiple:true,
@ -647,12 +647,22 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '背番',
field: 'itemDesc1',
sort: 'custom',
table: {
minWidth: 150
},
isTableForm: false,
isForm: false
},
{
label: '计划数量',
field: 'planQty',
sort: 'custom',
table: {
width: 150
minWidth: 150
},
form: {
component: 'InputNumber',
@ -677,7 +687,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
isTable: true,
sort: 'custom',
table: {
width: 150
minWidth: 150
},
tableForm: {
disabled: true,
@ -957,6 +967,16 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '背番',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false
},
{
label: '计划数量',
field: 'planQty',

11
src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts

@ -622,6 +622,17 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '背番',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
isTableForm:false,
isForm:false
},
{
label: '备注',
field: 'remark',

2
src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts

@ -1163,7 +1163,7 @@ export const DeliverRecordImportRules = reactive({
{ type: 'number', message: '结束序号必须为数字', trigger: 'blur' }
],
type: [
{ required: true, message: '请选择顺引物料类型', trigger: 'blur' }
{ required: true, message: '请选择顺引品番类型', trigger: 'blur' }
],
customerCode: [
{ required: true, message: '请选择客户代码', trigger: 'blur' }

8
src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts

@ -267,6 +267,14 @@ export const CustomerStatementDetail = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true,
isForm: false,
},
{
label: '背番',
field: 'backNumber',
sort: 'custom',
hiddenSearchHigh:true,
isSearch: true,
isForm: false,
},
{
label: '验收年月日',
field: 'checkTime',

3
src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts

@ -176,8 +176,9 @@ export const FinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
{
label: '背番',
field: 'backNumber',
field: 'itemDesc1',
sort: 'custom',
isSearch:true,
table: {
width: 150,
},

3
src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts

@ -170,7 +170,8 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
{
label: '背番',
field: 'backNumber',
field: 'itemDesc1',
isSearch:true,
sort: 'custom',
table: {
width: 150,

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

@ -64,7 +64,7 @@ export const Balance = useCrudSchemas(
isSearch: true
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
dictType: DICT_TYPE.ITEM_TYPE,
@ -577,7 +577,7 @@ export const BalancePopWindow = useCrudSchemas(
isSearch: true
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
dictType: DICT_TYPE.ITEM_TYPE,
@ -1006,6 +1006,9 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true
}
},
{

9
src/views/wms/inventoryManage/expectin/expectin.data.ts

@ -30,6 +30,15 @@ export const Expectin = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
},
{
label: '背番',
field: 'backNumber',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
},
{
label: '批次',
field: 'batch',

9
src/views/wms/inventoryManage/expectout/expectout.data.ts

@ -30,6 +30,15 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
},
{
label: '背番',
field: 'backNumber',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
},
{
label: '包装号',
field: 'packingNumber',

9
src/views/wms/inventoryManage/package/index.vue

@ -205,8 +205,13 @@ const handleSelectionPoint = async ()=>{
}
if (res.cgLabel) {
//
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&asn_number='+res.cgLabel)
PackageApi.getPrintingLableId({packingNumbers:(rows)}).then(res => {
console.log(res)
window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
}
if(!res.cgLabel&&!res.zzLabel){
message.warning('包装不存在,无法打印或者是线边物料数据不生成包装!')

2
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@ -93,6 +93,7 @@ import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDe
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { formatDate } from '@/utils/formatTime'
import { usePageLoading } from '@/hooks/web/usePageLoading'
import { formatTime } from '@/utils/index'
const { loadStart, loadDone } = usePageLoading()
//
defineOptions({ name: 'InventoryinitRequestMain' })
@ -130,6 +131,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['packUnit'] = item['defaultPackUnit']
newRow['packQty'] = item['defaultPackQty']
newRow['uom'] = item['uom']
newRow['batch'] = formatTime(new Date(), 'yyyyMMdd')
tableData.value.push(newRow)
})

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

@ -490,6 +490,19 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
tableForm: {
disabled: false,
type:'FormDate',
placeholder: '请选择到批次',
valueFormat: 'YYYYMMDD',
format: 'YYYYMMDD',
},
form: {
componentProps: {
disabled: false,
valueFormat: 'YYYYMMDD',
}
}
},
// {
// label: '包装号',

2
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@ -192,7 +192,7 @@ const updataTableColumns = (val) => {
tableColumns.value = val
}
//
//
const isItemType = async (itemCode, labelTypeParams) => {
let isType = false
const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))

26
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@ -722,7 +722,7 @@ export const ItembasicShow = useCrudSchemas(
} ,
},
{
label: '物料状态',
label: '品番状态',
field: 'status',
sort: 'custom',
dictType: DICT_TYPE.ITEM_STATUS,
@ -894,9 +894,19 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
table: {
width: 150
},
// tableForm: {
// disabled: true
// }
tableForm: {
disabled: false,
type:'FormDate',
placeholder: '请选择到批次',
valueFormat: 'YYYYMMDD',
format: 'YYYYMMDD',
},
form: {
componentProps: {
disabled: false,
valueFormat: 'YYYYMMDD',
}
}
},
// {
// label: '包装号',
@ -1758,6 +1768,14 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
table: {
width: 150
},
form: {
componentProps: {
disabled: true,
}
},
tableForm: {
disabled: true,
}
},
{
label: '标签生产线代码',

19
src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@ -946,25 +946,6 @@ export const IssueRequestDetail = useCrudSchemas(
}
}
},
{
label: '背番',
field: 'itemDesc1',
sort: 'custom',
isSearch: true,
isForm:false,
hiddenSearchHigh:true,
table: {
width: 150
},
form:{
componentProps:{
disabled: true,
}
},
tableForm: {
disabled: true
},
},
{
label: '包装规格',
field: 'packUnit',

4
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@ -162,7 +162,7 @@ const detailValidate = (data) => {
}
}
//
//
const isItemType = async (itemCode, labelTypeParams) => {
let isType = false
const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))
@ -563,7 +563,7 @@ const buttonTableClick = async (val, row) => {
// dialogVisible.value = true
detatableData.tableList.map((item) => {
// item.batch = '000000'
// 线
// 线
ItembasicApi.getItembasicPage({
pageSize: 10,
pageNo: 1,

2
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@ -1760,7 +1760,7 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
},
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
tableForm: {

4
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@ -141,7 +141,7 @@ const updataTableColumns = (val) => {
tableColumns.value = val
}
//
//
const isItemType = async (itemCode, labelTypeParams) => {
let isType = false
const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))
@ -504,7 +504,7 @@ const buttonTableClick = async (val, row) => {
formLabelRef.value.open('create', row)
detatableData.tableList.map((item) => {
// item.batch = '000000'
// 线
// 线
ItembasicApi.getItembasicPage({
pageSize: 10,
pageNo: 1,

4
src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue

@ -190,7 +190,7 @@ const detailValidate = (data) => {
}
}
//
//
const isItemType = async (itemCode, labelTypeParams) => {
let isType = false
const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))
@ -521,7 +521,7 @@ const buttonTableClick = async (val, row) => {
formLabelRef.value.open('create', row)
detatableData.tableList.map((item) => {
// item.batch = '000000'
// 线
// 线
ItembasicApi.getItembasicPage({
pageSize: 10,
pageNo: 1,

2
src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue

@ -252,7 +252,7 @@ const handleExport = async () => {
//
loadStart()
const excelTitle = ref(route.meta.title)
const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params)
const data = await InventorymoveRecordMainApi.exportOkToHoldRecordOkToHoldMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {

29
src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts

@ -228,6 +228,35 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
},
sortTableDefault:9,
},
{
label: '责任',
field: 'duty',
dictType: DICT_TYPE.DUTY,
dictClass: 'string',
table: {
width: 150
},
sortTableDefault:9,
},
{
label: '部门',
field: 'dutyDept',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:9,
},
{
label: '责任明细',
field: 'dutyDetails',
dictType: DICT_TYPE.DUTY_DETAILS,
dictClass: 'string',
table: {
width: 150
},
sortTableDefault:9,
},
// {
// label: '部门',

2
src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts

@ -643,7 +643,7 @@ export const BalanceShow = useCrudSchemas(
isSearch: true
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
dictType: DICT_TYPE.ITEM_TYPE,

2
src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue

@ -599,7 +599,7 @@ const planSwitch = ref(false)
const requestSwitch = ref(false)
const getSwitch = async ()=>{
let switch1 = await SwitchApi.getByCode('CreatePrepareToIssuePlanAfterProductionPlanPublished')
planSwitch.value = switch1=='TRUE'
planSwitch.value = false
let switch2 = await SwitchApi.getByCode('CreateProductReciptRequestAfterProductionPlanPublished')
requestSwitch.value = switch2=='TRUE'
console.log('switch1',switch1)

2
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@ -585,7 +585,7 @@ const buttonTableClick = async (val, row) => {
// dialogVisible.value = true
formLabelRef.value.open('create', row)
detatableData.tableList.map((item) => {
// 线
// 线
ItembasicApi.getItembasicPage({
pageSize: 10,
pageNo: 1,

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

@ -1042,7 +1042,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
sortTableDefault: 1003,
sortSearchDefault: 5,
tableForm: {
disabled: true
disabled: true,
isPlaceholder:false
},
form: {
componentProps: {
@ -1836,7 +1837,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
key: 'itemCode',
value: 'itemCode',
message: '请先选择品番!',
isMainValue: true
isMainValue: true,
paramsFrom:'tableForm'
}
],
verificationParams: [
@ -1891,6 +1893,9 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true,
}
},
{

2
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@ -467,7 +467,7 @@ const buttonTableClick = async (val, row) => {
// dialogVisible.value = true
formLabelRef.value.open('create', row)
detatableData.tableList.map((item) => {
// 线
// 线
ItembasicApi.getItembasicPage({
pageSize: 10,
pageNo: 1,

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

@ -1098,7 +1098,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(
isSearch: true,
sortTableDefault: 1003,
tableForm: {
disabled: true
disabled: true,
isPlaceholder:false
},
form: {
componentProps: {
@ -1856,7 +1857,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(
key: 'itemCode',
value: 'itemCode',
message: '请先选择品番!',
isMainValue: true
isMainValue: true,
paramsFrom:'tableForm'
}
],
verificationParams: [
@ -1911,6 +1913,9 @@ export const ProductreceiptRequestLabel = useCrudSchemas(
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true
}
},
{

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@ -449,7 +449,7 @@ const buttonTableClick = async (val, row) => {
// dialogVisible.value = true
formLabelRef.value.open('create', row)
detatableData.tableList.map((item) => {
// 线
// 线
ItembasicApi.getItembasicPage({
pageSize: 10,
pageNo: 1,

13
src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts

@ -1003,7 +1003,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
isForm: false
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
table: {
@ -1019,16 +1019,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
}
}
},
{
label: '背番',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
sortTableDefault: 7
},
{
label: '描述',
field: 'itemDesc2',

10
src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@ -680,16 +680,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
isSearch: true,
isForm: false
},
{
label: '背番',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:11,
hiddenInMain:true
},
{
label: '描述',
field: 'itemDesc2',

15
src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@ -789,7 +789,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
isForm: false
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
dictType: DICT_TYPE.ITEM_TYPE,
@ -808,18 +808,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
}
},
{
label: '背番',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:7,
hiddenInMain:true,
isTableForm: false,
isForm: false
},
{
label: '描述',
field: 'itemDesc2',

15
src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@ -789,7 +789,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
isForm: false
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
dictType: DICT_TYPE.ITEM_TYPE,
@ -808,18 +808,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
}
},
{
label: '背番',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
sortTableDefault:7,
hiddenInMain:true,
isTableForm: false,
isForm: false
},
{
label: '描述',
field: 'itemDesc2',

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@ -1003,7 +1003,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
isSearch: true,
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
table: {

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts

@ -697,7 +697,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
isSearch: false,
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
dictType: DICT_TYPE.ITEM_TYPE,

4
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@ -790,7 +790,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
isSearch: true,
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
dictType: DICT_TYPE.ITEM_TYPE,
@ -2646,7 +2646,7 @@ export const PurchasereceiptRequestPackage = useCrudSchemas(reactive<CrudSchema[
}
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
isTableForm: false,

2
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue

@ -904,7 +904,7 @@ const getPurchanseList = async ()=>{
sort: '',
by: 'ASC'
})
if(res&&res.list&&res.list.length==1){
if(res&&res.list&&res.list.length>=1){
const setV = {}
setV['hahaha'] = ''
setV['hehehe'] = res.list[0]['number']

30
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts

@ -158,6 +158,36 @@ hiddenSearchHigh:true,
}
}
},
{
label: 'N',
field: 'sumN',
sort: 'custom',
isSearch: false,
hiddenSearchHigh:true,
table: {
width: 150
},
},
{
label: 'N+1',
field: 'sumN1',
sort: 'custom',
isSearch: false,
hiddenSearchHigh:true,
table: {
width: 150
},
},
{
label: 'N+2',
field: 'sumN2',
sort: 'custom',
isSearch: false,
hiddenSearchHigh:true,
table: {
width: 150
},
},
{
label: '到货日期',
field: 'dueDate',

48
src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@ -19,7 +19,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
isForm: false,
sortTableDefault: 1,
table: {
width: 180,
minWidth: 150,
fixed: 'left'
},
},
@ -35,7 +35,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
sortTableDefault: 2,
sort: 'custom',
table: {
width: 150
minWidth: 150
},
form: {
value: '1',
@ -50,7 +50,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
table: {
width: 150
minWidth: 150
},
form: {
labelMessage: '影响明细中品番,需在供应商物料中维护',
@ -89,7 +89,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
sortTableDefault:4,
table: {
width: 150
minWidth: 150
},
},
{
@ -102,7 +102,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
sortTableDefault: 5,
table: {
width: 150
minWidth: 150
},
},
// {
@ -112,7 +112,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
// isSearch: true,
// sort: 'custom',
// table: {
// width: 150
// minWidth: 150
// },
// },
@ -126,7 +126,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
},
sort: 'custom',
table: {
width: 180
minWidth: 150
},
sortTableDefault: 6,
form: {
@ -151,7 +151,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
},
sort: 'custom',
table: {
width: 180
minWidth: 150
},
sortTableDefault: 7,
form: {
@ -170,7 +170,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isTable: false,
table: {
width: 150
minWidth: 150
},
},
{
@ -178,7 +178,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'taxRate',
sort: 'custom',
table: {
width: 150
minWidth: 150
},
isTable: false,
form: {
@ -198,7 +198,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false,
isForm: false,
table: {
width: 150
minWidth: 150
},
},
{
@ -207,7 +207,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isTable: false,
table: {
width: 150
minWidth: 150
},
},
{
@ -216,7 +216,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isTable: false,
table: {
width: 150
minWidth: 150
},
},
{
@ -225,7 +225,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isTable: false,
table: {
width: 150
minWidth: 150
},
},
{
@ -236,7 +236,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false,
sort: 'custom',
table: {
width: 150
minWidth: 150
},
isForm: false,
form: {
@ -255,7 +255,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false,
isForm:false,
table: {
width: 150
minWidth: 150
},
},
@ -266,7 +266,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable:true,
isForm:false,
table: {
width: 150
minWidth: 150
},
},
@ -275,7 +275,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'businessType',
sort: 'custom',
table: {
width: 150
minWidth: 150
},
isForm: false,
isTable: false,
@ -292,7 +292,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'dataSource',
sort: 'custom',
table: {
width: 150
minWidth: 150
},
isForm: false,
isTable: false,
@ -304,12 +304,12 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
// field: 'currentStage',
// sort: 'custom',
// table: {
// width: 150
// minWidth: 150
// },
// form: {
// component: 'InputNumber',
// componentProps: {
// style: {width:'100%'},
// style: {minWidth:'100%'},
// min: 0
// }
// },
@ -324,7 +324,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
isForm: false,
isTable: true,
table: {
width: 150
minWidth: 150
},
sortTableDefault: 1000,
},
@ -339,7 +339,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isForm: false,
table: {
width: 180
minWidth: 150
},
form: {
component: 'DatePicker',
@ -910,7 +910,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
// dateFormat: 'YYYY-MM-DD HH:mm:ss'
// },
// table: {
// width: 180
// width: 150
// },
// hiddenInMain:false,
// isForm: false,

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

@ -229,6 +229,7 @@ export const PurchasePlanMain = useCrudSchemas(
table: {
width: 150
},
isTable:false,
form: {
component: 'InputNumber',
componentProps: {
@ -662,7 +663,7 @@ export const PurchasePlanDetail = useCrudSchemas(
sortTableDefault: 3,
isTableForm: false,
isForm: false,
isTable: true,
isTable: false,
isDetail:false
},
{
@ -801,7 +802,7 @@ export const PurchasePlanDetail = useCrudSchemas(
}
},
{
label: '物料状态',
label: '品番状态',
field: 'itemStatus',
sort: 'custom',
dictType: DICT_TYPE.ITEM_STATUS,

22
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@ -256,12 +256,28 @@ const handlerCreatePurchasereceiptRequest = async (number: string) => {
//
const BASE_URL = getJmreportBaseUrl()
//
//
const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken())
//
//
const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
const handleDocumentPrint = async (id) => {
await SupplierdeliverRecordMainApi.getPoLineType(id).then(async (res) => {
if (res.isM && res.haveNOM == false) {
//
window.open(documentSrc2.value + '&id=' + id + '&type=' + 'M')
}
if (res.isM && res.haveNOM && res.noMAndItemStatus == '生准订单') {
//
window.open(documentSrc2.value + '&id=' + id )
}
if (res.isM && res.haveNOM && res.noMAndItemStatus != '生准订单') {
// M
window.open(documentSrc.value + '&id=' + id+ '&type=' + 'M')
//
window.open(documentSrc.value + '&id=' + id)
}
if (res.isM == false) {
await SupplierdeliverRecordMainApi.getItemStatus(id).then(async (res) => {
if (res) {
//
@ -270,6 +286,8 @@ const handleDocumentPrint = async (id) => {
window.open(documentSrc.value + '&id=' + id)
}
})
}
})
}
//

34
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -209,6 +209,7 @@ import {
CurriculumVitaeRules
} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
@ -1268,12 +1269,36 @@ const print = async () => {
}
//
//
//
const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken())
//
//
const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
const handleDocumentPrint = async (id, stausId) => {
await SupplierdeliverRequestMainApi.getItemStatus(stausId).then(async (res) => {
// await SupplierdeliverRequestMainApi.getItemStatus(stausId).then(async (res) => {
// if (res) {
// //
// window.open(documentSrc2.value + '&id=' + id)
// } else {
// window.open(documentSrc.value + '&id=' + id)
// }
// })
await SupplierdeliverRecordMainApi.getPoLineType(id).then(async (res) => {
if (res.isM && res.haveNOM == false) {
//
window.open(documentSrc2.value + '&id=' + id + '&type=' + 'M')
}
if (res.isM && res.haveNOM && res.noMAndItemStatus == '生准订单') {
//
window.open(documentSrc2.value + '&id=' + id )
}
if (res.isM && res.haveNOM && res.noMAndItemStatus != '生准订单') {
// M
window.open(documentSrc.value + '&id=' + id+ '&type=' + 'M')
//
window.open(documentSrc.value + '&id=' + id)
}
if (res.isM == false) {
await SupplierdeliverRecordMainApi.getItemStatus(id).then(async (res) => {
if (res) {
//
window.open(documentSrc2.value + '&id=' + id)
@ -1281,6 +1306,9 @@ const handleDocumentPrint = async (id, stausId) => {
window.open(documentSrc.value + '&id=' + id)
}
})
}
})
}
/**

12
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@ -1368,6 +1368,18 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
isTable: false,
isForm: false
},
{
label: '行类型',
field: 'poLineType',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:false,
isTableForm: false,
isTable: false,
isForm: false
},
{
label: '是否上架',
field: 'isPutaway',

2
src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts

@ -1003,7 +1003,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
isForm: false
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
table: {

2
src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@ -789,7 +789,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
isForm: false
},
{
label: '物料类型',
label: '品番类型',
field: 'itemType',
sort: 'custom',
dictType: DICT_TYPE.ITEM_TYPE,

29
src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue

@ -267,6 +267,7 @@ const butttondata = (row, $index) => {
return []
}
return [
defaultButtons.mainSeeDetailBtn(null), //
defaultButtons.mainListPlanSubBtn({
hide: isShowMainButton(row, ['1']),
hasPermi: 'wms:purchaseClaimRequest:sub'
@ -296,7 +297,10 @@ const butttondata = (row, $index) => {
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') {
if (val == 'seeDetail') {
//
openDetail(row, '单据号', row.number)
} else if (val == 'edit') {
//
openForm('update', row)
} else if (val == 'mainPlanSub') {
@ -304,7 +308,7 @@ const buttonTableClick = async (val, row) => {
handleSub(row.masterId)
} else if (val == 'mainPlanApp') {
//
handleAgree(row.masterId)
handleAgree(row)
} else if (val == 'mainPlanTur') {
//
handleReject(row.masterId)
@ -361,13 +365,17 @@ const handleSub = async (masterId: number) => {
}
/** 审批通过按钮操作 */
const handleAgree = async (masterId: number) => {
const handleAgree = async (row: any) => {
if (row.isApproved==1) {
message.error(t('ts.索赔金额不能为0,请修改后提交。'))
return
}
try {
//
await message.confirm(t('ts.是否审批通过所选中数据?'))
tableObject.loading = true
//
await PurchaseClaimRequestMainApi.agreePurchaseClaimRequestMain(masterId)
await PurchaseClaimRequestMainApi.agreePurchaseClaimRequestMain(row.masterId)
message.success(t('ts.审批通过成功!'))
tableObject.loading = false
//
@ -484,6 +492,7 @@ const flag = ref(false)
//
const submitForm = async (formType, submitData) => {
flag.value=false
let data = { ...submitData }
if (data.masterId) {
data.id = data.masterId
@ -510,11 +519,11 @@ const submitForm = async (formType, submitData) => {
flag.value = true
return
}
if (obj.claimAmount == 0) {
message.error(`索赔金额不能为0!`)
flag.value = true
return
}
// if (obj.claimAmount == 0) {
// message.error(`0!`)
// flag.value = true
// return
// }
})
if (flag.value) {
return
@ -586,10 +595,12 @@ const submitFormDetail = async (formType, data) => {
console.log(detailRef.value.formRef.dialogVisible)
detailFormRef.value.dialogVisible = false
detailRef.value.updateList()
getList()
} catch {
detailFormRef.value.formLoading = false
}
}
/** 初始化 **/
onMounted(async () => {
getList()

Loading…
Cancel
Save