+
+
{{item.buttonName || item.label}}
+ @click="buttonOperationClick(scope.row, item.buttonName.split('|')[indexButton])"
+ >{{itemButton}}
-
-
-
-
- {{itemButton}}
-
-
- {{ scope.row[item.prop] ? scope.row[item.prop][item.showProp] : "" }}
-
-
- {{ scope.row[item.prop]? scope.row[item.prop][item.showProp]: "" | formatDate }}
-
-
- {{ scope.row[item.prop] | formatDate }}
-
-
-
- {{ propsData[item.showProp] }}
-
-
- {{ scope.row[item.prop] | trigger(item.filters, "label") }}
-
-
- {{ scope.row[item.prop] | trigger(item.filters, "label", item.dictType) }}
-
-
- {{ scope.row[item.prop][item.showProp] | trigger(item.filters, "label") }}
-
-
- {{ scope.row[item.prop] | triggerList(item.filters, "label") }}
-
-
-
{{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
-
-
{{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
-
{{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
-
-
-
+
+ {{ scope.row[item.prop] ? scope.row[item.prop][item.showProp] : "" }}
+
+
+ {{ scope.row[item.prop]? scope.row[item.prop][item.showProp]: "" | formatDate }}
+
+
+ {{ scope.row[item.prop] | formatDate }}
+
+
+
+ {{ propsData[item.showProp] }}
+
+
+ {{ scope.row[item.prop] | trigger(item.filters, "label") }}
+
+
+ {{ scope.row[item.prop] | trigger(item.filters, "label", item.dictType) }}
+
+
+ {{ scope.row[item.prop][item.showProp] | trigger(item.filters, "label") }}
+
+
+ {{ scope.row[item.prop] | triggerList(item.filters, "label") }}
+
+
+
{{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
+
+
{{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
+
{{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
+
+
+
diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 3e70a3b79..0c8bb4d20 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -270,6 +270,22 @@ export const constantRoutes = [
// }
// }]
// },
+ {
+ 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: '/',
component: Layout,
@@ -281,7 +297,7 @@ export const constantRoutes = [
name: 'IssueRequestZS',
meta: {
keepAlive : true,
- title: '人工发料申请(注塑)',
+ title: '人工注塑申请',
icon: '成品发运任务',
}
}]
@@ -297,7 +313,7 @@ export const constantRoutes = [
name: 'IssueJobZS',
meta: {
keepAlive : true,
- title: '人工发料任务(注塑)',
+ title: '人工注塑任务',
icon: '成品发运任务',
}
}]
@@ -313,7 +329,7 @@ export const constantRoutes = [
name: 'IssueNoteZS',
meta: {
keepAlive : true,
- title: '人工发料记录(注塑)',
+ title: '人工注塑记录',
icon: '成品发运任务',
}
}]
@@ -462,54 +478,6 @@ export const constantRoutes = [
}
}]
},
- {
- path: '/',
- component: Layout,
- redirect: '/gridlayout',
- hidden: true,
- children: [{
- path: 'StdCostPriceSheet',
- component: () => import('@/views/basicData/priceManage/StdCostPriceSheet.vue'),
- name: 'StdCostPriceSheet',
- meta: {
- keepAlive : true,
- title: '标准成本价格单',
- icon: '成品发运任务',
- }
- }]
- },
- {
- path: '/',
- component: Layout,
- redirect: '/gridlayout',
- hidden: true,
- children: [{
- path: 'PurchasePriceSheet',
- component: () => import('@/views/basicData/priceManage/PurchasePriceSheet.vue'),
- name: 'PurchasePriceSheet',
- meta: {
- keepAlive : true,
- title: '采购价格单',
- icon: '成品发运任务',
- }
- }]
- },
- {
- path: '/',
- component: Layout,
- redirect: '/gridlayout',
- hidden: true,
- children: [{
- path: 'SalePriceSheet',
- component: () => import('@/views/basicData/priceManage/SalePriceSheet.vue'),
- name: 'SalePriceSheet',
- meta: {
- keepAlive : true,
- title: '销售价格单',
- icon: '成品发运任务',
- }
- }]
- },
{
path: '/',
component: Layout,
diff --git a/fe/PC/src/utils/primarySearchOption/index.js b/fe/PC/src/utils/primarySearchOption/index.js
index 92b65f505..1fd549579 100644
--- a/fe/PC/src/utils/primarySearchOption/index.js
+++ b/fe/PC/src/utils/primarySearchOption/index.js
@@ -1,6 +1,30 @@
// 示例配置 primarySearchOptionExample
-export const ItemBasic = [
+// export const ItemBasic = [
+// // type == input
+// { type: "input", label: "物品编码", prop: "code", action:"Like"},
+// // type == select 枚举options(filters/status.js)
+// { type: "select", label: "状态", prop: "status", options: "itemStatus"},
+// // type == select 自定义options(使用userOptions参数)
+// // { type: "select", label: "制造件", prop: 'canMake', userOptions: [
+// // { "label": "是", id:'1', "value": true, },
+// // { "label": "不是", id:'2',"value": false,}]
+// // },
+// // //type == date
+// // { type: "date", label: "日期", prop: "date",},
+// // // type == time
+// // { type: "time", label: "时间", prop: "time",},
+// // // type == dateTime
+// // { type: "dateTime", label: "日期时间", prop: "dateTime",},
+// // // type == dateTimelimit 选择范围:当前天及以后
+// // { type: "dateTimelimit", label: "当前天及以后", prop: "dateTimelimit",},
+// // 其他参数(以上方式通用):
+// // 1、 value 添加默认值(默认为空),如:value:"111",默认值只为回显数据,不做查询处理
+// // 如需要查询默认值,请在获取界面数据的paging()中配置
+// // 2、 noClearable 去掉清除按钮(默认显示清除按钮)
+// ]
+
+export const IssuePlanZS = [
// type == input
{ type: "input", label: "物品编码", prop: "code", action:"Like"},
// type == select 枚举options(filters/status.js)
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index fe246d036..5d676b5b8 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -701,6 +701,15 @@ export const TransactionType = [
// fixed: "right"
// },
]
+// 库存开账
+export const InventoryBilling = [
+ { label: "物品代码", prop: "itemCode", type: "name" },
+ { label: "ERP系统库位代码", prop: "erpLocationCode",width:"180px" },
+ { label: "创建时间", prop: "creationTime", type:'dateTime' },
+ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+ { label: "备注", prop: "remark" },
+]
+
// 车间信息 20230328
export const Workshop = [
{
@@ -1018,7 +1027,6 @@ export const StdCostPriceSheet = [
width:"200px"
},
{ label: "标准成本价格", prop: "stdCostPrice" },
- { label: "价格单描述", prop: "description" },
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
@@ -2743,7 +2751,7 @@ export const InventoryBalance = [
{ label: "库存数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" },
{ label: "标准成本单价", prop: "stdCostPrice" },
- { label: "标准成本价格", prop: "stdCost" },
+ { label: "标准成本金额", prop: "stdCost" },
{ label: "批次", prop: "lot" },
{ label: "库位代码", prop: "locationCode" },
{ label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
@@ -4247,7 +4255,44 @@ export const completDumpNoteZP = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
-// 人工发料申请(注塑)
+// 注塑计划
+export const IssuePlanZS = [
+ {
+ label: _Names.itemCode,
+ prop: "code",
+ fixed: "left",
+ },
+ { label: _Names.itemName, prop: "name" },
+ { label: _Names.itemDesc1, prop: "desc1" },
+ { label: _Names.itemDesc2, prop: "desc2" },
+ { label: _Public.status, prop: "status", type: "filter", filters: "itemStatus" },
+ { label: _Public.type, prop: 'type', type: "filter", filters: "ItemTypeBasic" },
+ { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" },
+ { label: _Names.canMake, prop: 'canMake', type: "filter", filters: "whetherOrNot" },
+ { label: _Names.canBuy, prop: 'canBuy', type: "filter", filters: "whetherOrNot" },
+ { label: _Names.canOutsourcing, prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
+ { label: _Names.isRecycled, prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
+ { label: _Names.isPhantom, prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
+ { label: _Names.productLine, prop: 'productLine' },
+ { label: _Names.elevel, prop: 'elevel' },
+ { label: _Names.color, prop: "color" },
+ // ---------------------------------------
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+ { label: _Names.category, prop: "category" },
+ { label: _Names.group, prop: "group" },
+ { label: _Names.configuration, prop: "configuration" },
+ { label: _Names.basicUom, prop: "basicUom" },
+ { label: _Names.stdPackQty, prop: "stdPackQty",isNumber:true },
+ { label: _Names.project, prop: "project" },
+ { label: _Names.version, prop: "version" },
+ { label: _Names.eco, prop: "eco" },
+ { label: _Names.validity, prop: "validity" },
+ { label: _Names.validityUnit, prop: "validityUnit", type: "filter", filters: "validityUnit" },
+ { label: _Names.manageType, prop: "manageType", type: "filter", filters: "manageType" },
+ { label: _Public.remark, prop: "remark" },
+]
+// 人工注塑申请
export const IssueRequestZS = [
{
label: "叫料申请编号",
@@ -4277,7 +4322,7 @@ export const IssueRequestZS = [
// { label: "事务ID", prop: "tenantId" },
// ************** 确认隐藏 ************************
]
-// 人工发料任务(注塑)
+// 人工注塑任务
export const IssueJobZS = [
{
label: "发料任务编号",
@@ -4316,7 +4361,7 @@ export const IssueJobZS = [
// { label: "完成者", prop: 'completeUserId' },
// ************** 确认隐藏 ************************
]
-// 人工发料记录(注塑)
+// 人工注塑记录
export const IssueNoteZS = [
{
label: "发料记录单号",
@@ -4688,6 +4733,9 @@ export const customerReturnNote = [
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
+
+
+
// 字段说明
// showProp: true //隐藏该字段的高级筛选+列表排序
// sortable: false //隐藏该字段的列表排序
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index e83842c22..caf7d9a23 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -520,6 +520,14 @@ export const TransactionType = [
// { label: "ID", prop: 'id' },
// ************** 确认隐藏 ************************
]
+// 库存开账
+export const InventoryBilling = [
+ { label: "物品代码", prop: "itemCode", type: "name" },
+ { label: "ERP系统库位代码", prop: "erpLocationCode" },
+ { label: "创建时间", prop: "creationTime", type:'dateTime' },
+ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+ { label: "备注", prop: "remark" },
+]
// 车间信息 20230328
export const Workshop = [
{ label: "车间代码", prop: "code" },
@@ -767,7 +775,6 @@ export const StdCostPriceSheet = [
width:"200px"
},
{ label: "标准成本价格", prop: "stdCostPrice" },
- { label: "价格单描述", prop: "description" },
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
@@ -1946,6 +1953,8 @@ export const InventoryInitialNote = [
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "标包数量", prop: 'stdPackQty' },
+ { label: "标准成本单价", prop: "stdCostPrice" },
+ { label: "标准成本金额", prop: "stdCost" },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "事务ID", prop: "tenantId" },
{ label: "序号", prop: "serialNumber" },
diff --git a/fe/PC/src/views/basicData/WarehouseManage/InventoryBilling.vue b/fe/PC/src/views/basicData/WarehouseManage/InventoryBilling.vue
new file mode 100644
index 000000000..306901dc0
--- /dev/null
+++ b/fe/PC/src/views/basicData/WarehouseManage/InventoryBilling.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbutton"
+ @close-value="closeValue"
+ :currenButtonData="currenButtonData"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssuePlanZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssuePlanZS.vue
new file mode 100644
index 000000000..38d87f609
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssuePlanZS.vue
@@ -0,0 +1,271 @@
+
+
+
+
+
+
+
+
+
+ 总成汇总
+ 子物料汇总
+
+
+
+
+
+ 关闭
+ 执行
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看bom
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file