Browse Source

【nev-pc】暂存

ag_report_nev
安虹睿 1 year ago
parent
commit
e4d9ee3039
  1. 2
      fe/PC/src/components/filterSelect/index.vue
  2. 198
      fe/PC/src/router/index.js
  3. 21
      fe/PC/src/utils/detailsTableColumns/index.js
  4. 36
      fe/PC/src/utils/tableColumns/index.js
  5. 20
      fe/PC/src/utils/tabsDesTions/index.js
  6. 5
      fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
  7. 38
      fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue
  8. 13
      fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
  9. 2
      fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue
  10. 46
      fe/PC/src/views/kittingManage/Kitting.vue
  11. 106
      fe/PC/src/views/kittingManage/KittingPackagingNote.vue
  12. 0
      fe/PC/src/views/kittingManage/chassisManage/chassisList.vue
  13. 0
      fe/PC/src/views/kittingManage/chassisManage/chassisOperationSequence.vue
  14. 2
      fe/PC/src/views/systemManage/pageLock.vue

2
fe/PC/src/components/filterSelect/index.vue

@ -19,7 +19,7 @@
:loading-text="loadingText" :loading-text="loadingText"
@change="changeHandle(arguments)" @change="changeHandle(arguments)"
:class="[selectItem.searchButton ? 'hasSearchButton' : '']" :class="[selectItem.searchButton ? 'hasSearchButton' : '']"
:size="selectItem.size || 'normal'" :size="selectItem.size || undefined"
> >
<el-option <el-option
v-for="item in options" v-for="item in options"

198
fe/PC/src/router/index.js

