zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

全局物料改为物品

dev_web_online
陈薪名 2 years ago
parent
1ae836c8b2
commit
9cc989c4f3
36 changed files with 159 additions and 159 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      fe/PC/src/api/wms-api.js
  2. 6
      fe/PC/src/components/commonTabel-drawer/index.vue
  3. 4
      fe/PC/src/filters/excelOrReportsOption.js
  4. 2
      fe/PC/src/filters/options.js
  5. 8
      fe/PC/src/filters/status.js
  6. 14
      fe/PC/src/mixins/printMixin.js
  7. 2
      fe/PC/src/utils/primarySearchOption/index.js
  8. 2
      fe/PC/src/utils/quicklySearchOption/index.js
  9. 26
      fe/PC/src/views/basicData/BomManage/Bom.vue
  10. 12
      fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
  11. 4
      fe/PC/src/views/basicData/CustomerManage/Project.vue
  12. 8
      fe/PC/src/views/basicData/ItemsManage/AQL.vue
  13. 20
      fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
  14. 8
      fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
  15. 6
      fe/PC/src/views/basicData/ItemsManage/ItemPack.vue
  16. 8
      fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
  17. 12
      fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
  18. 4
      fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
  19. 4
      fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
  20. 4
      fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
  21. 10
      fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue
  22. 4
      fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue
  23. 8
      fe/PC/src/views/finishedProductManage/productionReturn/returnJob.vue
  24. 6
      fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
  25. 6
      fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
  26. 6
      fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
  27. 16
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
  28. 22
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
  29. 20
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue
  30. 2
      fe/PC/src/views/labelManage/RepairLabels.vue
  31. 12
      fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue
  32. 12
      fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
  33. 6
      fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue
  34. 4
      fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
  35. 4
      fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue
  36. 20
      fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue

6
fe/PC/src/api/wms-api.js
View File

