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

Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

dev_web_online
陈薪名 2 years ago
parent
c9313f3efb 17ef4749ba
commit
f1cde23316
23 changed files with 308 additions and 211 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. 4
      fe/PC/src/views/basicData/BomManage/Bom.vue
  2. 6
      fe/PC/src/views/basicData/CustomerManage/Customer.vue
  3. 2
      fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
  4. 2
      fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
  5. 2
      fe/PC/src/views/basicData/CustomerManage/Project.vue
  6. 4
      fe/PC/src/views/basicData/SupplierManage/Supplier.vue
  7. 4
      fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue
  8. 10
      fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
  9. 14
      fe/PC/src/views/basicData/WarehouseManage/Area.vue
  10. 12
      fe/PC/src/views/basicData/WarehouseManage/Dock.vue
  11. 10
      fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue
  12. 2
      fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
  13. 185
      fe/PC/src/views/basicData/WarehouseManage/Location.vue
  14. 168
      fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
  15. 10
      fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue
  16. 2
      fe/PC/src/views/basicData/WarehouseManage/WorkGroup.vue
  17. 14
      fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
  18. 26
      fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
  19. 2
      fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue
  20. 2
      fe/PC/src/views/basicData/WorkshopManage/Workshop.vue
  21. 4
      fe/PC/src/views/basicData/documentSetting/documentBasic.vue
  22. 10
      fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue
  23. 24
      fe/PC/src/views/basicData/systemManage/Calendar.vue

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

