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

【nev-pc】字段+非生产领退料

ag_report_nev
安虹睿 7 months ago
parent
0eeeab8be0
commit
0d09248a9d
19 changed files with 656 additions and 231 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/components/tablePagination/index.vue
  2. 2
      fe/PC/src/components/umyTable/index.vue
  3. 17
      fe/PC/src/router/index.js
  4. 89
      fe/PC/src/utils/detailsTableColumns/index.js
  5. 78
      fe/PC/src/utils/processButtonData.js
  6. 4
      fe/PC/src/utils/summaryTableColumns/index.js
  7. 216
      fe/PC/src/utils/tableColumns/index.js
  8. 195
      fe/PC/src/utils/tabsDesTions/index.js
  9. 2
      fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
  10. 47
      fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
  11. 74
      fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue
  12. 1
      fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue
  13. 130
      fe/PC/src/views/interfaceBoard/exchangeDataOnlyRead.vue
  14. 4
      fe/PC/src/views/inventoryManage/nonproductive/materialReturnApproval.vue
  15. 4
      fe/PC/src/views/inventoryManage/nonproductive/pickingApproval.vue
  16. 17
      fe/PC/src/views/inventoryManage/nonproductive/pickingJob.vue
  17. 1
      fe/PC/src/views/kittingManage/Kitting.vue
  18. 1
      fe/PC/src/views/kittingManage/KittingPackagingNote.vue
  19. 1
      fe/PC/src/views/kittingManage/chassisManage/chassisList.vue

4
fe/PC/src/components/tablePagination/index.vue
View File

@ -56,6 +56,10 @@
:showOverflowTooltip="showOverflowTooltip"
:tableRowClassName="tableRowClassName"
>
<!-- 最前方table插槽 -->
<template v-slot:beforeTableColumn>
<slot name="beforeTableColumn"></slot>
</template>
<template>
<slot></slot>
</template>

2
fe/PC/src/components/umyTable/index.vue
View File

@ -20,6 +20,8 @@
use-virtual
:cell-class-name="cellClassName"
>
<!-- 最前端列插槽 -->
<slot name="beforeTableColumn"></slot>
<!-- :tree-props="treeProps" 与 “height” 不能共存， 此组件暂不支持tree的格式-->
<u-table-column v-if="selectionTable" fixed="left" type="selection" :reserve-selection="true" :selectable='selectEnable'/>
<u-table-column v-if="isShowIndex" type="index" fixed="left" label="序号" width="50" />

17
fe/PC/src/router/index.js
View File

