diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java
index 29734355..c00cf425 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java
@@ -66,10 +66,10 @@ public class MaterialPlanServiceImpl implements MaterialPlanService {
MaterialPlanDO updateObj = BeanUtils.toBean(updateReqVO, MaterialPlanDO.class);
LocalDateTime currTime = LocalDateTime.now();
- if(updateReqVO.getSubmitUserId()!= null){
+ if(updateReqVO.getStatus()==2){
updateObj.setSubmitTime(currTime);
}
- if(updateReqVO.getAuditor()!= null){
+ if(updateReqVO.getStatus()== 3 || updateReqVO.getStatus() == 4){
updateObj.setAuditTime(currTime);
}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue
index b6a6e42e..922a8037 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue
@@ -96,6 +96,7 @@ import ProjectPlanDialog from '@/views/heli/materialplan/ProjectPlanDialog.vue'
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
+const router = useRouter()
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
@@ -141,11 +142,10 @@ const submitForm = async () => {
formLoading.value = true
try {
const data = formData.value as unknown as MaterialPlanApi.MaterialPlanVO
- await MaterialPlanApi.createMaterialPlan(data)
- message.success(t('common.createSuccess'))
+ var materialPlanId = await MaterialPlanApi.createMaterialPlan(data)
+ router.push({ path: '/purchase/materialplanedit',query: { id: materialPlanId }})
+ //message.success(t('common.createSuccess'))
dialogVisible.value = false
- // 发送操作成功的事件
- emit('success')
} finally {
formLoading.value = false
}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/audit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/audit.vue
new file mode 100644
index 00000000..11707b82
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/audit.vue
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+ 重置
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.projectMaterialPlanNo }}
+
+
+
+
+
+ {{
+ formatDate(scope.row.createTime, 'YYYY-MM-DD')
+ }}
+
+
+
+
+
+
+
+ {{ userInit.find((user) => user.id == scope.row.creator)?.nickname }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 去审核
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/auditdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/auditdetail.vue
new file mode 100644
index 00000000..3fff9e8b
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/auditdetail.vue
@@ -0,0 +1,592 @@
+
+
+
+ 编辑页
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 物料信息
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+ 物料名称
+
+
+ handleMatName(scope, val)" class="!w-180px">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 需求数量
+
+
+
+
+
+
+
+ 需求到货日期
+
+
+
+
+
+
+
+ 子项目编号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附件信息
+
+
+
+
+
+
+
+ 上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+ 下载
+
+
+
+
+
+
+
+
+
+
+
+ 系统信息
+
+
+
+
+
+ {{ userList.find((user) => user.id == formData.creator)?.nickname }}
+
+
+
+
+ {{ formatDate(formData.createTime, 'YYYY-MM-DD HH:mm') }}
+
+
+
+
+
+
+ {{ userList.find((user) => user.id == formData.submitUserId)?.nickname }}
+
+
+
+
+ {{ formatDate(formData.submitTime, 'YYYY-MM-DD HH:mm') }}
+
+
+
+
+
+
+ {{ userList.find((user) => user.id == formData.auditor)?.nickname }}
+
+
+
+
+ {{ formatDate(formData.auditTime, 'YYYY-MM-DD HH:mm') }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue
index 218d97b5..997aed35 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue
@@ -32,7 +32,7 @@
+ :label="dict.username + ' '+ dict.nickname" :value="dict.id" />
@@ -54,7 +54,7 @@
+ :label="dict.username + ' '+ dict.nickname" :value="dict.id" />
@@ -107,7 +107,7 @@
+ :label="dict.username + ' '+ dict.nickname" :value="dict.id" />
@@ -117,7 +117,7 @@
+ :label="dict.username + ' '+ dict.nickname" :value="dict.id" />
@@ -174,7 +174,7 @@
+ :label="dict.username + ' '+ dict.nickname" :value="dict.id" />
@@ -335,7 +335,7 @@
+ :label="dict.username + ' '+ dict.nickname" :value="dict.id" />
@@ -356,7 +356,7 @@
+ :label="dict.username + ' '+ dict.nickname" :value="dict.id" />
@@ -377,7 +377,7 @@
+ :label="dict.username + ' '+ dict.nickname" :value="dict.id" />