@ -124,8 +124,8 @@ export default {
plannedSplitRule: 1,
product: null,
component: null,
perQtyUom: null,
company: null
// perQtyUom: null,
// company: null
},
//编辑
editFormData: {

6
fe/PC/src/views/basicData/CustomerManage/Customer.vue
View File

@ -110,6 +110,7 @@ export default {
CreateFormData: {
remark: null,
name: null,
shortName: null,
address: null,
country: null,
city: null,
@ -121,13 +122,14 @@ export default {
isActive: true,
type: 1,
code: null,
company: null,
// company: null,
},
//编辑
editFormData: {
code:null,
remark: null,
name: null,
shortName: null,
address: null,
country: null,
city: null,
@ -144,6 +146,7 @@ export default {
CreateForm: [
{ type: "input", label: "客户代码", prop: "code", colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "客户名称", prop: 'name', colSpan: 12 },
{ type: "input", label: "客户简称", prop: 'shortName', colSpan: 12 },
{ type: "select", label: "类型", prop: "type", options: "customerType", colSpan: 12 },
{ type: "select", label: "状态", prop: "isActive", options: "openToCloseBit", colSpan: 12 },
{ type: "input", label: "国家", prop: "country", colSpan: 12 },
@ -159,6 +162,7 @@ export default {
editForm: [
{ type: "input", label: "客户代码", prop: "code",disabled:"true", colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "客户名称", prop: 'name', colSpan: 12 },
{ type: "input", label: "客户简称", prop: 'shortName', colSpan: 12 },
{ type: "select", label: "类型", prop: "type", options: "customerType", colSpan: 12 },
{ type: "select", label: "状态", prop: "isActive", options: "openToCloseBit", colSpan: 12 },
{ type: "input", label: "国家", prop: "country", colSpan: 12 },

2
fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
View File

@ -135,7 +135,7 @@ export default {
locationCode: null,
warehouseCode: null,
desc: null,
company: null,
// company: null,
code: null,
customerCode: null,
},

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

@ -137,7 +137,7 @@ export default {
endTime: null,
customerCode: null,
itemCode: null,
company: null,
// company: null,
},
//编辑
editFormData: {

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

@ -134,7 +134,7 @@ export default {
code: null,
name: null,
description: null,
company: null,
// company: null,
},
//编辑
editFormData: {

4
fe/PC/src/views/basicData/SupplierManage/Supplier.vue
View File

@ -127,7 +127,7 @@ export default {
isActive: true,
type: 1,
code: null,
company: null,
// company: null,
shortName: null,
taxRate: 0,
},
@ -158,7 +158,7 @@ export default {
{ type: "select", label: "状态", prop: "isActive", options: "openToCloseBit", colSpan: 12 },
{ type: "select", label: "类型", prop: "type", options: "supplierType", colSpan: 12 },
{ type: "input", label: "简称", prop: "shortName", colSpan: 12 },
{ type: "input", label: "税率", valueType: Number, prop: "taxRate", colSpan: 12 },
{ type: "input", label: "税率", prop: "taxRate", colSpan: 12, validType: 'pointNumber' },
{ type: "input", label: "国家", prop: "country", colSpan: 12 },
{ type: "input", label: "城市", prop: "city", colSpan: 12 },
{ type: "input", label: "地址", prop: "address", colSpan: 12 },

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

@ -135,8 +135,9 @@ export default {
itemName: null,
supplierCode: null,
itemCode: null,
company: null,
// company: null,
supplierSimpleName: null,
qtyPerPallet:0
},
//编辑
editFormData: {
@ -150,6 +151,7 @@ export default {
itemName: null,
concurrencyStamp: null,
supplierSimpleName: null,
qtyPerPallet:0
},
editOptions: { },
CreateForm: [

10
fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
View File

@ -129,17 +129,17 @@ export default {
//新增
CreateFormData: {
remark: null,
warehouseCode: null,
// warehouseCode: null,
supplierCode: null,
supplierName: null,
timeSlot: null,
week: null,
company: null,
// company: null,
},
//编辑
editFormData: {
remark: null,
warehouseCode: null,
// warehouseCode: null,
supplierCode: null,
supplierName: null,
timeSlot: null,
@ -175,14 +175,14 @@ export default {
supplierCode: [{ required: true, trigger: "change", message: "不可为空" }],
week: [{ required: true, trigger: "change", message: "不可为空" }],
timeSlot: [{ required: true, trigger: "blur", message: "不可为空" }],
warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
// warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
},
editRule: {
supplierName: [{ required: true, trigger: "change", message: "不可为空" }],
supplierCode: [{ required: true, trigger: "change", message: "不可为空" }],
week: [{ required: true, trigger: "change", message: "不可为空" }],
timeSlot: [{ required: true, trigger: "blur", message: "不可为空" }],
warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
// warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
}
},
};

14
fe/PC/src/views/basicData/WarehouseManage/Area.vue
View File

@ -108,25 +108,25 @@ export default {
],
//新增
CreateFormData: {
company: null,
code: null,
remark: null,
warehouseCode: null,
name: null,
description: null,
warehouseCode: null,
areaType: 1,
isFunctional: true,
remark: null
code: null,
// company: null,
},
//编辑
editFormData: {
code: null,
remark: null,
warehouseCode: null,
name: null,
description: null,
warehouseCode: null,
areaType: 1,
isFunctional: true,
code: null,
concurrencyStamp: null,
remark: null
},
editOptions: {},
CreateForm: [

12
fe/PC/src/views/basicData/WarehouseManage/Dock.vue
View File

@ -127,22 +127,22 @@ export default {
],
//新增
CreateFormData: {
company: null,
defaultLocationCode: null,
// company: null,
code: null,
name: null,
defaultLocationCode: null,
description: null,
name: null,
warehouseCode: null,
remark: null
},
//编辑
editFormData: {
concurrencyStamp: null,
code: null,
name: null,
defaultLocationCode: null,
description: null,
name: null,
warehouseCode: null,
concurrencyStamp: null,
defaultLocationCode: null,
remark: null
},
editOptions: {},

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

@ -163,8 +163,9 @@ export default {
feedLine: 0,
feedQty: 0,
feedUM: null,
concurrencyStamp: null,
company: localStorage.getItem('company'),
// concurrencyStamp: null,
// company: localStorage.getItem('company'),
remark:"",
},
//编辑
editFormData: {
@ -179,7 +180,8 @@ export default {
feedQty: 0,
feedUM: null,
concurrencyStamp: null,
company: localStorage.getItem('company'),
// company: localStorage.getItem('company'),
remark:"",
},
editOptions: {},
CreateForm: [
@ -196,6 +198,7 @@ export default {
{ type: "input", label: "补料点", valueType: Number, prop: "feedLine", colSpan: 12 },
{ type: "input", label: "补料数量", valueType: Number, prop: "feedQty", colSpan: 12 },
{ type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
{ type: "input", label: "备注", prop: "remark", colSpan: 12 },
],
editForm: [
{ type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
@ -209,6 +212,7 @@ export default {
{ type: "input", label: "补料点", valueType: Number, prop: "feedLine", colSpan: 12 },
{ type: "input", label: "补料数量", valueType: Number, prop: "feedQty", colSpan: 12 },
{ type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
{ type: "input", label: "备注", prop: "remark", colSpan: 12 },
],
editRules: {
cerateRule: {

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

@ -164,7 +164,7 @@ export default {
pramaryUM: 1,
isFixed: false,
multiLoc: 0,
company: null,
// company: null,
itemCode: null,
},
//编辑

185
fe/PC/src/views/basicData/WarehouseManage/Location.vue
View File

@ -133,11 +133,11 @@ export default {
//新增
CreateFormData: {
remark: null,
warehouseCode: null,
name: null,
description: null,
type: 1,
erpLocationCode: null,
warehouseCode: null,
areaCode: null,
locationGroupCode: null,
workGroupCode: null,
@ -147,36 +147,51 @@ export default {
defaultInventoryStatus: 1,
pickPriority: 1,
pickOrder: 1,
locSwitch: {
enableMixItem: true,
enableMixLot: true,
enableMixStatus: true,
enableNegative: true,
enableKeepZero: true,
enableOpportunityCount: true,
enablePick: true,
enableOverPick: true,
enableWholeStore: true,
enableBreakStore: true,
enableShip: true,
enableReceive: true,
enableReturnToSupplier: true,
enableReturnFromCustomer: true
},
uom: null,
qty: 0,
enableMixItem: true,
enableMixLot: true,
enableMixStatus: true,
enableNegative: true,
enableKeepZero: true,
enableOpportunityCount: true,
enablePick: true,
enableOverPick: true,
enableWholeStore: true,
enableBreakStore: true,
enableShip: true,
enableReceive: true,
enableReturnToSupplier: true,
enableReturnFromCustomer: true,
enableSplitBox: true,
enableSplitPallet: true,
code: null,
company: null,
// locSwitch: {
// enableMixItem: true,
// enableMixLot: true,
// enableMixStatus: true,
// enableNegative: true,
// enableKeepZero: true,
// enableOpportunityCount: true,
// enablePick: true,
// enableOverPick: true,
// enableWholeStore: true,
// enableBreakStore: true,
// enableShip: true,
// enableReceive: true,
// enableReturnToSupplier: true,
// enableReturnFromCustomer: true
// },
// uom: null,
// qty: 0,
// company: null,
},
//编辑
editFormData: {
code: null,
remark: null,
warehouseCode: null,
name: null,
description: null,
type: 1,
erpLocationCode: null,
warehouseCode: null,
areaCode: null,
locationGroupCode: null,
workGroupCode: null,
@ -186,26 +201,25 @@ export default {
defaultInventoryStatus: 1,
pickPriority: 0,
pickOrder: 0,
locSwitch: {
enableMixItem: true,
enableMixLot: true,
enableMixStatus: true,
enableNegative: true,
enableKeepZero: true,
enableOpportunityCount: true,
enablePick: true,
enableOverPick: true,
enableWholeStore: true,
enableBreakStore: true,
enableShip: true,
enableReceive: true,
enableReturnToSupplier: true,
enableReturnFromCustomer: true,
enableSplitBox: true,
enableSplitPallet: true,
},
uom: null,
qty: 0,
enableMixItem: true,
enableMixLot: true,
enableMixStatus: true,
enableNegative: true,
enableKeepZero: true,
enableOpportunityCount: true,
enablePick: true,
enableOverPick: true,
enableWholeStore: true,
enableBreakStore: true,
enableShip: true,
enableReceive: true,
enableReturnToSupplier: true,
enableReturnFromCustomer: true,
enableSplitBox: true,
enableSplitPallet: true,
code: null,
// uom: null,
// qty: 0,
concurrencyStamp: null,
},
editOptions: {},
@ -221,8 +235,8 @@ export default {
searchButton: (val) => { this.showSerarchPage(val, 'basedata/work-Group', 'WorkGroup', '工作组选择', this.CreateFormData) }, colSpan: 12 },
{ type: "input", label: "库位代码", prop: "code", colSpan: 12 },
{ type: "input", label: "名称", prop: "name", colSpan: 12 },
{ type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 },
{ type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 },
// { type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 },
// { type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 },
{ type: "select", label: "类型", prop: "type", options: "locationType", colSpan: 12 },
{ type: "input", label: "行号", valueType: Number,prop: "rowCode", colSpan: 12 },
{ type: "input", label: "列号", valueType: Number,prop: "columnCode", colSpan: 12 },
@ -231,21 +245,36 @@ export default {
{ type: "input", label: "拣料顺序", valueType: Number, prop: "pickOrder", colSpan: 12 },
{ type: "input", label: "货架号", prop: "shelfCode", colSpan: 12 },
{ type: "input", label: "ERP库位", prop: "erpLocationCode", colSpan: 12 },
{ type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否拆箱", prop: "locSwitch", showProp: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否拆箱", prop: "locSwitch", showProp: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
{ type: "input", label: "描述", prop: "description", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
@ -261,8 +290,8 @@ export default {
focus: (type,val) => { return this.getFilterList(type, val, "basedata/work-Group")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/work-Group', 'WorkGroup', '工作组选择', this.editFormData) }, colSpan: 12 },
{ type: "input", label: "名称", prop: "name", colSpan: 12 },
{ type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 },
{ type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 },
// { type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 },
// { type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 },
{ type: "select", label: "类型", prop: "type", options: "locationType", clearable: true, colSpan: 12 },
{ type: "input", label: "行号", valueType: Number,prop: "rowCode", colSpan: 12 },
{ type: "input", label: "列号", valueType: Number,prop: "columnCode", colSpan: 12 },
@ -271,27 +300,27 @@ export default {
{ type: "input", label: "拣料顺序", valueType: Number, prop: "pickOrder", colSpan: 12 },
{ type: "input", label: "货架号", prop: "shelfCode", colSpan: 12 },
{ type: "input", label: "ERP库位", prop: "erpLocationCode", colSpan: 12 },
{ type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否拆箱", prop: "locSwitch", showProp: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否拆箱", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
{ type: "input", label: "描述", prop: "description", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editRules: {
cerateRule: {
warehouseCode: [{ required: true, trigger: "change", message: "不可为空" },],
// warehouseCode: [{ required: true, trigger: "change", message: "不可为空" },],
areaCode: [{ required: true, trigger: "change", message: "不可为空" }],//编辑必选
locationGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
workGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
@ -299,7 +328,7 @@ export default {
erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
},
editRule: {
warehouseCode: [{ required: true, trigger: "change", message: "不可为空" },],
// warehouseCode: [{ required: true, trigger: "change", message: "不可为空" },],
areaCode: [{ required: true, trigger: "change", message: "不可为空" }],//编辑必选
locationGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
workGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],

168
fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
View File

@ -128,62 +128,78 @@ export default {
//新增
CreateFormData: {
remark: null,
description: null,
warehouseCode: null,
name: null,
description: null,
areaCode: null,
groupType: 1,
defaultInventoryStatus: 1,
pickPriority: 1,
overflowLocationGroup: null,
locSwitch: {
enableMixItem: true,
enableMixLot: true,
enableMixStatus: true,
enableNegative: true,
enableKeepZero: true,
enableOpportunityCount: true,
enablePick: true,
enableOverPick: true,
enableWholeStore: true,
enableBreakStore: true,
enableShip: true,
enableReceive: true,
enableReturnToSupplier: true,
enableReturnFromCustomer: true
},
enableMixItem: true,
enableMixLot: true,
enableMixStatus: true,
enableNegative: true,
enableKeepZero: true,
enableOpportunityCount: true,
enablePick: true,
enableOverPick: true,
enableWholeStore: true,
enableBreakStore: true,
enableShip: true,
enableReceive: true,
enableReturnToSupplier: true,
enableReturnFromCustomer: true,
enableSplitBox: true,
enableSplitPallet: true,
code: null,
company: null,
name: null,
// locSwitch: {
// enableMixItem: true,
// enableMixLot: true,
// enableMixStatus: true,
// enableNegative: true,
// enableKeepZero: true,
// enableOpportunityCount: true,
// enablePick: true,
// enableOverPick: true,
// enableWholeStore: true,
// enableBreakStore: true,
// enableShip: true,
// enableReceive: true,
// enableReturnToSupplier: true,
// enableReturnFromCustomer: true
// },
// company: null,
},
//编辑
editFormData: {
code: null,
remark: null,
description: null,
warehouseCode: null,
name: null,
description: null,
areaCode: null,
groupType: 1,
defaultInventoryStatus: 1,
pickPriority: 0,
overflowLocationGroup: null,
locSwitch: {
enableMixItem: true,
enableMixLot: true,
enableMixStatus: true,
enableNegative: true,
enableKeepZero: true,
enableOpportunityCount: true,
enablePick: true,
enableOverPick: true,
enableWholeStore: true,
enableBreakStore: true,
enableShip: true,
enableReceive: true,
enableReturnToSupplier: true,
enableReturnFromCustomer: true
},
enableMixItem: true,
enableMixLot: true,
enableMixStatus: true,
enableNegative: true,
enableKeepZero: true,
enableOpportunityCount: true,
enablePick: true,
enableOverPick: true,
enableWholeStore: true,
enableBreakStore: true,
enableShip: true,
enableReceive: true,
enableReturnToSupplier: true,
enableReturnFromCustomer: true,
enableSplitBox: true,
enableSplitPallet: true,
code: null,
concurrencyStamp: null,
name: null,
},
editOptions: {},
CreateForm: [
@ -197,20 +213,35 @@ export default {
{ type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
{ type: "input", label: "描述", prop: "description", colSpan: 12 },
{ type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
{ type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否机会盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否机会盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
// { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editForm: [
@ -224,20 +255,21 @@ export default {
{ type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
{ type: "input", label: "描述", prop: "description", colSpan: 12 },
{ type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
{ type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否机会盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
{ type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editRules: {
@ -246,13 +278,13 @@ export default {
{ required: true, trigger: "blur", message: "不可为空" },
],
areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
// warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
},
editRule: {
name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
// warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
}
},
};

10
fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue
View File

@ -134,12 +134,14 @@ export default {
CreateFormData: {},
//编辑
editFormData: {
code: null,
name: null,
// code: null,
// name: null,
description: null,
transType: 0,
inLocationTypes: null,
outLocationTypes: null,
inLocationAreas: null,
outLocationAreas: null,
itemStatuses: null,
itemTypes: null,
outInventoryStatuses: null,
@ -152,6 +154,7 @@ export default {
enabled: null,
concurrencyStamp: null,
transSubType: null,
remark: null,
},
editOptions: {},
CreateForm: [],
@ -161,6 +164,8 @@ export default {
{ type: "select", label: "事务子类型", prop: "transSubType", options: "transSubType", colSpan: 12 },
{ type: "selectArray", label: "入库库位类型清单", prop: 'inLocationTypes', options: "locationType", colSpan: 12 },
{ type: "selectArray", label: "出库库位类型清单", prop: 'outLocationTypes', options: "locationType", colSpan: 12 },
{ type: "input", label: "入库库区清单", prop: 'inLocationAreas', colSpan: 12 },
{ type: "input", label: "出库库区清单", prop: 'outLocationAreas', colSpan: 12 },
{ type: "selectArray", label: "物品状态清单", prop: 'itemStatuses', options: "ItemStatus", colSpan: 12 },
{ type: "selectArray", label: "物品类型清单", prop: 'itemTypes', options: "ItemType", colSpan: 12 },
{ type: "selectArray", label: "来源库存状态清单", prop: 'outInventoryStatuses', options: "inventoryStage", colSpan: 12 },
@ -171,6 +176,7 @@ export default {
{ type: "select", label: "自动完成任务", prop: 'autoCompleteJob', options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "直接创建记录", prop: 'directCreateNote', options: "whetherOrNot", colSpan: 12 },
{ type: "select", label: "是否可用", prop: 'enabled', options: "whetherOrNot", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editRules: {
cerateRule: {

2
fe/PC/src/views/basicData/WarehouseManage/WorkGroup.vue
View File

@ -108,7 +108,7 @@ export default {
],
//新增
CreateFormData: {
company: '',
// company: '',
code: '',
name: '',
description: '',

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

@ -130,15 +130,15 @@ export default {
//新增
CreateFormData: {
remark: "",
bomId: "",
routingId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
enabled: true,
code: "",
company: "",
prodLineId: "",
prodLineCode: "",
itemCode: "",
itemId: ""
// bomId: "",
// routingId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
// enabled: true,
// code: "",
// company: "",
// prodLineId: "",
// itemId: ""
},
//编辑
editFormData: {

26
fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
View File

@ -132,10 +132,11 @@ export default {
description: null,
type: 1,
workshopCode: null,
rawLocation: null,
productLocation: null,
rawLocationCode: null,
productLocationCode: null,
rawLocationGroupCode: null,
code: null,
company: null,
// company: null,
},
//编辑
editFormData: {
@ -145,8 +146,9 @@ export default {
description: null,
type: 1,
workshopCode: null,
rawLocation: null,
productLocation: null,
rawLocationCode: null,
rawLocationGroupCode: null,
productLocationCode: null,
concurrencyStamp: null,
},
editOptions: {
@ -159,10 +161,13 @@ export default {
{ type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "原料库位", prop: "rawLocation", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
{ type: "input", label: "描述", prop: "description", colSpan: 12 },
@ -175,10 +180,13 @@ export default {
{ type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.editFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "原料库位", prop: "rawLocation", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData) }, colSpan: 12 },
{ type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
{ type: "input", label: "描述", prop: "description", colSpan: 12 },

2
fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue
View File

@ -127,7 +127,7 @@ export default {
],
//新增
CreateFormData: {
company: null,
// company: null,
code: null,
name: null,
description: null,

2
fe/PC/src/views/basicData/WorkshopManage/Workshop.vue
View File

@ -108,7 +108,7 @@ export default {
],
//新增
CreateFormData: {
company: '',
// company: '',
code: '',
name: '',
description: '',

4
fe/PC/src/views/basicData/documentSetting/documentBasic.vue
View File

@ -142,7 +142,7 @@ export default {
{ type: "select", label: "事务类型", prop: "transactionType", options: "TransTypeBaseForStr", colSpan: 12 },
{ type: "input", label: "单号前缀", prop: "numberPrefix", colSpan: 12 },
{ type: "input", label: "单号格式", prop: "numberFormat", colSpan: 12 },
{ type: "input", valueType: Number, label: "单号流水长度", prop: "numberSerialLength", colSpan: 12 },
{ type: "input", label: "单号流水长度", prop: "numberSerialLength", colSpan: 12, validType:'number' },
{ type: "input", label: "单号分隔符", prop: "numberSeparator", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
@ -153,7 +153,7 @@ export default {
{ type: "select", label: "事务类型", prop: "transactionType", options: "TransTypeBaseForStr", colSpan: 12 },
{ type: "input", label: "单号前缀", prop: "numberPrefix", colSpan: 12 },
{ type: "input", label: "单号格式", prop: "numberFormat", colSpan: 12 },
{ type: "input", valueType: Number, label: "单号流水长度", prop: "numberSerialLength", colSpan: 12 },
{ type: "input", label: "单号流水长度", prop: "numberSerialLength", colSpan: 12, validType:'number' },
{ type: "input", label: "单号分隔符", prop: "numberSeparator", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],

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

@ -133,7 +133,8 @@ export default {
warehouseCode: null,
pictureBlobName: null,
step: null,
formFile:[]
formFile:[],
remark:null,
},
//编辑
editFormData: {
@ -152,7 +153,8 @@ export default {
pictureBlobName: null,
step: null,
formFile:[],
concurrencyStamp: null
concurrencyStamp: null,
remark:null,
},
editOptions: {},
CreateForm: [
@ -161,13 +163,15 @@ export default {
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: "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: "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 },
],
editRules: {
cerateRule: {

24
fe/PC/src/views/basicData/systemManage/Calendar.vue
View File

@ -110,20 +110,24 @@ export default {
company: '',
module: '',
status: 1,
timeRange: {
beginTime: "2021-11-16T06:52:26.560Z",
endTime: "2021-11-16T06:52:26.561Z"
},
beginTime: "",
endTime: "",
// timeRange: {
// beginTime: "2021-11-16T06:52:26.560Z",
// endTime: "2021-11-16T06:52:26.561Z"
// },
remark: ''
},
//编辑
editFormData: {
module: null,
status: 1,
timeRange: {
beginTime: "2021-11-16T06:52:26.560Z",
endTime: "2021-11-16T06:52:26.561Z"
},
beginTime: "",
endTime: "",
// timeRange: {
// beginTime: "2021-11-16T06:52:26.560Z",
// endTime: "2021-11-16T06:52:26.561Z"
// },
concurrencyStamp: '',
remark: ''
},
@ -134,11 +138,15 @@ export default {
{ type: "input", label: "模块", prop: "module", colSpan: 12 },
{ type: "select", label: "状态", prop: 'status', options: "calendarStatus", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
{ type: "dateTime", label: "开始时间", prop: 'beginTime', colSpan: 12 },
{ type: "dateTime", label: "结束时间", prop: 'endTime', colSpan: 12 },
],
editForm: [
{ type: "input", label: "模块", prop: "module", disabled:"true", colSpan: 12 },
{ type: "select", label: "状态", prop: 'status', options: "calendarStatus", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
{ type: "dateTime", label: "开始时间", prop: 'beginTime', colSpan: 12 },
{ type: "dateTime", label: "结束时间", prop: 'endTime', colSpan: 12 },
],
editRules: {
cerateRule: {

Write Preview
Loading…
Cancel
Save