Merge remote-tracking branch 'origin/master'

src/views/program/project/form.vue

@@ -7,8 +7,8 @@
             <div class="hc-program-project-form-radio-group">
                 <el-radio-group v-model="radioType" size="large">
                     <el-radio-button label="1">市场部</el-radio-button>
-                    <el-radio-button label="2">实施部</el-radio-button>
-                    <el-radio-button label="3">研发部</el-radio-button>
+                    <el-radio-button label="2">研发部</el-radio-button>
+                    <el-radio-button label="3">实施部</el-radio-button>
                     <el-radio-button label="4">维护部</el-radio-button>
                     <el-radio-button label="5">管理支出</el-radio-button>
                     <el-radio-button label="6">外包劳务</el-radio-button>

src/views/program/section/form.vue

@@ -29,19 +29,22 @@
         <HcDialog bgColor="#ffffff" isToBody title="开启计划" widths="40rem" saveText="保存"
                   :show="openPlanModal" @close="openPlanCloseClick" @save="openPlanSaveClick"
         >
-            <HcListItem title="原计划起止日期：" content="2023-02-23~2023-02-28"/>
-            <HcListItem title="中途暂停计划起止日期：" content="2023-02-23~2023-02-28"/>
+            <HcListItem title="原计划起止日期：" :content=" openPlan.planStartTime+'~'+openPlan.planEndTime"/>
+            <HcListItem title="中途暂停计划起止日期：" :content="openPlan.pausePlanStartTime+'~'+openPlan.pausePlanEndTime"/>
             <HcListItem title="中途开启计划起止日期：" isCenter>
                 <HcDatePicker :dates="betweenTime" @change="betweenTimeUpdate"/>
             </HcListItem>
-            <HcListItem title="原计划起止工时(天)：" isCenter>
-                <span class="text-red text-xl">6</span>
+            <HcListItem title="项目原计划起止工时(天)：" isCenter>
+                <span class="text-red text-xl">{{ openPlan?.planDays }}</span>
             </HcListItem>
-            <HcListItem title="原计划截止暂停阶段起止工时(天)：" isCenter>
+            <HcListItem title="上一次计划工时(天)：" isCenter>
+                <span class="text-red text-xl">{{ openPlan?.lastOpenPlanStartEndDays }}</span>
+            </HcListItem>
+            <HcListItem title="上一次计划截止暂停阶段起止工时(天)：" isCenter>
                 <span class="text-red text-xl">6</span>
             </HcListItem>
             <HcListItem title="中途暂停之后开启计划起止工时(天)：" isCenter>
-                <span class="text-red text-xl">6</span>
+                <span class="text-red text-xl">{{ openPlan?.lastOpenPlanStartEndDays }}</span>
             </HcListItem>
             <div class="mt-8">
                 <el-alert type="warning" title="提示：" description="该计划暂停之后开启的工时加上暂停前的工时已经超出原计划工时，是否安排不合理，请从新安排！" :closable="false"/>
@@ -199,7 +202,7 @@ const getPlanInOpen=async(id)=>{
     const {error, code, data} = await sectionApi.getPlanInOpen({id})
     if (!error && code === 200) {
         openPlan.value = getObjValue(data)
-
+        betweenTime.value=[openPlan.value.openPlanStartTime,openPlan.value.openPlanEndTime]
     } else {
         openPlan.value = {}
 
@@ -255,7 +258,7 @@ const saveLoaing=ref(false)
 const saveClick = async() => {
     console.log(tableData.value,'tableData');
     saveLoaing.value=true
-        const {error, code, data,msg} = await sectionApi.updateDepartmentPlan( tableData.value)
+        const {error, code, data,msg} = await sectionApi.updateDepartmentPlan( {departmentPlanList:tableData.value})
         saveLoaing.value=false
         if (!error && code === 200) {
             window.$message.success(msg)

src/views/program/section/index.vue

@@ -52,7 +52,7 @@
             </template>
             <template #action="{row,index}">
                 <el-button size="small" type="primary" @click="editRowClick(row)">编辑</el-button>
-                <el-button size="small" type="danger">删除</el-button>
+                <el-button size="small" type="danger" @click="delRowClick(row)">删除</el-button>
             </template>
         </HcTable>
         <template #action>
@@ -82,9 +82,9 @@
 import {ref,onMounted,onActivated,watch} from "vue";
 import {useRouter} from 'vue-router'
 import sectionApi from '~api/program/section.js';
-import {useAppStore} from "~src/store";
 import {getArrValue,getObjValue,formValidate} from "js-fast-way"
 import { getdepartmentList} from "~api/other";
+import {delMessage} from "~uti/tools";
 
 const router = useRouter()
 onActivated(()=>{
@@ -225,7 +225,7 @@ const monthSaveClick =async() => {
 
 }
 
-//编辑预算
+//编辑
 const editRowClick = (row) => {
     changeDpt(row.departmentType)
     router.push({
@@ -239,4 +239,17 @@ const editRowClick = (row) => {
         }
     })
 }
+
+//删除
+const delRowClick = async(row) => {
+    delMessage(async() => {
+        const {error, code, data,msg} = await sectionApi.deleteById({id:row.id})  
+            if (!error && code === 200) {
+                window.$message.success(msg)
+                getTableData()
+            } else {
+                getTableData()
+            }
+    })
+}
 </script>