diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
index b9407cb..42cb07a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
@@ -292,5 +292,6 @@ export enum DICT_TYPE {
HELI_MAT_REQ_STATUS='heli_mat_req_status',
HELI_MATERIAL_STATUS='heli_material_status',
HELI_DOCUMENT_STATUS='heli_document_status',
- HELI_STORAGEIN_STATUS='heli_storagein_status'
+ HELI_STORAGEIN_STATUS='heli_storagein_status',
+ MATERIAL_PLAN_BOOM_MPLAN_STATUS='material_plan_boom_mplan_status'
}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue
new file mode 100644
index 0000000..6bf5c87
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue
@@ -0,0 +1,287 @@
+
+
+
+ 零件采购
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+ 重置
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+ 零件明细
+ 送审
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.procedureName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ getIntDictOptions(DICT_TYPE.PART_PURCHASE_STATUS).find(
+ (dict) => dict.value === scope.row.orderStatus
+ )?.label || '未知状态'
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue
index f344a57..5cc8d65 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue
@@ -17,8 +17,8 @@
-
-
+
+
@@ -63,6 +63,10 @@
批 准
驳 回
+ 取 消
+
+
+ 取 消
@@ -103,7 +107,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
const formData = ref({
id: undefined,
- contractNo: undefined,
+ purchaseNo: undefined,
projectId: undefined,
projectPlanId: undefined,
projectPlanNo: undefined,
@@ -165,6 +169,9 @@ const reject = async(reason) => {
getList();
}
+const cancel = async () => {
+ router.push({ path: '/purchase/PartPurchaseCheck'});
+}
const closeForm = async () => {
router.push({ path: '/purchase/management' })
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue
index 7d198e1..389b2cc 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue
@@ -6,8 +6,8 @@
-
-
+
@@ -46,10 +46,10 @@
-
+
- {{ scope.row.contractNo }}
+ {{ scope.row.purchaseNo }}
@@ -119,7 +119,7 @@ const queryParams = reactive({
pageNo: 1,
pageSize: 10,
id: undefined,
- contractNo: undefined,
+ purchaseNo: undefined,
projectId: undefined,
projectPlanId: undefined,
submitUserId: undefined,