diff --git a/src/api/dayPlan/Demand/index.ts b/src/api/dayPlan/Demand/index.ts
index c043234..91f0f5f 100644
--- a/src/api/dayPlan/Demand/index.ts
+++ b/src/api/dayPlan/Demand/index.ts
@@ -18,7 +18,7 @@ enum Api {
compare = '/dayPlan/demand/compare',
withdraw = '/dayPlan/demand/withdraw',
submit = '/dayPlan/demand/submit',
- cancel = 'dayPlan/demand/cancel',
+ cancel = '/dayPlan/demand/cancel',
Export = '/dayPlan/demand/export',
diff --git a/src/views/dayPlan/Demand/components/basicForm.vue b/src/views/dayPlan/Demand/components/basicForm.vue
index 4aa2706..afe4d43 100644
--- a/src/views/dayPlan/Demand/components/basicForm.vue
+++ b/src/views/dayPlan/Demand/components/basicForm.vue
@@ -173,18 +173,16 @@
{ title: t('批复量(方)'), dataIndex: 'qtySalesM3', width: 200},
{ title: t('备注'), dataIndex: 'note', width: 200},
]);
- const formState = ref({
- datePlan: null,
- lastVerSign: 'Y',
- validSign: 'N',
- alterSign: 'I',
- approCode: 'WTJ'
- })
+ const formState = ref({})
const dataList = ref([])
const contractList = ref([])
const pointDelyList = ref([])
onMounted(async () =>{
if (!pageType.value) {
+ formState.value.lastVerSign = 'Y'
+ formState.value.validSign = 'N'
+ formState.value.alterSign = 'I'
+ formState.value.approCode = 'WTJ'
const res = await getCompDept(userInfo.id)
formState.value.cuCode = res?.comp?.code
formState.value.comId = res?.comp?.id
@@ -213,7 +211,6 @@
}
const datePlanChange = async (val) => {
if (!val) {
- formState.value = {}
dataList.value = []
return
}
@@ -314,7 +311,7 @@
today.setHours(0, 0, 0, 0); // 清除时分秒,确保比较时不考虑时间部分
// 获取明天的日期
const tomorrow = new Date();
- tomorrow.setDate(tomorrow.getDate() + (pageId ? 1 : 2));
+ tomorrow.setDate(tomorrow.getDate() + ( 2));
tomorrow.setHours(0, 0, 0, 0); // 清除时分秒
// 当前日期小于今天或大于明天,则禁用
return current < today || current > tomorrow;
@@ -330,7 +327,7 @@
watch(
() => props.formObj,
(val) => {
- if (val) {
+ if (val && !pageType.value) {
formState.value = val
}
},
diff --git a/src/views/dayPlan/Demand/components/createForm.vue b/src/views/dayPlan/Demand/components/createForm.vue
index aedf49f..47e6fd4 100644
--- a/src/views/dayPlan/Demand/components/createForm.vue
+++ b/src/views/dayPlan/Demand/components/createForm.vue
@@ -5,7 +5,7 @@
关闭
-
+
保存
diff --git a/src/views/dayPlan/Demand/index.vue b/src/views/dayPlan/Demand/index.vue
index adfe9d7..0c97faf 100644
--- a/src/views/dayPlan/Demand/index.vue
+++ b/src/views/dayPlan/Demand/index.vue
@@ -78,7 +78,7 @@
const tableRef = ref();
//所有按钮
- const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true,"type":"primary"},{"name":"提交","code":"batchsubmit","icon":"ant-design:check-outlined","isDefault":true,"isUse":true},{"name":"撤回","code":"batchback","icon":"ant-design:rollback-outlined","isDefault":true,"isUse":true},{"name":"提交","code":"submit","icon":"ant-design:check-outlined","isDefault":true,"isUse":true},{"name":"撤回","code":"back","icon":"ant-design:rollback-outlined","isDefault":true,"isUse":true},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"导入","code":"import","icon":"ant-design:import-outlined","isDefault":true,"isUse":true},{"name":"导出","code":"export","icon":"ant-design:export-outlined","isDefault":true,"isUse":true},{"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true,"isUse":true},{"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"变更","code":"update","icon":"ant-design:edit-filled","isDefault":true,"isUse":true},{"name":"取消","code":"update","icon":"ant-design:close-outlined","isDefault":true,"isUse":true},{"name":"对比","code":"compare","icon":"ant-design:file-done-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
+ const buttons = ref([{"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true,"type":"primary"},{"name":"提交","code":"batchsubmit","icon":"ant-design:check-outlined","isDefault":true,"isUse":true},{"name":"撤回","code":"batchback","icon":"ant-design:rollback-outlined","isDefault":true,"isUse":true},{"name":"提交","code":"submit","icon":"ant-design:check-outlined","isDefault":true,"isUse":true},{"name":"撤回","code":"back","icon":"ant-design:rollback-outlined","isDefault":true,"isUse":true},{"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"导入","code":"import","icon":"ant-design:import-outlined","isDefault":true,"isUse":true},{"name":"导出","code":"export","icon":"ant-design:export-outlined","isDefault":true,"isUse":true},{"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true,"isUse":true},{"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true,"isUse":true},{"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true,"isUse":true},{"name":"变更","code":"update","icon":"ant-design:edit-filled","isDefault":true,"isUse":true},{"name":"取消","code":"cancel","icon":"ant-design:close-outlined","isDefault":true,"isUse":true},{"name":"对比","code":"compare","icon":"ant-design:file-done-outlined","isDefault":true,"isUse":true},{"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]);
//展示在列表内的按钮
const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord', 'update', 'compare', 'cancel','submit','back']);
const buttonConfigs = computed(()=>{