@ -142,6 +142,23 @@ export const constantRoutes = [
}
}]
},
// exchangeData批量操作页面
{
path: '/',
component: Layout,
redirect: '/exchangeDataOnlyRead',
hidden: true,
children: [{
path: 'exchangeDataOnlyRead',
component: () => import('@/views/interfaceBoard/exchangeDataOnlyRead'),
name: 'exchangeDataOnlyRead',
meta: {
keepAlive : true,
title: 'exchangeData页面数据',
icon: '系统首页',
}
}]
},
// 【平板】 登录页
{

89
fe/PC/src/utils/detailsTableColumns/index.js
View File

@ -192,7 +192,7 @@ export const InspectRequest = [
{ label: "任务单号", prop: "number" },
{ label: "计量单位", prop: 'uom' },
{ label: "备注", prop: 'remark' },
{ label: "标包数量", prop: 'stdPackQty' },
// { label: "标包数量", prop: 'stdPackQty' },//后期打开
// { label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
// { label: "生产时间", prop: 'produceDate', type: "dateTime" },
@ -252,7 +252,7 @@ export const InspectNote = [
{ label: "订单号", prop: 'poNumber' },
{ label: "订单行", prop: 'poLine' },
{ label: "计量单位", prop: 'uom' },
{ label: "标包数量", prop: 'stdPackQty' },
// { label: "标包数量", prop: 'stdPackQty' },//后期打开
// { label: "样品率", prop: 'samplePercent' },
{ label: "检验数量", prop: 'inspectQty' },
// { label: "AbcClass类别", prop: 'abcClass' },
@ -295,7 +295,7 @@ export const unqualifiedToQualifiedNote = [
// 采购上架记录
export const PutawayNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: _Names.itemName, prop: "itemName" },
// { label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
@ -307,7 +307,7 @@ export const PutawayNote = [
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "实际批次", prop: "handledLot" },
{ label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "订单行", prop: 'poLine' },
// { label: "订单行", prop: 'poLine' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" },
// { label: "数量", prop: "qty" },
@ -626,7 +626,7 @@ export const automaticCallNote = [
// 上架前退货记录
export const beforeGroundingReturnNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: _Names.itemName, prop: "itemName" },
// { label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
@ -635,7 +635,7 @@ export const beforeGroundingReturnNote = [
{ label: "批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
{ label: "库位", prop: 'locationCode' },
{ label: "库区", prop: 'locationArea' },
// { label: "库区", prop: 'locationArea' },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "退货原因代码", prop: 'reason' },
{ label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
@ -646,11 +646,11 @@ export const beforeGroundingReturnNote = [
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
// { label: "备注", prop: 'remark' },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "库位组", prop: 'locationGroup' },
// { label: "库位组", prop: 'locationGroup' },
{ label: "订单号", prop: 'poNumber' },
{ label: "订单行", prop: 'poLine' },
{ label: "推荐数量", prop: 'recommendQty' },
@ -678,7 +678,7 @@ export const beforeGroundingReturnNote = [
// 上架后退货申请
export const PurchaseReturnRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: _Names.itemName, prop: "itemName" },
// { label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
@ -984,8 +984,8 @@ export const ProductReceiptNote = [
{ label: "过期时间", prop: "expireDate" ,type:"dateTime" },
{ label: "记录编号", prop: 'number' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "生产线", prop: 'prodLine' },
{ label: "Bom版本", prop: 'bomVersion' },
// { label: "生产线", prop: 'prodLine' },
// { label: "Bom版本", prop: 'bomVersion' },
{ label: "推荐库位", prop: "recommendToLocationCode" },
{ label: "实际库位", prop: "handledToLocationCode" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
@ -1486,7 +1486,7 @@ export const productionReturnNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed:"left" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: 'qty' },
{ label: "单位", prop: 'uom' },
@ -1494,11 +1494,11 @@ export const productionReturnNote = [
{ label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number',width:orderWidth },
{ label: "备注", prop: 'remark' },
// { label: "备注", prop: 'remark' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
// { label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
{ label: "来源批次", prop: 'fromLot' },
// { label: "来源批次", prop: 'fromLot' },
{ label: "目标批次", prop: 'toLot' },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
@ -1545,9 +1545,9 @@ export const pickingRequest = [
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "领料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调出库位", prop: "locationCode" },
// { label: "批次", prop: 'lot' },
// { label: "箱码", prop: 'packingCode' },
// { label: "调出库位", prop: "locationCode" },
{ label: "调出"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
@ -1566,9 +1566,9 @@ export const pickingApproval = [
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "领料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调出库位", prop: "locationCode" },
// { label: "批次", prop: 'lot' },
// { label: "箱码", prop: 'packingCode' },
// { label: "调出库位", prop: "locationCode" },
{ label: "调出"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
@ -1584,14 +1584,11 @@ export const pickingJob = [
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "实际数量", prop: "handledQty" },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
{ label: "任务编号", prop: 'number' },
{ label: "数量", prop: "handledQty" },
{ label: _Names.handledErpCode, prop: "handledFromLocationErpCode" },
{ label: "库位", prop: 'handledFromLocationCode' },
{ label: "箱码", prop: "handledPackingCode" },
{ label: "批次", prop: "handledLot" },
// { label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" },
// { label: "单位", prop: "uom" },
// { label: "标包数量", prop: 'stdPackQty' },
@ -1684,13 +1681,14 @@ export const pickingNote = [
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调入库位", prop: "locationCode" },
{ label: "调入"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "调入储位", prop: "fromErpLocationCode" },
// { label: "调入库位", prop: "locationCode" },
// { label: "调入"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
{ label: "任务编号", prop: 'number' },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
// { label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "标包数量", prop: 'stdPackQty' },
]
@ -1705,13 +1703,14 @@ export const materialReturnApproval = [
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调入库位", prop: "locationCode" },
{ label: "调入"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "调入储位", prop: "fromErpLocationCode" },
// { label: "调入库位", prop: "locationCode" },
// { label: "调入"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
{ label: "任务编号", prop: 'number' },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
// { label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "标包数量", prop: 'stdPackQty' },
]
@ -1723,12 +1722,12 @@ export const materialReturnJob = [
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "实际数量", prop: "handledQty" },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "实际库位", prop: 'handledToLocationCode' },
{ label: _Names.handledErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
{ label: "任务编号", prop: 'number' },
// { label: "专案代码", prop: 'caseCode' },
// { label: "项目分类", prop: 'projCapacityCode' },
// { label: "任务编号", prop: 'number' },
]
// 非生产退料记录
@ -2573,8 +2572,8 @@ export const Kitting = [
{ label: _Names.itemCode, prop: 'itemCode' },
{ label: _Names.itemName, prop: 'itemName' },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "conf" },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: '数量', prop: "qty" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
@ -3031,7 +3030,7 @@ export const IssueJobBP = [
{ label: "实际目标批次", prop: 'handledToLot' },
{ label: "实际目标库位", prop: 'handledToLocationCode' },
{ label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "位置码", prop: 'positionCode' },
// { label: "位置码", prop: 'positionCode' },
]
// 备品记录
@ -3049,7 +3048,7 @@ export const IssueNoteBP = [
{ label: "实际目标批次", prop: 'handledToLot' },
{ label: "实际目标库位", prop: 'handledToLocationCode' },
{ label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "位置码", prop: 'positionCode' },
// { label: "位置码", prop: 'positionCode' },
]
// kitting请求
@ -3408,7 +3407,7 @@ export const KittingPackagingNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE" },
{ label: "数量", prop: "qty" },
{ label: "kitting代码", prop: 'kittingCode' },
{ label: "备注", prop: "remark" },

78
fe/PC/src/utils/processButtonData.js
View File

@ -110,6 +110,84 @@ export default requestDataNames;
]
}
// 非生产领退料审批使用
export function requestDataForUnplanned(that,label,initHide,noShow){
return [
{
type: 'primary',
icon: 'el-icon-circle-check',
// label: label==undefined?'提交':label,
label: changeLabelText(label,requestDataNames.submit)?changeLabelText(label,requestDataNames.submit):'提交',
name: requestDataNames.submit,
hide: () => { return hideButtonRequest(that, [1], initHide, noShow , requestDataNames.submit) },
size: 'mini'
},
{
type: 'primary',
icon: 'el-icon-circle-check',
// label: label==undefined?'审批':label,
label: changeLabelText(label,requestDataNames.agree)?changeLabelText(label,requestDataNames.agree):'审批',
name: requestDataNames.agree,
hide: () => { return hideButtonRequest(that, [2], initHide, noShow , requestDataNames.agree) },
size: 'mini'
},
{
type: 'primary',
icon: 'el-icon-circle-check',
// label: label==undefined?'处理':label,
label: changeLabelText(label,requestDataNames.handle)?changeLabelText(label,requestDataNames.handle):'处理',
name: requestDataNames.handle,
hide: () => { return hideButtonRequest(that, [4], initHide, noShow , requestDataNames.handle) },
size: 'mini'
},
{
type: 'primary',
icon: 'el-icon-circle-check',
// label: '执行',
label: changeLabelText(label,requestDataNames.againHandle)?changeLabelText(label,requestDataNames.againHandle):'执行',
name: requestDataNames.againHandle,
hide: () => { return hideButtonRequest(that, [9], initHide, noShow , requestDataNames.againHandle) },
size: 'mini'
},
// {
// type: 'danger',
// icon: 'el-icon-delete-solid',
// // label: '中止',
// label: changeLabelText(label,requestDataNames.abort)?changeLabelText(label,requestDataNames.abort):'中止',
// name: requestDataNames.abort,
// hide: () => { return hideButtonRequest(that, [5], initHide, noShow , requestDataNames.abort) },
// size: 'mini'
// },
{
type: 'danger',
icon: 'el-icon-circle-check',
// label: '驳回',
label: changeLabelText(label,requestDataNames.refuse)?changeLabelText(label,requestDataNames.refuse):'驳回',
name: requestDataNames.refuse,
hide: () => { return hideButtonRequest(that, [2], initHide, noShow , requestDataNames.refuse) },
size: 'mini'
},
{
type: 'danger',
icon: 'el-icon-delete-solid',
// label: '取消',
label: changeLabelText(label,requestDataNames.cancel)?changeLabelText(label,requestDataNames.cancel):'取消',
name: requestDataNames.cancel,
hide: () => { return hideButtonRequest(that, [1,2,4], initHide, noShow , requestDataNames.cancel) },
size: 'mini'
},
// {
// type: 'primary',
// icon: 'el-icon-circle-check',
// label: '执行完成',
// name: "completeRequest",
// hide: () => { return hideButtonRequest(that, [5]) },
// size: 'mini'
// },
]
}
//任务流程按钮
/**
* @param {*} that 主页this

4
fe/PC/src/utils/summaryTableColumns/index.js
View File

@ -27,7 +27,7 @@ export const InspectRequest = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "计量单位", prop: 'uom' },
{ label: "标包数量", prop: 'stdPackQty' },
// { label: "标包数量", prop: 'stdPackQty' },//后期打开
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
@ -71,7 +71,7 @@ export const InspectNote = [
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "订单号", prop: 'poNumber' },
{ label: "订单行", prop: 'poLine' },
{ label: "标包数量", prop: 'stdPackQty' },
// { label: "标包数量", prop: 'stdPackQty' },//后期打开
{ label: "样品率", prop: 'samplePercent' },
{ label: "破坏数量", prop: 'crackQty' },
{ label: "最终不合格数量", prop: 'notPassedQty' },

216
fe/PC/src/utils/tableColumns/index.js
View File

@ -552,7 +552,7 @@ export const ItemSafetyStock = [
fixed: "left",
type: "name"
},
{ label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
// { label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
{ label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true },
{ label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
@ -564,7 +564,7 @@ export const ItemSafetyStock = [
// { label: "补料点", prop: "feedLine" },
// { label: "补料数量", prop: "feedQty",isNumber:true },
// { label: "补料单位", prop: "feedUM" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -631,7 +631,7 @@ export const ProductionLine = [
{ label: "生产线名称", prop: 'name' },
{ label: "生产线类型", prop: "productionLineType", type: "filter", filters: "productionLineType" },
{ label: "生产库位代码", prop: "locationCode" },
{ label: _Public.description, prop: "description" },
// { label: _Public.description, prop: "description" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -646,7 +646,7 @@ export const ProductionLineItem = [
{ label: "[来源]成品/半成品库位", prop: "productLocationCodeListJson", type:"showDetail", isJson:true,showProp:true,width:'180px'},
{ label: "[来源]原材料库位", prop: "rawLocationCodeListJson", type:"showDetail", isJson:true,showProp:true },
{ label: "[完工]线边库位", prop: "wipLocationCodeListJson", type:"showDetail", isJson:true,showProp:true },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -717,7 +717,7 @@ export const ItemGuideBook = [
{ label: _Names.itemDesc2, prop: "desc2" },
{ label: "步骤", prop: "step" },
{ label: "图片存储名称", prop: "pictureBlobName" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -766,12 +766,12 @@ export const StdCostPriceSheet = [
prop: "itemCode",
width:"200px"
},
{ label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
// { label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
{ label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true },
{ label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "标准成本价格", prop: "stdCostPrice",type:"price" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -785,14 +785,14 @@ export const PurchasePriceSheet = [
prop: "itemCode",
width:"200px"
},
{ label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
// { label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
{ label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true },
{ label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "供应商编号", prop: "supplierCode" },
{ label: "采购价格", prop: "purchasePrice",type:"price" },
{ label: "价格单描述", prop: "description" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -806,14 +806,14 @@ export const SalePriceSheet = [
prop: "itemCode",
width:"200px"
},
{ label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
// { label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
{ label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true },
{ label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "客户代码", prop: "customerCode" },
{ label: "销售价格", prop: "salePrice",type:"price" },
{ label: "价格单描述", prop: "description" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -1265,17 +1265,16 @@ export const InspectNote = [
// { label: "筹措员代码", prop: "worker" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
// { label: "备注", prop: 'remark' },
{ label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" },
]
// 不合格库存（不合格转合格）
export const unqualifiedToQualified = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
// { label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty",isNumber:true },
@ -1283,11 +1282,12 @@ export const unqualifiedToQualified = [
{ label: "批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
{ label: "库位", prop: 'locationCode' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "入库时间", prop: 'putInTime',type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
// { label: "备注", prop: 'remark' },
// { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "标包数量", prop: "stdPackQty",isNumber:true },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货日期", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
@ -1298,9 +1298,9 @@ export const unqualifiedToQualified = [
// { label: "最后盘点时间", prop: 'lastCountTime' },
// { label: "最后盘点计划", prop: 'lastCountPlanNumber' },
// { label: "最后盘点标签", prop: 'lastCountLabel' },
{ label: "是否可用", prop: 'isActive' },
// { label: "是否可用", prop: 'isActive' },
// { label: "最后事务号", prop: 'lastTransNumber' },
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
// { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
]
// 不合格转合格记录
@ -1314,9 +1314,9 @@ export const unqualifiedToQualifiedNote = [
},
{ label: "原因", prop: 'remark' },
{ label: "操作员", prop: "worker" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
// 采购上架记录
@ -1335,8 +1335,8 @@ export const PutawayNote = [
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "供应商代码", prop: 'supplierCode' },
{ label: "供应商名称", prop: 'supplierName',showProp:true },
{ label: "操作员", prop: 'worker' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "操作员", prop: 'worker' },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
// { label: "检验单号", prop: 'inspectNumber' },
// { label: "收货单号", prop: 'receiptNumber' },
@ -1537,7 +1537,7 @@ export const PurchaseReturnRequest = [
{ label: "操作员", prop: "worker" },
// { label: "备注", prop: 'remark' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "收货单号", prop: 'rpNumber' },
]
@ -1696,7 +1696,7 @@ export const ProductReceiptNote = [
},
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate',type: "dateTime" },
// { label: "生效日期", prop: 'activeDate',type: "dateTime" },
{ label: "完工时间", prop: 'completeTime',type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
@ -1831,6 +1831,7 @@ export const DeliverNote = [
// FIS发货申请
export const FISDeliverRequest = [
// { label: "器具号", prop: "mesTruckNumber" },
{
label: "发货申请单号",
prop: "number",
@ -1843,10 +1844,10 @@ export const FISDeliverRequest = [
{ label: "车牌号", prop: 'mesTruckNumber' },
{ label: "操作员", prop: 'worker' },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "发货时间", prop: "deliverTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
// 成品发运任务
@ -1884,11 +1885,11 @@ export const FISDeliverNote = [
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "车牌号", prop: 'mesTruckNumber' },
{ label: "发货申请单号", prop: "deliverRequestNumber",width:orderWidth },
{ label: "发货时间", prop: "deliverTime",type: "dateTime" },
// { label: "发货时间", prop: "deliverTime",type: "dateTime" },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" },
{ label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
{ label: "操作员", prop: 'worker' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
@ -2025,9 +2026,9 @@ export const productionReturnNote = [
fixed: "left",
width: orderWidth
},
{ label: "退库单号", prop: "productionReturnRequestNumber", width:orderWidth },
{ label: "任务单号", prop: 'jobNumber', width:orderWidth },
{ label: "备注", prop: 'remark' },
// { label: "退库单号", prop: "productionReturnRequestNumber", width:orderWidth },
// { label: "任务单号", prop: 'jobNumber', width:orderWidth },
// { label: "备注", prop: 'remark' },
{ label: "操作员", prop: 'worker' },
// { label: "退料时间", prop: 'returnTime', type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
@ -2117,8 +2118,8 @@ export const labelsList = [
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "备注", prop: "remark",type: "filter", filters: "getDict", dictType:"ProductionReturnReason"},
{ label: "到达时间", prop: "arriveDate",type:"dateTime" },
// { label: "备注", prop: "remark",type: "filter", filters: "getDict", dictType:"ProductionReturnReason"},
// { label: "到达时间", prop: "arriveDate",type:"dateTime" },
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
{ label: "采购单号", prop: "asnNumber",width:orderWidth },
@ -2127,8 +2128,8 @@ export const labelsList = [
{ label: "供应商代码", prop: 'supplierCode' },
{ label: "供应商名称", prop: 'supplierName' },
{ label: "供应商简称", prop: 'supplierSimpleName' },
{ label: "供应商物品代码", prop: "supplierItemCode" },
{ label: "供应商物品名称", prop: 'supplierItemName' },
// { label: "供应商物品代码", prop: "supplierItemCode" },//后期打开
// { label: "供应商物品名称", prop: 'supplierItemName' },//后期打开
// { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" },
{ label: "完整条码文本", prop: "fullBarcodeString" },
{ label: "供应商批次", prop: 'supplierBatch' },
@ -2438,7 +2439,7 @@ export const splitPackingList = [
fixed: "left",
type: "name"
},
{ label: _Names.itemName, prop: "itemName" },
// { label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "原箱箱码", prop: "fromPackingCode" },
@ -2450,7 +2451,7 @@ export const splitPackingList = [
{ label: "原标包数量", prop: "fromStdPackQty",isNumber:true },
{ label: "目标标包数量", prop: "toStdPackQty",isNumber:true },
{ label: "原批次", prop: "fromLot" },
{ label: "方式", prop: "oprType", type: "filter", filters: "oprTypeStatus" },
// { label: "方式", prop: "oprType", type: "filter", filters: "oprTypeStatus" },
{ label: "采购订单", prop: "purchaseInfo_PoNumber" },
{ label: "供应商发货单", prop: "purchaseInfo_AsnNumber" },
{ label: "创建时间", prop: 'creationTime', type:'dateTime' },
@ -2466,7 +2467,7 @@ export const pickingRequest = [
width: orderWidth
},
{ label: "OA单号", prop: "oaNumber" },
{ label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
// { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: "状态", prop: 'requestStatus',type: "tagFilter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
@ -2488,7 +2489,7 @@ export const pickingApproval = [
width: orderWidth
},
{ label: "OA单号", prop: "oaNumber" },
{ label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
// { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: "状态", prop: 'requestStatus',type: "tagFilter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
@ -2512,7 +2513,11 @@ export const pickingJob = [
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "申请单号", prop: "unplannedIssueRequestNumber" },
{ label: "OA单号", prop: "oaNumber" },
{ label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
// { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
@ -2523,6 +2528,19 @@ export const pickingJob = [
{ label: "完成用户", prop: "completeUserName" },
]
// 非生产领料任务 - 推荐明细
export const pickingJobFacDetails = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "recommendQty" },
{ label: _Names.recommendErpCode, prop: "recommendFromLocationErpCode" },
{ label: "库位", prop: 'recommendFromLocationCode' },
{ label: "箱码", prop: "recommendPackingCode" },
{ label: "批次", prop: "recommendLot" },
]
// 非生产领料记录
export const pickingNote = [
{
@ -2533,12 +2551,16 @@ export const pickingNote = [
width: orderWidth
},
{ label: "OA单号", prop: "oaNumber" },
{ label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
// { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "请求单号", prop: 'unplannedIssueRequestNumber',width: orderWidth},
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// { label: "部门代码", prop: "deptCode" },
// { label: "部门名称", prop: "deptName" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
@ -2555,7 +2577,7 @@ export const materialReturnRequest = [
width: orderWidth
},
{ label: "OA单号", prop: "oaNumber" },
{ label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
// { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
@ -2577,7 +2599,7 @@ export const materialReturnApproval = [
width: orderWidth
},
{ label: "OA单号", prop: "oaNumber" },
{ label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
// { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
@ -2598,16 +2620,23 @@ export const materialReturnJob = [
type: "name",
width: orderWidth
},
{ label: "OA单号", prop: "oaNumber" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "申请单号", prop: "unplannedReceiptRequestNumber" },
{ label: "OA单号", prop: "oaNumber" },
{ label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "调入储位", prop: "fromErpLocationCode" },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
// { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
// { label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "完成时间", prop: "completeTime",type: "dateTime" },
{ label: "完成用户", prop: "completeUserName" },
]
@ -2622,16 +2651,18 @@ export const materialReturnNote = [
width: orderWidth
},
{ label: "OA单号", prop: "oaNumber" },
{ label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
// { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "请求单号", prop: 'unplannedReceiptRequestNumber',width: orderWidth },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// { label: "部门代码", prop: "deptCode" },
// { label: "部门名称", prop: "deptName" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
]
// 回收料收货记录
@ -3280,6 +3311,25 @@ export const exchangeDataMaintenancePage = [
{ label: _Names.tenantId, prop: "tenantId" },
]
// exchangeData页面数据
export const exchangeDataOnlyRead = [
{ label: _Public.id, prop: "id" },
{ label: 'tyrpNumber', prop: "tyrpNumber" },
{ label: _Dashboard.dataAction, prop: "dataAction"},
{ label: _Dashboard.dataContent, prop: "dataContent", type:"showJsonTable" },
{ label: _Dashboard.dataIdentityCode, prop: "dataIdentityCode" },
{ label: _Dashboard.dataType, prop: "dataType", type:"showDetail",showProp:true },
{ label: _Dashboard.destinationSystem, prop: "destinationSystem", type:"showDetail" ,showProp:true},
{ label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' },
{ label: _Dashboard.sourceSystem, prop: "sourceSystem" },
{ label: _Public.remark, prop: "remark", type:"showDetail" ,showProp:true},
{ label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
{ label: _Public.creatorId, prop: "creatorId" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime",type:'dateTime' },
{ label: _Public.lastModifierId, prop: "lastModifierId" },
{ label: _Names.tenantId, prop: "tenantId" },
]
// 器具
export const Utensil = [
{
@ -3308,7 +3358,7 @@ export const Kitting = [
{ label: '底盘打包数量', prop: 'chassisQty' },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
]
// 空器具呼叫任务
@ -3402,7 +3452,7 @@ export const IssueJobZS = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "injectionRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
// { label: "要货单号", prop: 'kittingRequestNumber'},
@ -3427,8 +3477,8 @@ export const IssueNoteZS = [
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 喷涂申请
@ -3447,7 +3497,7 @@ export const IssueJobPT = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "coatingRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
@ -3469,8 +3519,8 @@ export const IssueNotePT = [
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 装配申请
@ -3489,7 +3539,7 @@ export const IssueJobZP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "assembleRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
@ -3498,8 +3548,8 @@ export const IssueJobZP = [
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "创建时间", prop: 'creationTime', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 装配记录
@ -3511,8 +3561,8 @@ export const IssueNoteZP = [
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 备品申请
@ -3531,7 +3581,7 @@ export const IssueJobBP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "sparePartRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
@ -3553,8 +3603,8 @@ export const IssueNoteBP = [
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// kitting请求
@ -3572,7 +3622,7 @@ export const KittingIssueRequest = [
export const KittingIssueJob = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "kittingRequestNumber" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
@ -3596,8 +3646,8 @@ export const KittingIssueNote = [
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 业务库移申请
@ -3712,9 +3762,9 @@ export const chassisList = [
type: "name"
},
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
// { label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "item_desc1FromFE" },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE" },
{ label: "Wms编号", prop: 'number' },
{ label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" },
{ label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" },
@ -3749,11 +3799,11 @@ export const KittingPackagingNote = [
type: "name"
},
{ label: "kitting代码", prop: 'kittingCode' },
{ label: "备注", prop: "remark" },
// { label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// kitting打包记录 - 扫描明细
@ -3765,9 +3815,9 @@ export const KittingPackagingDepDetails = [
{ label: "底盘号", prop: "chassisNumber" },
{ label: "底盘号排序序列", prop: "chassisSortNumber" },
{ label: "kitting代码", prop: 'kittingCode' },
{ label: "备注", prop: "remark" },
// { label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 【pad】业务库移

195
fe/PC/src/utils/tabsDesTions/index.js
View File

@ -388,7 +388,7 @@ export const InventoryLocationCapacity = [
// 物品安全库存信息
export const ItemSafetyStock = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "item_nameFromFE" },
// { label: _Names.itemName, prop: "item_nameFromFE" },
{ label: _Names.itemDesc1, prop: "item_desc1FromFE" },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
@ -397,7 +397,7 @@ export const ItemSafetyStock = [
{ label: "最大库存", prop: "maxStock" },
{ label: "最小库存", prop: "minStock" },
{ label: "安全库存", prop: "safetyStock" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -451,7 +451,7 @@ export const ProductionLine = [
{ label: "生产线名称", prop: 'name' },
{ label: "生产线类型", prop: "productionLineType", type: "filter", filters: "productionLineType" },
{ label: "生产库位代码", prop: "locationCode" },
{ label: _Public.description, prop: "description" },
// { label: _Public.description, prop: "description" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -466,7 +466,7 @@ export const ProductionLineItem = [
{ label: "[来源]成品/半成品库位", prop: "productLocationCodeListJson", type:"json" },
{ label: "[来源]原材料库位", prop: "rawLocationCodeListJson", type:"json" },
{ label: "[完工]线边库位", prop: "wipLocationCodeListJson", type:"json" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -517,7 +517,7 @@ export const ItemGuideBook = [
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "步骤", prop: "step" },
{ label: "图片存储名称", prop: "pictureBlobName" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -550,12 +550,12 @@ export const Dict = [
// 标准成本价格单
export const StdCostPriceSheet = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "item_nameFromFE" },
// { label: _Names.itemName, prop: "item_nameFromFE" },
{ label: _Names.itemDesc1, prop: "item_desc1FromFE" },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "标准成本价格", prop: "stdCostPrice",type:"price" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -563,14 +563,14 @@ export const StdCostPriceSheet = [
// 采购价格单
export const PurchasePriceSheet = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "item_nameFromFE" },
// { label: _Names.itemName, prop: "item_nameFromFE" },
{ label: _Names.itemDesc1, prop: "item_desc1FromFE" },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "供应商编号", prop: "supplierCode" },
{ label: "采购价格", prop: "purchasePrice",type:"price" },
{ label: "价格单描述", prop: "description" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -578,14 +578,14 @@ export const PurchasePriceSheet = [
// 销售价格单
export const SalePriceSheet = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "item_nameFromFE" },
// { label: _Names.itemName, prop: "item_nameFromFE" },
{ label: _Names.itemDesc1, prop: "item_desc1FromFE" },
{ label: _Names.itemDesc2, prop: "item_desc2FromFE" },
{ label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "客户代码", prop: "customerCode" },
{ label: "销售价格", prop: "salePrice",type:"price" },
{ label: "价格单描述", prop: "description" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -783,9 +783,9 @@ export const InspectNote = [
{ label: "收货单号", prop: "receiptNumber" },
{ label: "供应商代码", prop: "supplierCode" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "要货计划单号", prop: 'rpNumber' },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
]
// 不合格转合格记录
@ -793,9 +793,9 @@ export const unqualifiedToQualifiedNote = [
{ label: "转合格单号", prop: "number" },
{ label: "原因", prop: 'remark' },
{ label: "操作员", prop: "worker" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
// 采购上架记录
@ -803,9 +803,9 @@ export const PutawayNote = [
{ label: "上架记录单号", prop: 'number' },
{ label: "供应商代码", prop: 'supplierCode' },
{ label: "供应商名称", prop: 'supplierName',showProp:true },
{ label: "操作员", prop: 'worker' },
// { label: "操作员", prop: 'worker' },
// { label: "备注", prop: 'remark' },//目前用来区分是否打印进行颜色区分，所以隐藏字段
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
@ -959,7 +959,7 @@ export const PurchaseReturnRequest = [
{ label: "退货时间", prop: "returnTime", type:"dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
]
// 上架后退货审批
@ -1069,7 +1069,7 @@ export const ProductReceiptNote = [
{ label: "缴库记录单号", prop: 'number' },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate',type: "dateTime" },
// { label: "生效日期", prop: 'activeDate',type: "dateTime" },
{ label: "完工时间", prop: 'completeTime',type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
@ -1184,10 +1184,10 @@ export const FISDeliverRequest = [
{ label: "车牌号", prop: 'mesTruckNumber' },
{ label: "操作员", prop: 'worker' },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType",showProp:true },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "发货时间", prop: "deliverTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
// 成品发运任务
@ -1217,11 +1217,11 @@ export const FISDeliverNote = [
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "车牌号", prop: 'mesTruckNumber' },
{ label: "发货申请单号", prop: "deliverRequestNumber" },
{ label: "发货时间", prop: "deliverTime",type: "dateTime" },
// { label: "发货时间", prop: "deliverTime",type: "dateTime" },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" },
{ label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
{ label: "操作员", prop: 'worker' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
@ -1325,9 +1325,9 @@ export const productionReturnJob = [
// 生产退库记录
export const productionReturnNote = [
{ label: "退库记录单号", prop: "number" },
{ label: "退库单号", prop: "productionReturnRequestNumber" },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "备注", prop: 'remark' },
// { label: "退库单号", prop: "productionReturnRequestNumber" },
// { label: "任务单号", prop: 'jobNumber' },
// { label: "备注", prop: 'remark' },
{ label: "操作员", prop: 'worker' },
// { label: "退料时间", prop: 'returnTime', type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
@ -1349,8 +1349,8 @@ export const labelsList = [
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "备注", prop: "remark",type: "filter", filters: "getDict", dictType:"ProductionReturnReason"},
{ label: "到达时间", prop: "arriveDate",type:"dateTime" },
// { label: "备注", prop: "remark",type: "filter", filters: "getDict", dictType:"ProductionReturnReason"},
// { label: "到达时间", prop: "arriveDate",type:"dateTime" },
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
{ label: "采购单号", prop: "asnNumber" },
@ -1358,8 +1358,8 @@ export const labelsList = [
{ label: "供应商代码", prop: 'supplierCode' },
{ label: "供应商名称", prop: 'supplierName' },
{ label: "供应商简称", prop: 'supplierSimpleName' },
{ label: "供应商物品代码", prop: "supplierItemCode" },
{ label: "供应商物品名称", prop: 'supplierItemName' },
// { label: "供应商物品代码", prop: "supplierItemCode" },//后期打开
// { label: "供应商物品名称", prop: 'supplierItemName' },//后期打开
{ label: "完整条码文本", prop: "fullBarcodeString" },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "标包数量", prop: 'stdPackQty',isNumber:true },
@ -1629,7 +1629,7 @@ export const splitPackingList = [
fixed: "left",
type: "name"
},
{ label: _Names.itemName, prop: "itemName" },
// { label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "原箱箱码", prop: "fromPackingCode" },
@ -1641,7 +1641,7 @@ export const splitPackingList = [
{ label: "原标包数量", prop: "fromStdPackQty",isNumber:true },
{ label: "目标标包数量", prop: "toStdPackQty",isNumber:true },
{ label: "原批次", prop: "fromLot" },
{ label: "方式", prop: "oprType", type: "filter", filters: "oprTypeStatus" },
// { label: "方式", prop: "oprType", type: "filter", filters: "oprTypeStatus" },
{ label: "采购订单", prop: "purchaseInfo_PoNumber" },
{ label: "供应商发货单", prop: "purchaseInfo_AsnNumber" },
{ label: "创建时间", prop: 'creationTime', type:'dateTime' },
@ -1651,40 +1651,32 @@ export const splitPackingList = [
export const pickingRequest = [
{ label: "领料单号码", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
{ label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
// { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: "状态", prop: 'requestStatus',type: "filter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
{ label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
]
// 非生产领料审批
export const pickingApproval = [
{ label: "领料单号码", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
{ label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
// { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: "状态", prop: 'requestStatus',type: "filter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
{ label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
]
// 非生产领料任务
@ -1698,7 +1690,11 @@ export const pickingJob = [
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "申请单号", prop: "unplannedIssueRequestNumber" },
{ label: "OA单号", prop: "oaNumber" },
{ label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
// { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
@ -1713,22 +1709,28 @@ export const pickingJob = [
export const pickingNote = [
{ label: "领料记录单号", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
// { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "请求单号", prop: 'unplannedIssueRequestNumber' },
{ label: "请求单号", prop: 'unplannedIssueRequestNumber'},
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
{ label: "备注", prop: 'remark' },
// { label: "部门代码", prop: "deptCode" },
// { label: "部门名称", prop: "deptName" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
]
// 非生产退料申请
export const materialReturnRequest = [
{ label: "退料单号", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
{ label: "状态", prop: 'requestStatus',type: "filter", filters: "requestStatus" },
// { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
@ -1736,11 +1738,6 @@ export const materialReturnRequest = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
{ label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
]
@ -1748,7 +1745,8 @@ export const materialReturnRequest = [
export const materialReturnApproval = [
{ label: "退料单号", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
{ label: "状态", prop: 'requestStatus',type: "filter", filters: "requestStatus" },
// { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
@ -1756,11 +1754,6 @@ export const materialReturnApproval = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
{ label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
]
@ -1772,16 +1765,23 @@ export const materialReturnJob = [
fixed: "left",
type: "name",
},
{ label: "OA单号", prop: "oaNumber" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "申请单号", prop: "unplannedReceiptRequestNumber" },
{ label: "OA单号", prop: "oaNumber" },
{ label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "调入储位", prop: "fromErpLocationCode" },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
// { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
// { label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "完成时间", prop: "completeTime",type: "dateTime" },
{ label: "完成用户", prop: "completeUserName" },
]
@ -1790,15 +1790,18 @@ export const materialReturnJob = [
export const materialReturnNote = [
{ label: "退料记录单号", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
// { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "请求单号", prop: 'unplannedReceiptRequestNumber' },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// { label: "部门代码", prop: "deptCode" },
// { label: "部门名称", prop: "deptName" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
]
// 回收料收货记录
@ -2146,7 +2149,7 @@ export const Kitting = [
{ label: '底盘打包数量', prop: 'chassisQty' },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
{ label: _Public.remark, prop: "remark" },
// { label: _Public.remark, prop: "remark" },
]
// 空器具呼叫任务
@ -2214,7 +2217,7 @@ export const IssueJobZS = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "injectionRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
// { label: "要货单号", prop: 'kittingRequestNumber'},
@ -2239,8 +2242,8 @@ export const IssueNoteZS = [
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 喷涂申请
@ -2262,7 +2265,7 @@ export const IssueJobPT = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "coatingRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
@ -2284,8 +2287,8 @@ export const IssueNotePT = [
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 装配申请
@ -2304,7 +2307,7 @@ export const IssueJobZP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "assembleRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
@ -2326,8 +2329,8 @@ export const IssueNoteZP = [
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 备品申请
@ -2346,7 +2349,7 @@ export const IssueJobBP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "sparePartRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
@ -2368,8 +2371,8 @@ export const IssueNoteBP = [
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// kitting请求
@ -2388,7 +2391,7 @@ export const KittingIssueJob = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "kittingRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
@ -2411,8 +2414,8 @@ export const KittingIssueNote = [
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 业务库移申请
@ -2470,7 +2473,7 @@ export const ThirdLocationRequest = [
export const ThirdLocationJob = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
@ -2525,7 +2528,7 @@ export const chassisList = [
type: "name"
},
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "itemName" },
// { label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "Wms编号", prop: 'number' },
@ -2562,11 +2565,11 @@ export const KittingPackagingNote = [
type: "name"
},
{ label: "kitting代码", prop: 'kittingCode' },
{ label: "备注", prop: "remark" },
// { label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 【pad】业务库移

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

@ -171,7 +171,7 @@ export default {
editForm: [
{ type: "input",label: _Names.itemCode, prop: "itemCode",disabled:"true", colSpan: 12 },
{ type: "input", label: "物品名称", prop: "name", colSpan: 12,disabled:"true", },
{ type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code",
{ type: "filterSelect", label: "供应商代码", disabled:"true",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 },
{ type: "select", label: "状态", prop: "status", options: "openToClose", colSpan: 12 },

47
fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
View File

@ -23,6 +23,33 @@
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
>
<template v-slot:beforeTableColumn>
<u-table-column type="expand">
<template slot-scope="props">
<el-table
maxHeight="300px"
:data="tableData2"
:border="true"
style="width: 100%">
<el-table-column
prop="date"
label="日期"
width="230">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
width="180">
</el-table-column>
<el-table-column
prop="address"
width="260"
label="地址">
</el-table-column>
</el-table>
</template>
</u-table-column>
</template>
</tablePagination>
<curren-Drawer
:title="tableColumns"
@ -69,6 +96,23 @@ export default {
],
data () {
return {
tableData2: [{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
}, {
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
}, {
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
}],
URL: 'wms/store/deliver-note',
//常用按钮数据
currenButtonData: [
@ -225,4 +269,7 @@ export default {
</script>
<style lang="scss" scoped>
@import "../../../styles/basicData.scss";
// ::v-deep .el-table__expanded-cell{
// padding:10px !important
// }
</style>

74
fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue
View File

@ -25,6 +25,48 @@
:httpOverallSearchData="httpOverallSearchData"
:tableSelection="true"
>
<template v-slot:beforeTableColumn>
<u-table-column type="expand" fixed="left">
<template slot-scope="props">
<el-table
maxHeight="300px"
:data="tableData2"
:border="true"
style="width: 100%">
<el-table-column
prop="code"
label="ERP料号"
width="180">
</el-table-column>
<el-table-column
prop="date"
label="日期"
width="230">
</el-table-column>
<el-table-column
prop="qty"
width="260"
label="数量">
</el-table-column>
<el-table-column
prop="number"
width="260"
label="底盘号">
</el-table-column>
<el-table-column
prop="chkw"
width="260"
label="出货库位">
</el-table-column>
<el-table-column
prop="chkw2"
width="260"
label="出货ERP储位">
</el-table-column>
</el-table>
</template>
</u-table-column>
</template>
</tablePagination>
<!--抽屉-->
<curren-Drawer
@ -120,6 +162,35 @@ export default {
},
data () {
return {
tableData2: [{
code:'CA130D0A012AA',
date: '2016-05-02',
qty: '20',
number: '111',
chkw:'WIP',
chkw2:'WIP'
},{
code:'CA130D0A013AA',
date: '2016-05-02',
qty: '5',
number: '222',
chkw:'WIP',
chkw2:'WIP'
},{
code:'CA130D0A013AA',
date: '2016-05-02',
qty: '15',
number: '333',
chkw:'WIP',
chkw2:'WIP'
},{
code:'CA130D0A013AA',
date: '2016-05-02',
qty: '12',
number: '444',
chkw:'WIP',
chkw2:'WIP'
},],
URL: 'wms/store/deliver-request-fis',
importUploadURL:'wms/store/deliver-request/import',
//常用按钮数据
@ -375,4 +446,7 @@ export default {
</script>
<style lang="scss" scoped>
@import "../../../styles/mainbasicData.scss";
::v-deep .el-table__expanded-cell{
padding:20px 120px !important
}
</style>

1
fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue
View File

@ -60,6 +60,7 @@ export default {
],
data () {
return {
showDetailBaseFromFE:['configuration','desc2'],
URL: 'wms/store/production-return-note',
//常用按钮数据
currenButtonData: [

130
fe/PC/src/views/interfaceBoard/exchangeDataOnlyRead.vue
View File

@ -0,0 +1,130 @@
<template>
<div class="page-box" v-loading="Loading.appMainLoading">
<tablePagination
ref="pageTable"
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="tableColumns"
@rowDrop="rowDrop"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@topbutton="topbuttonHandle"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@alterResultCount="alterResultCount"
@handleSelectionChange="handleSelectionChange"
:currentPageProps="oldSkipCount"
:quicklySearchOption="quicklySearchOption"
@quicklySearchClick="quicklySearchClick"
@quicklySearchClear="quicklySearchClear"
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
:tableSelection="true"
>
</tablePagination>
</div>
</template>
<script>
import { tableMixins } from "@/mixins/TableMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { mixins } from "@/mixins/mixins";
import { exchangeDataResendById } from "@/api/wms-api"
export default {
name: "exchangeDataOnlyRead",
mixins: [
tableMixins,
LoadingMixins,
TableHeaderMixins,
mixins,
],
data() {
return {
URL: 'wms/store/exchange-data',
//常用按钮数据
currenButtonData: [
this.defaultFieldSettingBtn(),//字段设置
this.defaultFreshBtn(),//刷新
this.defaultFilterBtn(),//筛选
// {
// type: "primary",
// icon: "el-icon-refresh",
// label: "批量重发",
// name: "resend",
// size: "mini",
// }
],
selectData:null,//已选数据
};
},
mounted() {
this.paging();
},
methods: {
handleSelectionChange(val){
this.selectData = val
},
topbuttonHandle(val,item){
if(val == 'resend'){
if(this.selectData && this.selectData.length > 0){
let _numbers = ''
this.selectData.forEach(item=>{
_numbers += item.id + ',<br/>'
})
this.$confirm(`已选${this.selectData.length}条数据，是否确定重发? 重发数据id为:<br/>${_numbers}`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
distinguishCancelAndClose: true,
closeOnClickModal: false,
type: 'warning',
dangerouslyUseHTMLString: true
}).then(() => {
this.Loading.appMainLoading = true
this.resendHandle(0)
})
}else{
this.$warningMsg('请选择数据')
}
}else{
this.topbutton(val,item)
}
},
// 递归处理
async resendHandle(index){
if(index >= this.selectData.length){
this.Loading.appMainLoading = false
this.$successMsg("全部数据（共"+ this.selectData.length +"条）重发成功！")
this.$refs.pageTable.clearSelection();
return
}
let _resultBack = await this.resendApiHandle(this.selectData[index].id)
//如果成功了，继续发送
if(_resultBack == 1){
let _index = Number(index) + 1
this.resendHandle(_index)
}
//失败了提示不进行任何处理
else{
this.Loading.appMainLoading = false
this.$errorMsg(`${this.selectData[index].id} 重发失败`)
}
},
// api返回值转换（1成功 0失败）
async resendApiHandle(id){
let resultBack = null
await exchangeDataResendById(id)
.then(res=>{ resultBack = 1 })
.catch(err=>{ resultBack = 0 })
return resultBack
},
}
};
</script>
<style lang="scss" scoped>
@import "@/styles/basicData.scss";
</style>

4
fe/PC/src/views/inventoryManage/nonproductive/materialReturnApproval.vue
View File

@ -49,7 +49,7 @@ import { LoadingMixins } from "@/mixins/LoadingMixins"
import { drawerMixins } from "@/mixins/drawerMixins"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
import { mixins } from "@/mixins/mixins"
import { requestData } from '@/utils/processButtonData'
import { requestDataForUnplanned } from '@/utils/processButtonData'
export default {
name: "materialReturnApproval",
mixins: [
@ -87,7 +87,7 @@ export default {
this.defaultFilterBtn(),//筛选
],
DrawerButtonData: [
...requestData(this)
...requestDataForUnplanned(this)
]
};
},

4
fe/PC/src/views/inventoryManage/nonproductive/pickingApproval.vue
View File

@ -49,7 +49,7 @@ import { LoadingMixins } from "@/mixins/LoadingMixins"
import { drawerMixins } from "@/mixins/drawerMixins"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
import { mixins } from "@/mixins/mixins"
import { requestData } from '@/utils/processButtonData'
import { requestDataForUnplanned } from '@/utils/processButtonData'
export default {
name: "pickingApproval",
mixins: [
@ -87,7 +87,7 @@ export default {
this.defaultFilterBtn(),//筛选
],
DrawerButtonData: [
...requestData(this)
...requestDataForUnplanned(this)
]
};
},

17
fe/PC/src/views/inventoryManage/nonproductive/pickingJob.vue
View File

@ -40,6 +40,7 @@
:MaxResultCount="MaxResultCountDetails"
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
:dropdownTabsData="dropdownTabsData"
></curren-Drawer>
</div>
</template>
@ -86,6 +87,22 @@ export default {
this.defaultFreshBtn(),//刷新
this.defaultFilterBtn(),//筛选
],
dropdownTabsData: [
{
label: "详情",
name: 'xq'
},
{
label: "推荐明细",
name: 'facDetails',
tableColumns: 'pickingJobFacDetails',
functionName: 'otherDetailTab'
},
{
label: "实际明细",
name: 'mx'
},
],
};
},
mounted () {

1
fe/PC/src/views/kittingManage/Kitting.vue
View File

@ -125,6 +125,7 @@ export default {
},
data () {
return {
// showDetailBaseFromFE:['configuration','desc2'],
URL: 'basedata/kitting',
//常用按钮数据
currenButtonData: [

1
fe/PC/src/views/kittingManage/KittingPackagingNote.vue
View File

@ -64,6 +64,7 @@
data () {
let _this = this;
return {
showDetailBaseFromFE:['configuration','desc2'],
URL: 'wms/store/KittingPackagingNote',
//常用按钮数据
currenButtonData: [

1
fe/PC/src/views/kittingManage/chassisManage/chassisList.vue
View File

@ -63,6 +63,7 @@
data () {
let _this = this;
return {
showTableBaseFromFE:['desc1','desc2'],
URL: 'wms/store/Chassis',
//常用按钮数据
currenButtonData: [

Write Preview
Loading…
Cancel
Save