@ -142,70 +142,38 @@ export const constantRoutes = [
} }
}] }]
}, },
{ // {
path: '/', // path: '/',
component: Layout, // component: Layout,
redirect: '/gridlayout', // redirect: '/gridlayout',
hidden: true, // hidden: true,
children: [{ // children: [{
path: 'PurchaseReturnApprove', // path: 'PurchaseOrderHigher',
component: () => import('@/views/rawMaterialManage/purchaseReturn/returnApprove.vue'), // component: () => import('@/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue'),
name: 'PurchaseReturnApprove', // name: 'PurchaseOrderHigher',
meta: { // meta: {
keepAlive : true, // keepAlive : true,
title: '上架后退货审批', // title: '采购订单(关闭订单行)',
icon: '系统首页', // icon: '系统首页',
} // }
}] // }]
}, // },
{ // {
path: '/', // path: '/',
component: Layout, // component: Layout,
redirect: '/gridlayout', // redirect: '/gridlayout',
hidden: true, // hidden: true,
children: [{ // children: [{
path: 'PurchaseOrderHigher', // path: 'IssuePlanZS',
component: () => import('@/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue'), // component: () => import('@/views/materialIssueManage/ZS/IssuePlanZS.vue'),
name: 'PurchaseOrderHigher', // name: 'IssuePlanZS',
meta: { // meta: {
keepAlive : true, // keepAlive : true,
title: '采购订单(关闭订单行)', // title: '注塑计划',
icon: '系统首页', // icon: '成品发运任务',
} // }
}] // }]
}, // },
{
path: '/',
component: Layout,
redirect: '/gridlayout',
hidden: true,
children: [{
path: 'ProductionLine',
component: () => import('@/views/basicData/WorkshopManage/ProductionLine.vue'),
name: 'ProductionLine',
meta: {
keepAlive : true,
title: '生产线信息',
icon: '生产线信息',
}
}]
},
{
path: '/',
component: Layout,
redirect: '/gridlayout',
hidden: true,
children: [{
path: 'IssuePlanZS',
component: () => import('@/views/materialIssueManage/ZS/IssuePlanZS.vue'),
name: 'IssuePlanZS',
meta: {
keepAlive : true,
title: '注塑计划',
icon: '成品发运任务',
}
}]
},
{ {
path: '/', path: '/',
component: Layout, component: Layout,
@ -217,7 +185,7 @@ export const constantRoutes = [
name: 'IssueRequestZS', name: 'IssueRequestZS',
meta: { meta: {
keepAlive : true, keepAlive : true,
title: '人工注塑申请', title: '注塑申请',
icon: '成品发运任务', icon: '成品发运任务',
} }
}] }]
@ -233,7 +201,7 @@ export const constantRoutes = [
name: 'IssueJobZS', name: 'IssueJobZS',
meta: { meta: {
keepAlive : true, keepAlive : true,
title: '人工注塑任务', title: '注塑任务',
icon: '成品发运任务', icon: '成品发运任务',
} }
}] }]
@ -249,7 +217,7 @@ export const constantRoutes = [
name: 'IssueNoteZS', name: 'IssueNoteZS',
meta: { meta: {
keepAlive : true, keepAlive : true,
title: '人工注塑记录', title: '注塑记录',
icon: '成品发运任务', icon: '成品发运任务',
} }
}] }]
@ -350,70 +318,6 @@ export const constantRoutes = [
} }
}] }]
}, },
{
path: '/',
component: Layout,
redirect: '/gridlayout',
hidden: true,
children: [{
path: 'transferLibRequest',
component: () => import('@/views/inventoryManage/transferLib/transferLibRequest.vue'),
name: 'transferLibRequest',
meta: {
keepAlive : true,
title: '业务库移申请',
icon: '成品发运任务',
}
}]
},
{
path: '/',
component: Layout,
redirect: '/gridlayout',
hidden: true,
children: [{
path: 'transferLibJob',
component: () => import('@/views/inventoryManage/transferLib/transferLibJob.vue'),
name: 'transferLibJob',
meta: {
keepAlive : true,
title: '业务库移任务',
icon: '成品发运任务',
}
}]
},
{
path: '/',
component: Layout,
redirect: '/gridlayout',
hidden: true,
children: [{
path: 'transferLibNote',
component: () => import('@/views/inventoryManage/transferLib/transferLibNote.vue'),
name: 'transferLibNote',
meta: {
keepAlive : true,
title: '业务库移记录',
icon: '成品发运任务',
}
}]
},
{
path: '/',
component: Layout,
redirect: '/gridlayout',
hidden: true,
children: [{
path: 'pageLock',
component: () => import('@/views/systemManage/pageLock.vue'),
name: 'pageLock',
meta: {
keepAlive : true,
title: '页面锁定控制',
icon: '成品发运任务',
}
}]
},
{ {
path: '/', path: '/',
component: Layout, component: Layout,
@ -558,38 +462,6 @@ export const constantRoutes = [
} }
}] }]
}, },
{
path: '/',
component: Layout,
redirect: '/gridlayout',
hidden: true,
children: [{
path: 'chassisList',
component: () => import('@/views/basicData/chassisManage/chassisList.vue'),
name: 'chassisList',
meta: {
keepAlive : true,
title: '底盘查询',
icon: '成品发运任务',
}
}]
},
{
path: '/',
component: Layout,
redirect: '/gridlayout',
hidden: true,
children: [{
path: 'chassisOperationSequence',
component: () => import('@/views/basicData/chassisManage/chassisOperationSequence.vue'),
name: 'chassisOperationSequence',
meta: {
keepAlive : true,
title: '底盘执行位置序列',
icon: '成品发运任务',
}
}]
},
] ]

21
fe/PC/src/utils/detailsTableColumns/index.js

