From c18b61164fa4d9dcbeaa471ba3043334c576b1bc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 二月 2024 17:25:18 +0800
Subject: [PATCH] 主生产计划
---
src/views/plan/masterproductionschedule/index.vue | 17 ++
src/views/warehouse/FinishedWarehousing/index.vue | 317 ++++++++++++++++++++++++++++++++--------------------
src/views/basic/part/part-form.vue | 3
src/api/warehouse/stock.js | 8 +
4 files changed, 215 insertions(+), 130 deletions(-)
diff --git a/src/api/warehouse/stock.js b/src/api/warehouse/stock.js
index 9fbd329..bb3d691 100644
--- a/src/api/warehouse/stock.js
+++ b/src/api/warehouse/stock.js
@@ -146,3 +146,11 @@
params: query
})
}
+
+export function productPage(query) {
+ return request({
+ url: '/mes/stock/productPage',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/views/basic/part/part-form.vue b/src/views/basic/part/part-form.vue
index 39c8942..cab5196 100644
--- a/src/views/basic/part/part-form.vue
+++ b/src/views/basic/part/part-form.vue
@@ -472,9 +472,6 @@
],
materialType: [
{ required: true, message: '闆朵欢绫诲瀷涓嶈兘涓虹┖', trigger: 'change' }
- ],
- materialAttribute: [
- { required: true, message: '闆朵欢灞炴�т笉鑳戒负绌�', trigger: 'change' }
]
},
ruleOptions: [],
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index dcfb387..7a7823b 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -213,7 +213,8 @@
statesList: [
{ value: '01pending', label: '寰呭鐞�' },
{ value: '02processed', label: '宸插鐞�' },
- { value: '03canceled', label: '宸蹭綔搴�' }
+ { value: '03canceled', label: '宸蹭綔搴�' },
+ { value: '04completed', label: '宸插畬鎴�' }
],
isAuditList: [
{
@@ -239,19 +240,25 @@
label: '鏍囪寰呭鐞�',
command: 'PENDING',
disabled: false,
- permitArr: ['02processed']
+ permitArr: ['01pending']
},
{
label: '鏍囪宸插鐞�',
command: 'PROCESSED',
disabled: false,
- permitArr: ['01pending']
+ permitArr: ['02processed']
},
{
label: '鏍囪宸蹭綔搴�',
command: 'CANCELED',
disabled: false,
- permitArr: ['01pending']
+ permitArr: ['03canceled']
+ },
+ {
+ label: '鏍囪宸插畬鎴�',
+ command: 'COMPLETED',
+ disabled: false,
+ permitArr: ['04completed']
}
],
documentTagArr: [
@@ -884,6 +891,8 @@
eventName = '寰呭鐞�'
} else if (event == 'PROCESSED') {
eventName = '宸插鐞�'
+ } else if (event == 'COMPLETED') {
+ eventName = '宸插畬鎴�'
} else {
eventName = '宸蹭綔搴�'
}
diff --git a/src/views/warehouse/FinishedWarehousing/index.vue b/src/views/warehouse/FinishedWarehousing/index.vue
index 3afc521..7fbd608 100644
--- a/src/views/warehouse/FinishedWarehousing/index.vue
+++ b/src/views/warehouse/FinishedWarehousing/index.vue
@@ -1,138 +1,209 @@
<template>
- <div class="mod-config">
- <basic-container>
- <ttable
+ <div class="mod-config">
+ <basic-container>
+ <ttable
:table="table"
:isShowHide="true"
:prelang="prelang"
:options="options"
- :dataListLoading="false"
+ :dataListLoading="false"
ref="processconfiguration"
- >
+ >
<template #toolbar></template>
- </ttable>
- </basic-container>
- </div>
+ </ttable>
+ </basic-container>
+ </div>
</template>
<script>
import ttable from '@/views/common/ztt-table.vue'
+import { productPage, } from '@/api/warehouse/stock'
+
export default {
- data(){
- return {
- prelang: 'operation',
- options: {
- height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
- stripe: true, // 鏄惁涓烘枒椹汗 table
- highlightCurrentRow: false, // 鏄惁瑕侀珮浜綋鍓嶈
- border: true, // 鏄惁鏈夌旱鍚戣竟妗�
- lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
- fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
- multiSelect: true, //
- seqNo: true,
- isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
- isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
- isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
- defaultOrderBy: { column: 'createTime', direction: 'desc' }
- },
- table: {
- total: 0,
- currentPage: 1,
- pageSize: 20,
- data: [],
- // 鏍囬
- column: [
- {
- minWidth: '140',
- prop: 'material',
- label: '浜у搧鍚嶇О',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'type',
- label: '浜у搧鍨嬪彿',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },{
- minWidth: '140',
- prop: 'oo',
- label: '璐ㄩ噺杩芥函鍙�',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },{
- minWidth: '140',
- prop: 'materhhooial',
- label: '鍚堝悓缂栫爜',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'mateuurial',
- label: '鍗曚綅',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'materoiial',
- label: '鏁伴噺',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'matperoial',
- label: '妫�鏌ョ姸鎬�',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'materpial',
- label: '妫�鏌ヤ汉鍛�',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '130',
- prop: 'dealTime',
- label: '瑁呴厤浜哄憳',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '130',
- prop: 'dealTissme',
- label: '缂栧埗浜�',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- ],
- toolbar: [],
- // operator: [],
- // operatorConfig: {}
- },
- }
- },
- medthods: {},
- computed: {
- // ...mapGetters(['permissions'])
- },
- components: {
+ data() {
+ return {
+ ajaxFun: productPage,
+ prelang: 'operation',
+ options: {
+ height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
+ stripe: true, // 鏄惁涓烘枒椹汗 table
+ highlightCurrentRow: false, // 鏄惁瑕侀珮浜綋鍓嶈
+ border: true, // 鏄惁鏈夌旱鍚戣竟妗�
+ lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
+ fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
+ multiSelect: true, //
+ seqNo: true,
+ isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
+ isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ defaultOrderBy: { column: 'id', direction: 'desc' },
+ },
+ table: {
+ total: 0,
+ currentPage: 1,
+ pageSize: 20,
+ data: [],
+ // 鏍囬
+ column: [
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'factoryName',
+ label: '宸ュ巶',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'partNo',
+ label: '闆朵欢鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ propVal: this.$route.query.partNo,
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'partName',
+ label: '闆朵欢鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'warehouseName',
+ label: '浠撳簱',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'locationNo',
+ label: '搴撲綅鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'locationName',
+ label: '搴撲綅鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'systemNo',
+ label: '绯荤粺缂栧彿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'customerOrderNo',
+ label: '閿�鍞鍗曞彿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'mpsNo',
+ label: '涓荤敓浜ц鍒掑彿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'moNo',
+ label: '杞﹂棿璁㈠崟鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'stockQuantity',
+ label: '搴撳瓨鏁伴噺',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ width: '100',
+ minWidth: '120',
+ prop: 'availableStockQuantity',
+ label: '鍙敤搴撳瓨鏁伴噺',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ width: '100',
+ minWidth: '100',
+ prop: 'unit',
+ label: '鍗曚綅',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '100',
+ prop: 'ifsBatchNo',
+ label: '鎵规鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '100',
+ prop: 'sourceName',
+ label: '鏉ユ簮',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ }
+ ],
+ toolbar: [],
+ // operator: [],
+ // operatorConfig: {}
+ },
+ }
+ },
+ medthods: {},
+ components: {
ttable
- },
+ },
}
</script>
\ No newline at end of file
--
Gitblit v1.9.3