@ -286,7 +286,7 @@ export function byItem(itemCode, url ){
})
}
// 详情tabs页 通过父物料号 获取列表
// 详情tabs页 通过父物品号 获取列表
export function byProduct(product, url ){
return request({
url: baseURL + url + '/get-list-by-product',
@ -295,7 +295,7 @@ export function byProduct(product, url ){
})
}
// 详情tabs页 通过子物料号 获取列表
// 详情tabs页 通过子物品号 获取列表
export function byComponent(component, url ){
return request({
url: baseURL + url + '/get-list-by-component',
@ -339,7 +339,7 @@ export function relationByLocationCode(locationCode, url ){
})
}
// 详情tabs页 通过子物料号 获取子层级列表
// 详情tabs页 通过子物品号 获取子层级列表
export function byComponentCJ(component, url ){
return request({
url: baseURL + url + '/get-list-by-component-with-tree',

6
fe/PC/src/components/commonTabel-drawer/index.vue
View File

@ -134,7 +134,7 @@
<slot></slot>
</template>
</umyTable>
<!-- 自定义扩展（tree）的形式 目前使用位置：物料清单信息-子物料层级 todo:待优化-->
<!-- 自定义扩展（tree）的形式 目前使用位置：物品清单信息-子物品层级 todo:待优化-->
<currenTable
v-if="
scope.value == zdyValue &&
@ -456,7 +456,7 @@ export default {
parent.tableLoading = false
})
}
// 基础数据管理-物料清单维护-物料清单信息-详情-子物料层级
// 基础数据管理-物品清单维护-物品清单信息-详情-子物品层级
else if (item.functionName == 'byComponentCJ') {
this.otherData = []
byComponentCJ({component:this.propsData.component}, item.url).then(res => {
@ -545,7 +545,7 @@ export default {
}
})
},
// 递归 物料子级层级
// 递归 物品子级层级
recursion(val){
val.forEach(item => {
if(item.componentDTOs) {

4
fe/PC/src/filters/excelOrReportsOption.js
View File

@ -12,11 +12,11 @@ export const supplierAsnExcel = {
shipDate:"发货日期",
details:{
projectCode:"明细-项目编号",
itemCode:"明细-物料代码",
itemCode:"明细-物品代码",
ctype:"明细-类型",
recommendErpCode:"明细-指定ERP储位",
qty:"明细-发货数量",
uom:"明细-物料单位",
uom:"明细-物品单位",
lot:"明细-生产批次",
produceDate:"明细-生产时间",
expireDate:"明细-过期时间",

2
fe/PC/src/filters/options.js
View File

@ -126,7 +126,7 @@ export function Roles(val){
// "Warehouse": "仓库",
// "Area": "区域",
// "AreaItem": "区域零件",
// "Bom": "物料清单",
// "Bom": "物品清单",
// "InterfaceCalendar": "日历接口",
// "Calendar": "日历",
// "Company": "公司",

8
fe/PC/src/filters/status.js
View File

@ -1592,9 +1592,9 @@ export function SupplierAsnCtypeStaBack(name){
value: '原料',
label: '原料',
},
'物料': {
value: '物料',
label: '物料',
'物品': {
value: '物品',
label: '物品',
},
'半成品': {
value: '半成品',
@ -1629,7 +1629,7 @@ export function SupplierAsnCtypeStaBack(name){
},
3: {
value: 3,
label: '物料',
label: '物品',
UK: 'MAT'
},
4: {

14
fe/PC/src/mixins/printMixin.js
View File

@ -19,7 +19,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
let _options = options ? options : {}
propsData.details.forEach((item,key) => {
_printData["boxlabel"].push({
"title":propsData[_options.title] || propsData.title || "FATY 物料发运单",//title
"title":propsData[_options.title] || propsData.title || "FATY 物品发运单",//title
"contacts": propsData[_options.contacts] || propsData.contacts,//客户名称
"customerAddressCode":propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址
"supplierCode": propsData[_options.supplierCode] || propsData.supplierCode,//供应商代码
@ -36,8 +36,8 @@ export function initPrintPackingCodeData(propsData,options,name,url){
"produceDate": item[_options.produceDate] || item.produceDate,//生产时间
"lot": item[_options.lot] || item.lot,//生产批次
"locationErpCode": item[_options.locationErpCode] || item.locationErpCode,//储位
"itemName": item[_options.itemName] || item.itemName,//物料名称
"itemCode": item[_options.itemCode] || item.itemCode,//物料代码（ERP号）
"itemName": item[_options.itemName] || item.itemName,//物品名称
"itemCode": item[_options.itemCode] || item.itemCode,//物品代码（ERP号）
"stdPackQty": item[_options.stdPackQty] || item.stdPackQty,//整包数量
"qty": item[_options.qty] || item.qty,//要货数量
"packingCode": item[_options.packingCode] || item.packingCode,//条形码
@ -127,7 +127,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
_index = Number(_index) + 1
}
}
let _title = propsData ? "FATY 物料发运单" : ""
let _title = propsData ? "FATY 物品发运单" : ""
_label['title'+Number(key2 + 1)]=propsData[_options.title] || propsData.title || _title,//title
_label['contacts'+Number(key2 + 1)]= propsData[_options.contacts] || propsData.contacts,//客户名称
_label['customerAddressCode'+Number(key2 + 1)]=propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址
@ -144,7 +144,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
_label['produceDate'+Number(key2 + 1)] = item[_options.produceDate] || item2.produceDate;//生产时间
_label['lot'+Number(key2 + 1)] = item[_options.lot] || item2.lot;//生产批次
_label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位
_label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物料代码（ERP号）
_label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物品代码（ERP号）
_label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量
_label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量
_label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码
@ -273,7 +273,7 @@ const printEnumOption = {
// 使用位置:自动发料任务 (automaticCallJob-msQuery.vue) | 自动发料记录 (automaticCallNote.vue)
// 使用位置:人工发料任务 (IssueJob.vue) | 人工发料记录 (IssueNote.vue)
// 单号:number; 制表日:creationTime; 部门名称:deptName;
// 物品代码:itemCode; 物品名称:itemName; 物料描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode;
// 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode;
// 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode;
// xbctl.rdlx 使用参数 xbctl.rdlx报表 和 xbcll.rdlx报表 目前字段相同，除了领/退字段
@ -282,7 +282,7 @@ const printEnumOption = {
// zjfl.rdlx 使用参数
// 使用位置:直接发料记录 (directIssueNote.vue)
// 单号:number; 制表日:creationTime; 部门名称:deptName;
// 物品代码:itemCode; 物品名称:itemName; 物料描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode;
// 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode;
// 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode;
// hslrkd.rdlx 使用参数

2
fe/PC/src/utils/primarySearchOption/index.js
View File

@ -2,7 +2,7 @@
// 示例配置 primarySearchOptionExample
export const ItemBasic = [
// type == input
{ type: "input", label: "物料编码", prop: "code", action:"Like"},
{ type: "input", label: "物品编码", prop: "code", action:"Like"},
// type == select 枚举options(filters/status.js)
{ type: "select", label: "状态", prop: "status", options: "itemStatus"},
// type == select 自定义options(使用userOptions参数)

2
fe/PC/src/utils/quicklySearchOption/index.js
View File

@ -3,7 +3,7 @@
// export const primarySearchOptionExample = {
// action:"Like",//筛选方式：可不写，默认等于==
// prop:'code',//接口要查的参数
// placeholder:'请输入物料代码',//placeholder
// placeholder:'请输入物品代码',//placeholder
// }
// 原料管理

26
fe/PC/src/views/basicData/BomManage/Bom.vue
View File

@ -149,14 +149,14 @@ export default {
},
editOptions: {},
CreateForm: [
{ type: "filterSelect", label: "父物料号", prop: "product", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "父物品号", prop: "product", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "子物料号", prop: "component", optionsLabel: "name", optionsValue: "code",
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "子物品号", prop: "component", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
{ type: "inputNumber", label: "子物料用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2 },
{ type: "input", label: "子物料用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "inputNumber", label: "子物品用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2 },
{ type: "input", label: "子物品用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 },
{ type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
{ type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },
{ type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },
@ -168,10 +168,10 @@ export default {
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editForm: [
{ type: "input", label: "父物料号", prop: "product",disabled:"true", colSpan: 12 },
{ type: "input", label: "子物料号", prop: 'component', disabled:"true", colSpan: 12 },
{ type: "inputNumber", label: "子物料用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2 },
{ type: "input", label: "子物料用量单位", prop: 'componentUom', colSpan: 12 },
{ type: "input", label: "父物品号", prop: "product",disabled:"true", colSpan: 12 },
{ type: "input", label: "子物品号", prop: 'component', disabled:"true", colSpan: 12 },
{ type: "inputNumber", label: "子物品用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2 },
{ type: "input", label: "子物品用量单位", prop: 'componentUom', colSpan: 12 },
{ type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
{ type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },
{ type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },
@ -205,14 +205,14 @@ export default {
name: 'xq'
},
{
label: "父物料信息",
label: "父物品信息",
name: 'fwlxx',
url: 'basedata/bom',
tableColumns: 'BomInner',
functionName: 'byProduct'
},
{
label: "子物料信息",
label: "子物品信息",
name: 'zwlxx',
url: 'basedata/bom',
tableColumns: 'BomInner',
@ -220,7 +220,7 @@ export default {
}
,
// {
// label: "子物料层级",
// label: "子物品层级",
// name: 'zwlcj',
// url: 'basedata/bom',
// tableColumns: 'Bom',

12
fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
View File

@ -156,15 +156,15 @@ export default {
reportGroupId: [],
},
CreateForm: [
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.CreateFormData) }, colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "input", label: "客户物料代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
{ type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
{ type: "input", label: "版本", prop: "version", colSpan: 12 },
@ -174,9 +174,9 @@ export default {
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editForm: [
{ type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
{ type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
{ type: "input", label: "客户代码", prop: "customerCode", disabled:"true", colSpan: 12 },
{ type: "input", label: "客户物料代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
{ type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
{ type: "input", label: "版本", prop: "version", colSpan: 12 },

4
fe/PC/src/views/basicData/CustomerManage/Project.vue
View File

@ -153,7 +153,7 @@ export default {
CreateForm: [
{ type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.CreateFormData) }, colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "input", label: "项目代码", prop: 'code', validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "项目名称", prop: 'name', colSpan: 12 },
{ type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
@ -164,7 +164,7 @@ export default {
editForm: [
{ type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.editFormData) }, colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.editFormData) }, colSpan: 12 },
{ type: "input", label: "项目代码", prop: 'code', disabled:"true", colSpan: 12 },
{ type: "input", label: "项目名称", prop: 'name', colSpan: 12 },
{ type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },

8
fe/PC/src/views/basicData/ItemsManage/AQL.vue
View File

@ -186,9 +186,9 @@ export default {
},
editOptions: {},
CreateForm: [
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
@ -201,9 +201,9 @@ export default {
{ type: "input", label: "备注", prop: "remark", colSpan: 12 },
],
editForm: [
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.editFormData) }, colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'SupplierBasic', '供应商选择', this.editFormData) }, colSpan: 12 },

20
fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
View File

@ -202,10 +202,10 @@ export default {
},
editOptions: {},
CreateForm: [
{ type: "input", label: "物料代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "物料名称", prop: "name", colSpan: 12 },
{ type: "input", label: "物料描述1", prop: "desc1", colSpan: 12 },
{ type: "input", label: "物料描述2", prop: "desc2", colSpan: 12 },
{ type: "input", label: "物品代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "物品名称", prop: "name", colSpan: 12 },
{ type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
{ type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
{ type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
{ type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
@ -230,15 +230,15 @@ export default {
{ type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
{ type: "input", label: "版本", prop: 'version', colSpan: 12 },
{ type: "input", label: "工程变更", prop: 'eco', colSpan: 12 },
{ type: "select", label: "是否虚拟物料", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否虚拟物品", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
{ type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editForm: [
{ type: "input", label: "物料代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "物料名称", prop: "name", colSpan: 12 },
{ type: "input", label: "物料描述1", prop: "desc1", colSpan: 12 },
{ type: "input", label: "物料描述2", prop: "desc2", colSpan: 12 },
{ type: "input", label: "物品代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "物品名称", prop: "name", colSpan: 12 },
{ type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
{ type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
{ type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
{ type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
@ -263,7 +263,7 @@ export default {
{ type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
{ type: "input", label: "版本", prop: 'version', colSpan: 12 },
{ type: "input", label: "工程变更", prop: 'eco', colSpan: 12 },
{ type: "select", label: "是否虚拟物料", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否虚拟物品", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
{ type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],

8
fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
View File

@ -142,17 +142,17 @@ export default {
},
editOptions: {},
CreateForm: [
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "分类编号", prop: "categoryCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/category")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/category', 'Category', '物料分类选择', this.CreateFormData) }, colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/category', 'Category', '物品分类选择', this.CreateFormData) }, colSpan: 12 },
{ type: "input", label: "分类值", prop: "value", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editForm: [
{ type: "input", label: "物料代码", prop: "itemCode",disabled:"true", colSpan: 12 },
{ type: "input", label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
{ type: "input", label: "分类编号", prop: "categoryCode", disabled:"true", colSpan: 12 },
{ type: "input", label: "分类值", prop: "value", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },

6
fe/PC/src/views/basicData/ItemsManage/ItemPack.vue
View File

@ -151,9 +151,9 @@ export default {
{ type: "input", label: "包装代码", prop: 'packCode', colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "包装名称", prop: "packName", colSpan: 12 },
{ type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
{ type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
@ -162,7 +162,7 @@ export default {
{ type: "input", label: "包装代码", prop: 'packCode', colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "包装名称", prop: "packName", colSpan: 12 },
{ type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
{ type: "input", label: "物料代码", prop: "itemCode", disabled:true, colSpan: 12 },
{ type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
{ type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
{ type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },

8
fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
View File

@ -150,10 +150,10 @@ export default {
},
editOptions: {},
CreateForm: [
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "物料名称", prop: "name", optionsLabel: "code", optionsValue: "name",
{ type: "filterSelect", label: "物品名称", prop: "name", optionsLabel: "code", optionsValue: "name",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code",
@ -166,8 +166,8 @@ export default {
{ type: "input", label: "备注", prop: "remark", colSpan: 12 },
],
editForm: [
{ type: "input",label: "物料代码", prop: "itemCode",disabled:"true", colSpan: 12 },
{ type: "input", label: "物料名称", prop: "name", colSpan: 12,disabled:"true", },
{ type: "input",label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
{ type: "input", label: "物品名称", prop: "name", colSpan: 12,disabled:"true", },
{ type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },

12
fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
View File

@ -158,20 +158,20 @@ export default {
{ type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "input", label: "供应商物料代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "供应商物料名称", prop: "itemName", colSpan: 12 },
{ type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
{ type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
{ type: "input", label: "版本", prop: "version", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editForm: [
{ type: "input", label: "供应商代码", prop: "supplierCode", disabled:"true", colSpan: 12 },
{ type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
{ type: "input", label: "供应商物料代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "供应商物料名称", prop: "itemName", colSpan: 12 },
{ type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
{ type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
{ type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
{ type: "input", label: "包装单位", prop: "supplierPackUom", colSpan: 12 },
{ type: "input", label: "版本", prop: "version", colSpan: 12 },

4
fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
View File

@ -185,7 +185,7 @@ export default {
},
editOptions: {},
CreateForm: [
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
{ type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
@ -201,7 +201,7 @@ export default {
{ type: "input", label: "备注", prop: "remark", colSpan: 12 },
],
editForm: [
{ type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
{ type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
{ type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
{ type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},

4
fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
View File

@ -186,7 +186,7 @@ export default {
},
editOptions: {},
CreateForm: [
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
{ type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
@ -203,7 +203,7 @@ export default {
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editForm: [
{ type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
{ type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
{ type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
{ type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },

4
fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
View File

@ -149,7 +149,7 @@ export default {
type: []
},
CreateForm: [
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code",
@ -158,7 +158,7 @@ export default {
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editForm: [
{ type: "filterSelect", label: "物料代码",disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码",disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code",

10
fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue
View File

@ -158,17 +158,17 @@ export default {
},
editOptions: {},
CreateForm: [
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
{ type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12 },
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
{ type: "uploadPictureCard", label: "图片", prop: "formFile", limit: 1, picExt: ".png,.jpg", colSpan: 12 },
{ type: "textarea", label: "步骤", prop: "step", rows: 5, maxlength: 1000, colSpan: 24 },
{ type: "input", label: "备注", prop: "remark", colSpan: 24 },
],
editForm: [
{ type: "input", label: "物料代码", prop: 'itemCode', disabled: true, colSpan: 12 },
{ type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12 },
{ type: "input", label: "物品代码", prop: 'itemCode', disabled: true, colSpan: 12 },
{ type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
{ type: "uploadPictureCard", label: "图片", prop: "formFile", limit: 1, picExt: ".png,.jpg", colSpan: 12 },
{ type: "textarea", label: "步骤", prop: "step", rows: 5, maxlength: 1000, colSpan: 24 },
{ type: "input", label: "备注", prop: "remark", colSpan: 24 },

4
fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue
View File

@ -143,7 +143,7 @@ export default {
label: "实际箱标签",
prop: "handledPackingCode",
},
{ label: "物料代码", prop: "itemCode", },
{ label: "物品代码", prop: "itemCode", },
{ type: "objectInput", valueType: Number, label: "实际数量", rules: detailsRules.numberInput, prop: "handledQty", showProp: "qty", },
{ type: "objectInput", label: "实际单位", prop: "handledQty", showProp: "uom", },
{ type: "object", label: "推荐数量", prop: "recomendQty", showProp: "qty", },
@ -154,7 +154,7 @@ export default {
{ type: "objectDateTimeInput", label: "实际日期", prop: "handledBatch", showProp: "produceDate", },
{ type: "object", label: "推荐批次", prop: "recommendBatch", showProp: "supplierBatch", },
{ type: "object", label: "推荐日期", prop: "recommendBatch", showProp: "produceDate", },
{ label: "物料名称", prop: "itemName" },
{ label: "物品名称", prop: "itemName" },
{ label: "包装数量", prop: "stdPackQty", },
{ label: "包装单位", prop: "stdPackUom", },
{ label: "备注", prop: 'remark', },

8
fe/PC/src/views/finishedProductManage/productionReturn/returnJob.vue
View File

@ -121,8 +121,8 @@ export default {
// label: "箱标签",
// prop: "handledPackingCode",
// },
// { label: "物料代码", prop: "itemCode", },
// { label: "物料名称", prop: "itemName" },
// { label: "物品代码", prop: "itemCode", },
// { label: "物品名称", prop: "itemName" },
// // { type: "objectInput", rules: detailsRules.detailsRules, label: "供应商批次", prop: "supplierBatch",},
// // { type: "objectDateTimeInput", rules: detailsRules.detailsRules, label: "生产日期", prop: "produceDate",},
// { type: "objectInput", valueType: Number, rules: detailsRules.numberInput, label: "收货数量", prop: "handledQty", showProp: "qty", },
@ -130,8 +130,8 @@ export default {
// { type: "input", rules: detailsRules.detailsRules, label: "实际库位", prop: "handledLocationCode", },
// { label: "推荐库位", prop: "recommendLocationCode", },
// // { label: "托标签", prop: "handledContainerCode", },
// // { label: "物料名称1", prop: "itemDesc1" },
// // { label: "物料名称2", prop: "itemDesc2" },
// // { label: "物品名称1", prop: "itemDesc1" },
// // { label: "物品名称2", prop: "itemDesc2" },
// { label: "包装单位", prop: "stdPackUom", },
// { type: "object", label: "收货单位", prop: "handledQty", showProp: "uom", },
// { label: "订单号", prop: "poNumber", },

6
fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
View File

@ -126,7 +126,7 @@ export default {
],
handleDetailsTableColumns: [
{ label: "箱标签", prop: "packingCode", },
{ label: "物料代码", prop: "itemCode", },
{ label: "物品代码", prop: "itemCode", },
{ type: "objectInput", valueType: Number, label: "实际数量", rules: detailsRules.numberInput, prop: "countQty", showProp: "qty", },
{ type: "objectInput", label: "实际单位", prop: "countQty", showProp: "uom", },
{ type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
@ -134,8 +134,8 @@ export default {
{ type: "input", rules: detailsRules.detailsRules, label: "库位编号", prop: "locationCode", },
{ type: "input", rules: detailsRules.detailsRules, label: "包装数量", prop: "stdPackQty", },
{ type: "input", rules: detailsRules.detailsRules, label: "包装单位", prop: "stdPackUom", },
{ label: "物料代码", prop: "itemCode", },
{ label: "物料名称", prop: "itemName" },
{ label: "物品代码", prop: "itemCode", },
{ label: "物品名称", prop: "itemName" },
{ label: "供应商批次", prop: "supplierBatch", },
{ label: "备注", prop: 'remark', },
],

6
fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
View File

@ -147,13 +147,13 @@ export default {
{ type: "input", label: "序号", prop: 'serialNumber', colSpan: 12 },
{ type: "input", label: "最后盘点计划", prop: 'lastCountPlanNumber', colSpan: 12 },
{ type: "input", label: "最后盘点标签", prop: 'lastCountLabel', colSpan: 12 },
{ type: "input", label: "物料代码", prop: 'itemCode', colSpan: 12 },
{ type: "input", label: "物品代码", prop: 'itemCode', colSpan: 12 },
{ type: "input", label: "批次编号", prop: 'batchCode', colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editForm: [
{ type: "input", label: "物料代码", prop: "itemCode", disabled:true, colSpan: 12 },
{ type: "input", label: "物料名称", prop: "itemName", disabled:true, colSpan: 12 },
{ type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
{ type: "input", label: "物品名称", prop: "itemName", disabled:true, colSpan: 12 },
{ type: "input", label: "库位代码", prop: "locationCode", disabled:true, colSpan: 12 },
{ type: "input", label: "批次", prop: "lot", disabled:true, colSpan: 12 },
{ type: "input", label: "箱标签", prop: "packingCode", disabled:true, colSpan: 12 },

6
fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
View File

@ -168,7 +168,7 @@ export default {
{ type: "radio", label: "转移方式", prop: "queryType",radio:'queryTypeRadio', value: '1', colSpan: 9 },
{ type: "radio", label: "清除箱码", prop: "clearPackCode",radio:'radio', value: '2', colSpan: 5 },
{ type: "radio", label: "清除批次", prop: "clearLot",radio:'radio', value: '2', colSpan: 5 },
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "箱标签", prop: "packingCode", optionsLabel: "itemCode", optionsValue: "packingCode",
@ -185,8 +185,8 @@ export default {
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.CreateFormData) }, colSpan: 12 },
],
myTableColumns:[
{label: "物料代码", prop: "itemCode", width:'180px'},
{label: "物料名称", prop: "itemName", width:'150px'},
{label: "物品代码", prop: "itemCode", width:'180px'},
{label: "物品名称", prop: "itemName", width:'150px'},
{label: "来源库位", prop: "locationCode",},
{label: "箱码", prop: "packingCode", width:'110px'},
{label: "批次", prop: "lot", width:'110px'},

16
fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
View File

@ -91,7 +91,7 @@ export default {
{title:"预览信息"},
{title:"打印"},
],
selectItemInfo:{},//已选物料信息
selectItemInfo:{},//已选物品信息
// 筛选数据
selectData:{
itemCode:"",
@ -104,18 +104,18 @@ export default {
},
// 筛选条件
selectForm:[
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", [
{logic:"And",column:"canMake",action:"==",value:"true"},
{logic:"And",column:"type",action:"==",value:"半成品"}
])},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料代码', this.selectData,[
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
{logic:"And",column:"canMake",action:"==",value:"true"},
{logic:"And",column:"type",action:"==",value:"半成品"}
]) },
colSpan: 12,
},
{ type: "input",disabled:true,label: "物料名称", prop: "itemName", colSpan: 12 },
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
{ type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
{ type: "input",disabled:true,label: "标包数量", prop: "packQty", colSpan: 12 },
{ type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12},
@ -124,15 +124,15 @@ export default {
],
// 筛选Rules
selectRules:{
itemCode: [{ required: true, trigger: "change", message: "物料代码不能为空" }],
itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
},
// 格头部信息
flexTableColumns:[
{ width:"auto",label: "物料代码", prop: "itemCode", },
{ width:"auto",label: "物料名称", prop: "itemName", },
{ width:"auto",label: "物品代码", prop: "itemCode", },
{ width:"auto",label: "物品名称", prop: "itemName", },
{ width:"auto",label: "批次", prop: "lot", },
{ width:"auto",label: "标包数量", prop: "packQty", },
{ width:"auto",label: "标包单位", prop: "packUom", },
@ -161,7 +161,7 @@ export default {
this.$refs.steps_bcpsj.returnFirstActive()
this.$refs.form_bcpsj.getDom().resetFields();
},
// 第一部物料代码点击拉取
// 第一部物品代码点击拉取
detailsDataPush (val) {
if(val[1].prop == "itemCode"){
this.pageLoading = true

22
fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue
View File

@ -107,8 +107,8 @@ export default {
{title:"预览信息",cancle:()=>{return _this.sencondPre()}},
{title:"打印"},
],
selectItemInfo:{},//已选物料信息
selectSupplierInfo:{},//已选物料信息对应的供应商信息
selectItemInfo:{},//已选物品信息
selectSupplierInfo:{},//已选物品信息对应的供应商信息
// 默认筛选数据
defaultSelectData:{
itemCode:"",
@ -130,16 +130,16 @@ export default {
// 筛选条件
selectForm:[
{
type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic",
// [{logic:"And",column:"canMake",action:"!=",value:"true"}] //原回收料的条件
)},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料代码', this.selectData,
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,
// [{logic:"And",column:"canMake",action:"!=",value:"true"}] //原回收料的条件
)},
colSpan: 12,
},
{ type: "input",disabled:true,label: "物料名称", prop: "itemName", colSpan: 12 },
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
{ type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
@ -149,7 +149,7 @@ export default {
{ type: "input", label: "批次", prop: "lot", colSpan: 12 },
{ type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
{ type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物料代码'); return false}else{return true}},
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
this.isFilter("itemCode", this.selectData.itemCode)
@ -160,15 +160,15 @@ export default {
],
// 筛选Rules
selectRules:{
itemCode: [{ required: true, trigger: "change", message: "物料代码不能为空" },],
itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
// lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
},
// 表格头部信息
flexTableColumns:[
{ label: "物料代码", prop: "itemCode", },
{ label: "物料名称", prop: "itemName", },
{ label: "物品代码", prop: "itemCode", },
{ label: "物品名称", prop: "itemName", },
{ label: "批次", prop: "lot", },
// { width:"auto",label: "标包数量", prop: "packQty", },
// { width:"auto",label: "标包单位", prop: "packUom", },
@ -206,9 +206,9 @@ export default {
this.$refs.steps_create.returnFirstActive()
this.$refs.form_create.getDom().resetFields();
},
// 第一部物料代码点击拉取
// 第一部物品代码点击拉取
detailsDataPush (val) {
// 点击物料
// 点击物品
if(val[1].prop == "itemCode"){
this.canForm.canType = null
this.selectItemInfo = val[0];

20
fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue
View File

@ -92,7 +92,7 @@ export default {
{title:"预览信息"},
{title:"打印"},
],
selectItemInfo:{},//已选物料信息
selectItemInfo:{},//已选物品信息
// 筛选数据
selectData:{
itemCode:"",
@ -107,20 +107,20 @@ export default {
},
// 筛选条件
selectForm:[
{ type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
{ type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic",[
{logic:"And",column:"canMake",action:"!=",value:"true"},
{logic:"And",column:"isRecycled",action:"!=",value:"true"},
])},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料代码', this.selectData,[
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
{logic:"And",column:"canMake",action:"!=",value:"true"},
{logic:"And",column:"isRecycled",action:"!=",value:"true"},
]) },
colSpan: 12,
},
{ type: "input",disabled:true,label: "物料名称", prop: "itemName", colSpan: 12 },
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
{ type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物料代码'); return false}else{return true}},
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
this.isFilter("itemCode", this.selectData.itemCode)
@ -129,7 +129,7 @@ export default {
},
{
type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物料代码'); return false}else{return true}},
beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
colSpan: 12,
},
@ -140,7 +140,7 @@ export default {
],
// 筛选Rules
selectRules:{
itemCode: [{ required: true, trigger: "change", message: "物料代码不能为空" }],
itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
supplierCode: [{ required: true, trigger: "change", message: "供应商代码不能为空" }],
poNumber: [{ required: true, trigger: "change", message: "采购订单号不能为空" }],
lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
@ -149,8 +149,8 @@ export default {
},
// 格头部信息
flexTableColumns:[
{ width:"auto",label: "物料代码", prop: "itemCode", },
{ width:"auto",label: "物料名称", prop: "itemName", },
{ width:"auto",label: "物品代码", prop: "itemCode", },
{ width:"auto",label: "物品名称", prop: "itemName", },
{ width:"auto",label: "批次", prop: "lot", },
{ width:"auto",label: "订单号", prop: "poNumber", },
{ width:"auto",label: "供应商代码", prop: "supplierCode", },
@ -218,7 +218,7 @@ export default {
this.selectData.poNumberInfo = val[0]
}
},
// 第一部物料代码点击拉取
// 第一部物品代码点击拉取
filterClearHandle(val){
if(val[0].prop == "itemCode"){
this.selectData.supplierCode = ""

2
fe/PC/src/views/labelManage/RepairLabels.vue
View File

@ -128,7 +128,7 @@ export default {
flexTableData:[],
// 箱码表格头部信息
flexTableColumns:[
{ label: "物料代码", prop: "itemCode", width:"auto" },
{ label: "物品代码", prop: "itemCode", width:"auto" },
{ label: "物品名称", prop: "itemName", width:"auto" },
{ label: "箱标签", prop: "packingCode", width:"auto" },
{ label: "数量", prop: "qty", width:"auto" },

12
fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue
View File

@ -118,8 +118,8 @@ export default {
// },
],
handleDetailsTableColumns: [
{ label: "物料代码", prop: "itemCode", },
{ label: "物料名称", prop: "itemName" },
{ label: "物品代码", prop: "itemCode", },
{ label: "物品名称", prop: "itemName" },
{ label: "实际库位", prop: "handledLocationCode", },
{ label: "推荐库位", prop: "recommendLocationCode", },
{ label: "实际箱标签", prop: "handledPackingCode", },
@ -266,7 +266,7 @@ export default {
reject()
} else {
if (that.handleMultipleSelection[0].requestLocationCode != that.handleFormData.toLocationCode) {
that.$confirm('目标库位与需求库位不一致,是否要将所有物料发到目标库位?', '提示', {
that.$confirm('目标库位与需求库位不一致,是否要将所有物品发到目标库位?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -276,7 +276,7 @@ export default {
reject()
})
} else {
that.$confirm('是否要将物料发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
that.$confirm('是否要将物品发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -386,7 +386,7 @@ export default {
}
getPageList(params, 'basedata/item-basic').then(res => {
if (res.items.length == 0) {
this.$errorMsg('未查询到该物料信息!')
this.$errorMsg('未查询到该物品信息!')
} else {
let findRs = that.CreateFormData.details.find(item => (
item.code == that.CreateFormData.itemCode
@ -419,7 +419,7 @@ export default {
}
for (var i = 0; i < this.CreateFormData.details.length; i++) {
if (this.CreateFormData.details[i].numberDetails <= 0) {
this.$errorMsg('物料[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
this.$errorMsg('物品[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
return
} else {
params.details.push({

12
fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue
View File

@ -118,8 +118,8 @@ export default {
},
],
handleDetailsTableColumns: [
{ label: "物料代码", prop: "itemCode", },
{ label: "物料名称", prop: "itemName" },
{ label: "物品代码", prop: "itemCode", },
{ label: "物品名称", prop: "itemName" },
{ label: "实际库位", prop: "handledLocationCode", },
{ label: "推荐库位", prop: "recommendLocationCode", },
{ label: "实际箱标签", prop: "handledPackingCode", },
@ -267,7 +267,7 @@ export default {
reject()
} else {
if (that.handleMultipleSelection[0].requestLocationCode != that.handleFormData.toLocationCode) {
that.$confirm('目标库位与需求库位不一致,是否要将所有物料发到目标库位?', '提示', {
that.$confirm('目标库位与需求库位不一致,是否要将所有物品发到目标库位?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -277,7 +277,7 @@ export default {
reject()
})
} else {
that.$confirm('是否要将物料发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
that.$confirm('是否要将物品发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -387,7 +387,7 @@ export default {
}
getPageList(params, 'basedata/item-basic').then(res => {
if (res.items.length == 0) {
this.$errorMsg('未查询到该物料信息!')
this.$errorMsg('未查询到该物品信息!')
} else {
let findRs = that.CreateFormData.details.find(item => (
item.code == that.CreateFormData.itemCode
@ -420,7 +420,7 @@ export default {
}
for (var i = 0; i < this.CreateFormData.details.length; i++) {
if (this.CreateFormData.details[i].numberDetails <= 0) {
this.$errorMsg('物料[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
this.$errorMsg('物品[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
return
} else {
params.details.push({

6
fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue
View File

@ -196,7 +196,7 @@ export default {
formFile: [],
},
uploadDialogForm: [
{ type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12, },
{ type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12, },
{ type: "objectSelect", label: "不合格原因", prop: "item", showProp: "failedReason", options: "purchaseReceiptFailedReason", colSpan: 12, },
{ type: "objectTextarea", label: "质量缺陷", prop: "item", showProp: "massDefect"},
{ type: "uploadPictureCard", label: "上传图片", prop: "formFile", limit: 3, picExt:'.jpg,.png', multiple:true}
@ -251,8 +251,8 @@ export default {
// }
],
handleDetailsTableColumns: [
{ label: "物料代码", prop: "itemCode" ,fixed:"left",width:"auto"},
{ label: "物料名称", prop: "itemName",width:"auto"},
{ label: "物品代码", prop: "itemCode" ,fixed:"left",width:"auto"},
{ label: "物品名称", prop: "itemName",width:"auto"},
{ label: "箱标签", prop: "recommendPackingCode",width:"auto"},
{ type: "object", label: "实际数量", prop: "handledQty", showProp: "qty",width:"auto"},
{ type: "object", label: "单据数量", prop: "recommendQty", showProp: "qty" ,width:"auto"},

4
fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue
View File

@ -144,7 +144,7 @@ export default {
if(index == '1'){
let _result = data.results;
let _data = [];
// 查询物料代码是否重复
// 查询物品代码是否重复
// let _itemArr = [];
// let _hasSame = false
// data.results.forEach(item=>{
@ -155,7 +155,7 @@ export default {
// }
// })
// if(_hasSame){
// this.$message.error("模板中存在相同物料代码，请修改模板重新导入")
// this.$message.error("模板中存在相同物品代码，请修改模板重新导入")
// return
// }
// 查重重组

4
fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue
View File

@ -129,8 +129,8 @@ export default {
label: "箱标签",
prop: "handledPackingCode",
},
{ label: "物料代码", prop: "itemCode", },
{ label: "物料名称", prop: "itemName" },
{ label: "物品代码", prop: "itemCode", },
{ label: "物品名称", prop: "itemName" },
{ type: "objectInput", valueType: Number, rules: detailsRules.numberInput, label: "收货数量", prop: "handledQty", showProp: "qty", },
{ label: "包装数量", prop: "stdPackQty", },
{ type: "input", rules: detailsRules.detailsRules, label: "实际库位", prop: "handledLocationCode", },

20
fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue
View File

@ -337,8 +337,8 @@ export default {
}],
},
inspectForm: [
{ type: "input", label: "物料代码", prop: "itemCode", disabled: true, colSpan: 12 },
{ type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12 },
{ type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12 },
{ type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
{ type: "input", label: "箱码", prop: "packingCode", disabled: true, colSpan: 12 },
{ type: "select", label: "外观", prop: "appearance", options: "inspectAppearanceStatus", colSpan: 12 },
{ type: "input", label: "尺寸", prop: "volume", colSpan: 12 },
@ -385,8 +385,8 @@ export default {
// }]
// },
// supplierForm: [
// { type: "input", label: "物料代码", prop: "itemCode", disabled: true, colSpan: 12 },
// { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12 },
// { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12 },
// { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
// { type: "input", label: "描述", prop: "lot", disabled: true, colSpan: 12 },
// { type: "input", label: "外观", prop: "jysl", disabled: true, colSpan: 12 },
// { type: "input", label: "尺寸", prop: "jysl", disabled: true, colSpan: 12 },
@ -450,8 +450,8 @@ export default {
},
// 质检详情页面-form字段
inspectNoticeDetailsForm: [
{ type: "input", label: "物料代码", prop: "itemCode", disabled: true, colSpan: 8 },
{ type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 8 },
{ type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 8 },
{ type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 8 },
{ type: "input", label: "单位", prop: "stdPackUom", disabled: true, colSpan: 8 },
// { type: "input", label: "整包数量", prop: "stdPackQty", disabled: true, colSpan: 8 },
{ type: "input", label: "生产批次", prop: "lot", disabled: true, colSpan: 8 },
@ -473,8 +473,8 @@ export default {
],
inspectNoticeDetailsTableColumns: [
{ label: "箱码", prop: "packingCode", width:'100%' },
{ label: "物料代码", prop: "itemCode", width:'100%' },
{ label: "物料名称", prop: "itemName", width:'100%' },
{ label: "物品代码", prop: "itemCode", width:'100%' },
{ label: "物品名称", prop: "itemName", width:'100%' },
{ label: "单位", prop: "receiveUom", width:'100%' },
{ label: "收货数量", prop: "receiveQty", width:'100%' },
{ label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus", width:'100%' },
@ -654,8 +654,8 @@ export default {
}
}
if (this.inspectNoticeDetailsFormData.sampleQty == 0) {
this.$alert('没有找到当前物料代码对应的质检标准！')
// this.$confirm('没有找到当前物料代码对应的质检标准！, 是否继续?', '提示', {
this.$alert('没有找到当前物品代码对应的质检标准！')
// this.$confirm('没有找到当前物品代码对应的质检标准！, 是否继续?', '提示', {
// confirmButtonText: '继续',
// cancelButtonText: '取消',
// type: 'warning'

Write Preview
Loading…
Cancel
Save