@ -3513,10 +3513,10 @@ export const safetyStockWarning = [
// 总成量份 // 总成量份
export const Kitting = [ export const Kitting = [
{ label: _Names.itemCode, prop: 'partCode' }, { label: _Names.itemCode, prop: 'itemCode' },
{ label: _Names.itemName, prop: 'partName' }, { label: _Names.itemName, prop: 'itemName' },
{ label: _Names.itemDesc1, prop: "desc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "desc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: '配置', prop: "conf" }, { label: '配置', prop: "conf" },
{ label: '包装数量', prop: "qty" }, { label: '包装数量', prop: "qty" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
@ -4954,4 +4954,17 @@ export const customerReturnNote = [
{ label: "过期时间", prop: 'expiredTime' }, { label: "过期时间", prop: 'expiredTime' },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
// kitting打包记录
export const KittingPackagingNote = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "数量", prop: "qty" },
{ label: "kitting代码", prop: 'kittingCode' },
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
] ]

36
fe/PC/src/utils/tableColumns/index.js

@ -735,6 +735,7 @@ export const Workshop = [
export const ProductionLine = [ export const ProductionLine = [
{ label: "生产线代码", prop: "code", fixed: "left", type: "name" }, { label: "生产线代码", prop: "code", fixed: "left", type: "name" },
{ label: "生产线名称", prop: 'name' }, { label: "生产线名称", prop: 'name' },
{ label: "生产线类型", prop: "productionLineType", type: "filter", filters: "productionLineType" },
{ label: "库位代码", prop: "locationCode" }, { label: "库位代码", prop: "locationCode" },
{ label: "描述", prop: "description" }, { label: "描述", prop: "description" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" },
@ -4847,6 +4848,7 @@ export const chassisList = [
fixed: "left", fixed: "left",
type: "name" type: "name"
}, },
{ label: "Wms编号", prop: 'number' },
{ label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" }, { label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" },
{ label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" }, { label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" },
{ label: "执行位置排序列", prop: 'sortNumber' }, { label: "执行位置排序列", prop: 'sortNumber' },
@ -4865,12 +4867,44 @@ export const chassisOperationSequence = [
type: "name" type: "name"
}, },
{ label: "kitting代码", prop: 'kittingCode' }, { label: "kitting代码", prop: 'kittingCode' },
{ label: "kitting执行序列号", prop: 'kittingNumber',width:"180px" }, { label: "Kitting执行底盘序列位置", prop: 'chassisSortNumber',width:"220px" },
{ label: "备注", prop: "remark" }, { label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
] ]
// kitting打包记录
export const KittingPackagingNote = [
{
label: "单号",
prop: 'number',
fixed: "left",
type: "name"
},
{ label: "kitting代码", prop: 'kittingCode' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// kitting打包记录 - 扫描明细
export const KittingPackagingDepDetails = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "底盘代码", prop: "chassisNumber" },
{ label: "底盘号排序序列", prop: "chassisSortNumber" },
{ label: "kitting代码", prop: 'kittingCode' },
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 字段说明 // 字段说明

20
fe/PC/src/utils/tabsDesTions/index.js

@ -547,6 +547,7 @@ export const Workshop = [
export const ProductionLine = [ export const ProductionLine = [
{ label: "生产线代码", prop: "code", fixed: "left", type: "name" }, { label: "生产线代码", prop: "code", fixed: "left", type: "name" },
{ label: "生产线名称", prop: 'name' }, { label: "生产线名称", prop: 'name' },
{ label: "生产线类型", prop: "productionLineType", type: "filter", filters: "productionLineType" },
{ label: "库位代码", prop: "locationCode" }, { label: "库位代码", prop: "locationCode" },
{ label: "描述", prop: "description" }, { label: "描述", prop: "description" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" },
@ -3630,6 +3631,7 @@ export const chassisList = [
fixed: "left", fixed: "left",
type: "name" type: "name"
}, },
{ label: "Wms编号", prop: 'number' },
{ label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" }, { label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" },
{ label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" }, { label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" },
{ label: "执行位置排序列", prop: 'sortNumber' }, { label: "执行位置排序列", prop: 'sortNumber' },
@ -3648,8 +3650,24 @@ export const chassisOperationSequence = [
type: "name" type: "name"
}, },
{ label: "kitting代码", prop: 'kittingCode' }, { label: "kitting代码", prop: 'kittingCode' },
{ label: "kitting执行序列号", prop: 'kittingNumber' }, { label: "Kitting执行底盘序列位置", prop: 'chassisSortNumber'},
{ label: "备注", prop: "remark" }, { label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// kitting打包记录
export const KittingPackagingNote = [
{
label: "单号",
prop: 'number',
fixed: "left",
type: "name"
},
{ label: "kitting代码", prop: 'kittingCode' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
] ]

5
fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue

@ -131,6 +131,7 @@ export default {
name: null, name: null,
description: null, description: null,
locationCode: null, locationCode: null,
productionLineType:null,
}, },
// //
editFormData: { editFormData: {
@ -138,6 +139,7 @@ export default {
name: null, name: null,
description: null, description: null,
locationCode: null, locationCode: null,
productionLineType:null,
concurrencyStamp: null, concurrencyStamp: null,
}, },
editOptions: { editOptions: {
@ -146,6 +148,7 @@ export default {
CreateForm: [ CreateForm: [
{ type: "input", label: "生产线代码", prop: "code", validType:'numberLetter', colSpan: 12 }, { type: "input", label: "生产线代码", prop: "code", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "生产线名称", prop: 'name', colSpan: 12 }, { type: "input", label: "生产线名称", prop: 'name', colSpan: 12 },
{ type: "select", label: "生产线类型", prop: "productionLineType", options: "productionLineType", colSpan: 12 },
{ type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", { type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) },
@ -156,6 +159,7 @@ export default {
editForm: [ editForm: [
{ type: "input", label: "生产线代码",disabled:true, prop: "code", validType:'numberLetter', colSpan: 12 }, { type: "input", label: "生产线代码",disabled:true, prop: "code", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "生产线名称", prop: 'name', colSpan: 12 }, { type: "input", label: "生产线名称", prop: 'name', colSpan: 12 },
{ type: "select", label: "生产线类型", disabled:true, prop: "productionLineType", options: "productionLineType", colSpan: 12 },
{ type: "filterSelect", label: "库位代码",disabled:true, prop: "locationCode", optionsLabel: "name", optionsValue: "code", { type: "filterSelect", label: "库位代码",disabled:true, prop: "locationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) },
@ -167,6 +171,7 @@ export default {
cerateRule: { cerateRule: {
code: [{ required: true, trigger: "blur", message: "不可为空" }], code: [{ required: true, trigger: "blur", message: "不可为空" }],
name: [{ required: true, trigger: "blur", message: "不可为空" }], name: [{ required: true, trigger: "blur", message: "不可为空" }],
productionLineType: [{ required: true, trigger: "blur", message: "不可为空" }],
locationCode: [{ required: true, trigger: "change", message: "不可为空" }], locationCode: [{ required: true, trigger: "change", message: "不可为空" }],
}, },
editRule: { editRule: {

38
fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue

@ -388,24 +388,23 @@ export default {
// 3 ==> // 3 ==>
// 4 ==> // 4 ==>
handleNodeCheck(row,node){ handleNodeCheck(row,node){
// /
if(row.id == this.CreateFormData.details[0].id){ if(row.id == this.CreateFormData.details[0].id){
// todo: //
// let _selectData = this.getBomAllSelect() let _selectData = this.getBomAllSelect()
// // //
// if(_selectData.length <= 0){ this.isAllCheck = false } if(_selectData.length <= 0){ this.isAllCheck = false }
// // //
// let _selectsIds = [] let _selectsIds = []
// _selectData.forEach(item=>{_selectsIds.push(item.id)}) _selectData.forEach(item=>{_selectsIds.push(item.id)})
// let _lastData = this.getLastFloors(this.CreateFormData.details) let _lastData = this.getLastFloors(this.CreateFormData.details)
// let _lastIds = [] let _lastIds = []
// _lastData.forEach(item=>{_lastIds.push(item.id)}) _lastData.forEach(item=>{_lastIds.push(item.id)})
// if (_selectsIds.length !== _lastIds.length) { this.isAllCheck = false } if(_selectsIds.sort().toString() == _lastIds.sort().toString()){
// console.log(403,_selectsIds.every((item) => _lastIds.includes(item))) this.isAllCheck = true
// if(_selectsIds.every((item) => _lastIds.includes(item))){ }else{
// this.isAllCheck = false this.isAllCheck = false
// }else{ }
// this.isAllCheck = true
// }
// //
if(this.isAllCheck){ if(this.isAllCheck){
@ -428,7 +427,9 @@ export default {
this.setAllDataNotCheck() this.setAllDataNotCheck()
this.toggleCheckSelect(this.selectData,true) this.toggleCheckSelect(this.selectData,true)
} }
}else{ }
// /
else{
// //
if(node.checkedKeys.indexOf(row.id) >= 0){ if(node.checkedKeys.indexOf(row.id) >= 0){
row.isCheck = true row.isCheck = true
@ -579,7 +580,6 @@ export default {
if(_parentIsCheck != 1){ _isError++ } if(_parentIsCheck != 1){ _isError++ }
} }
}) })
console.log(547,_isError)
this.canCommit = (_isError == 0) this.canCommit = (_isError == 0)
}, },
//退 //退

13
fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue

@ -36,6 +36,18 @@
:detailsTableColumns="handleDetailsTableColumns" :detailsTableColumns="handleDetailsTableColumns"
@FormSubmit="handleFormSubmit" @FormSubmit="handleFormSubmit"
></handelFrom> --> ></handelFrom> -->
<!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
<!-- methodValue 导入方式默认选项 是否局部导入 默认选项 -->
<importFile
:loading="Loading.importLoading"
:show="displayDialog.importDialog"
:URL="URL"
:disabledMethod = {method1:false,method2:false,method3:false}
:disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
isAllowPartImportValue="1"
@importClick="postImportMergeClick(arguments)"
@postImportDown="importDown"
></importFile>
<curren-Drawer <curren-Drawer
:title="tableColumns" :title="tableColumns"
:DrawerLoading="Loading.DrawerLoading" :DrawerLoading="Loading.DrawerLoading"
@ -96,6 +108,7 @@ export default {
URL: 'wms/store/count-job', URL: 'wms/store/count-job',
// //
currenButtonData: [ currenButtonData: [
this.defaultImportBtn(),//
this.defaultExportBtn(),// this.defaultExportBtn(),//
{ {
type: "success", type: "success",

2
fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue

@ -89,7 +89,7 @@ export default {
URL: 'wms/store/count-note', URL: 'wms/store/count-note',
// //
currenButtonData: [ currenButtonData: [
this.defaultImportBtn(),// // this.defaultImportBtn(),//
this.defaultExportBtn(),// this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),// this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),// this.defaultFreshBtn(),//

46
fe/PC/src/views/basicData/ItemsManage/Kitting.vue → fe/PC/src/views/kittingManage/Kitting.vue

@ -155,24 +155,24 @@ export default {
}, },
AddDetailsTableColumns: [ AddDetailsTableColumns: [
{ type:"inputNumber", label: "包装数量", prop: 'qty',width:"auto",min:1 }, { type:"inputNumber", label: "包装数量", prop: 'qty',width:"auto",min:1 },
{ type: "filterSelect", label: "物品代码", prop: "partCode", optionsLabel: "name", optionsValue: "code", { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) },
width: "auto",searchButton:false width: "auto",searchButton:false
}, },
{ label: "物料名称", prop: "partName",width:"auto" }, { label: "物料名称", prop: "itemName",width:"auto" },
{ label: "物料描述1", prop: "desc1",width:"auto" }, { label: "物料描述1", prop: "itemDesc1",width:"auto" },
{ label: "物料描述2", prop: "desc2",width:"auto" }, { label: "物料描述2", prop: "itemDesc2",width:"auto" },
{ label: "配置", prop: 'conf',width:"auto" }, { label: "配置", prop: 'conf',width:"auto" },
{ type:"input", label: "备注", prop: 'remark',width:"auto" }, { type:"input", label: "备注", prop: 'remark',width:"auto" },
], ],
childTableData:[{ childTableData:[{
id:undefined, id:undefined,
masterId:undefined, masterId:undefined,
partCode:null, itemCode:null,
partName:null, itemName:null,
desc1:null, itemDesc1:null,
desc2:null, itemDesc2:null,
qty:null, qty:null,
conf:null, conf:null,
remark:null, remark:null,
@ -194,10 +194,10 @@ export default {
this.childTableData = [{ this.childTableData = [{
id:undefined, id:undefined,
masterId:this.propsData.id, masterId:this.propsData.id,
partCode:null, itemCode:null,
partName:null, itemName:null,
desc1:null, itemDesc1:null,
desc2:null, itemDesc2:null,
qty:null, qty:null,
conf:null, conf:null,
remark:null, remark:null,
@ -222,8 +222,8 @@ export default {
let array = [] let array = []
let _isEmpty = 0 let _isEmpty = 0
this.CreateFormData.details.forEach(item => { this.CreateFormData.details.forEach(item => {
array.push(item.partCode) array.push(item.itemCode)
if(!item.partCode || item.partCode.length <= 0 || !item.qty || item.qty.length <= 0 || Number(item.qty) == 0){ if(!item.itemCode || item.itemCode.length <= 0 || !item.qty || item.qty.length <= 0 || Number(item.qty) == 0){
_isEmpty ++ _isEmpty ++
} }
}) })
@ -269,18 +269,18 @@ export default {
}); });
}, },
detailsDataPush(data){ detailsDataPush(data){
if(data[1].prop == "partCode"){ if(data[1].prop == "itemCode"){
this.CreateFormData.details[data[3].$index].partName = data[0].name this.CreateFormData.details[data[3].$index].itemName = data[0].name
this.CreateFormData.details[data[3].$index].desc1 = data[0].desc1 this.CreateFormData.details[data[3].$index].itemDesc1 = data[0].desc1
this.CreateFormData.details[data[3].$index].desc2 = data[0].desc2 this.CreateFormData.details[data[3].$index].itemDesc2 = data[0].desc2
this.CreateFormData.details[data[3].$index].conf = data[0].configuration this.CreateFormData.details[data[3].$index].conf = data[0].configuration
} }
}, },
detailsClear(data){ detailsClear(data){
if(data[0].prop == "partCode"){ if(data[0].prop == "itemCode"){
this.CreateFormData.details[data[1].$index].partName = "" this.CreateFormData.details[data[1].$index].itemCode = ""
this.CreateFormData.details[data[1].$index].desc1 = "" this.CreateFormData.details[data[1].$index].itemDesc1 = ""
this.CreateFormData.details[data[1].$index].desc2 = "" this.CreateFormData.details[data[1].$index].itemDesc2 = ""
this.CreateFormData.details[data[1].$index].conf = "" this.CreateFormData.details[data[1].$index].conf = ""
} }
} }
@ -288,5 +288,5 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../styles/basicData.scss"; @import "@/styles/basicData.scss";
</style> </style>

106
fe/PC/src/views/kittingManage/KittingPackagingNote.vue

@ -0,0 +1,106 @@
<template>
<div class="page-box" v-loading="Loading.appMainLoading">
<tablePagination
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="tableColumns"
@rowDrop="rowDrop"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@topbutton="topbutton"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@alterResultCount="alterResultCount"
@handleSelectionChange="handleSelectionChange"
:currentPageProps="oldSkipCount"
:quicklySearchOption="quicklySearchOption"
@quicklySearchClick="quicklySearchClick"
@quicklySearchClear="quicklySearchClear"
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
>
</tablePagination>
<curren-Drawer
:title="tableColumns"
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:propsData="propsData"
:tabsDesTions="tabsDesTions"
:Butttondata="DrawerButtonData"
:dropdownTabsData="dropdownTabsData"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@drawerbutton="drawerbutton"
@close-value="closeValue"
:currenButtonData="currenButtonData"
:tableColumns="detailsTableColumns"
:totalCount="totalCountDetails"
:MaxResultCount="MaxResultCountDetails"
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
></curren-Drawer>
</div>
</template>
<script>
import { getDetailed } from "@/api/wms-api"
import { close } from "@/api/wms-job"
import { tableMixins } from "@/mixins/TableMixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
import { drawerMixins } from "@/mixins/drawerMixins"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
import { mixins } from "@/mixins/mixins"
export default {
name: "KittingPackagingNote",
mixins: [
tableMixins,
LoadingMixins,
drawerMixins,
TableHeaderMixins,
mixins,
],
data () {
let _this = this;
return {
URL: 'wms/store/KittingPackagingNote',
//
currenButtonData: [
// this.defaultImportBtn(),//
this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
// table
dropdownTabsData: [
{
label: "详情",
name: 'xq'
},
{
label: "明细",
name: 'mx'
},
{
label: "扫描明细",
name: 'depDetails',
tableColumns: 'KittingPackagingDepDetails',
functionName: 'otherDetailTab'
},
],
DrawerButtonData: [],
};
},
mounted () {
this.paging()
},
methods: {
}
};
</script>
<style lang="scss" scoped>
@import "@/styles/mainbasicData.scss";
</style>

0
fe/PC/src/views/basicData/chassisManage/chassisList.vue → fe/PC/src/views/kittingManage/chassisManage/chassisList.vue

0
fe/PC/src/views/basicData/chassisManage/chassisOperationSequence.vue → fe/PC/src/views/kittingManage/chassisManage/chassisOperationSequence.vue

2
fe/PC/src/views/systemManage/pageLock.vue

@ -74,7 +74,7 @@ export default {
], ],
data() { data() {
return { return {
URL: "auth/page-lock", URL: "auth/auth/page-lock",
// //
currenButtonData: [ currenButtonData: [
// this.defaultImportBtn(),// // this.defaultImportBtn(),//

Loading…
Cancel
Save