Prechádzať zdrojové kódy

部门月度计划修改

duy 2 rokov pred
rodič
commit
bccd11648b

+ 1 - 1
src/views/home/index/admin.vue

@@ -466,7 +466,7 @@ const getTableData1 = async () => {
 const rowViewClick = (row) => {
     console.log(row, 'row')
     router.push({ name: 'program-section-form', query:{
-        costType:row?.costType, projectId:row?.projectId, overPlan:true, deptId:row?.deptId,
+        costType:row?.costTypeValue, projectId:row?.projectId, overPlan:true, deptId:row?.deptId,
     } })
 }
 

+ 16 - 23
src/views/program/section/form.vue

@@ -98,24 +98,26 @@ const useRoutes = useRoute()
 const dataId = ref(useRoutes?.query?.id ?? '')
 const dataType = ref(useRoutes?.query?.type ?? '')
 const planDate = ref(useRoutes?.query?.month ?? '')
-const departmentType = ref(useRoutes?.query?.section ?? '')
+const departmentType = ref(useRoutes?.query?.departmentType ?? '')
 const deptId = ref(useRoutes?.query?.deptId ?? '')
 const overPlan = ref(useRoutes?.query?.overPlan ?? false)//是否延期计划
 const costType = ref(useRoutes?.query?.costType ?? '')//门户跳转过来的部门
 const projectId = ref(useRoutes?.query?.projectId ?? '')//门户跳转过来的项目
+const deptName = ref(useRoutes?.query?.deptName ?? '')
 //缓存页面被激活时
 onActivated(() => {
     dataId.value = useRoutes?.query?.id ?? ''
     dataType.value = useRoutes?.query?.type ?? ''
     planDate.value = useRoutes?.query?.month ?? ''
-    departmentType.value = useRoutes?.query?.section ?? ''
+    departmentType.value = useRoutes?.query?.departmentType ?? ''
     deptId.value = useRoutes?.query?.deptId ?? ''
     overPlan.value = useRoutes?.query?.overPlan ?? false
     costType.value = useRoutes?.query?.costType ?? ''
     projectId.value = useRoutes?.query?.projectId ?? ''
+    deptName.value = useRoutes?.query?.deptName ?? ''
     getDepartmentuserDict()//获取部门人员字典
     if (!overPlan.value) {
-        setTabData(departmentType.value)
+        setTabData(deptName.value)
         getDepartmentPlan()
     
     } else {
@@ -146,7 +148,7 @@ const getDepartmentTimeOutPlan = async ()=>{
 const getDepartmentPlan = async ()=>{
     const { error, code, data } = await sectionApi.getDepartmentPlan(
         {
-            departmentType:departmentType.value,
+         
             deptId:deptId.value,
             planDate:planDate.value,
            
@@ -178,30 +180,21 @@ const getDepartmentuserDict = async ()=>{
 //类型tab数据和相关处理
 const tabKey = ref('1')
 const tabTab = ref([
-    { key: '1', name: '市场部月度预算' },
-    { key: '2', name: '研发部月度预算' },
-    { key: '3', name: '实施部月度预算' },
-    { key: '4', name: '维护部月度预算' },
-    { key: '5', name: '人事行政(财务)部月度预算' },
+    // { key: '1', name: '市场部月度预算' },
+    // { key: '2', name: '研发部月度预算' },
+    // { key: '3', name: '实施部月度预算' },
+    // { key: '4', name: '维护部月度预算' },
+    // { key: '5', name: '人事行政(财务)部月度预算' },
 ])
 const tabChange = ({ key }) => {
     tabKey.value = key
 }
 //设置tab
-const setTabData = (key)=>{
-    tabKey.value = key
-    if (key == '1') {
-        tabTab.value = [{ key: '1', name: '市场部月度预算' }]
-    } else if (key == '2') {
-        console.log(2222222)
-        tabTab.value = [{ key: '2', name: '研发部月度预算' }]
-    } else if (key == '3') {
-        tabTab.value = [ { key: '3', name: '实施部月度预算' }]
-    } else if (key == '4') {
-        tabTab.value = [ { key: '4', name: '维护部月度预算' }]
-    } else if (key == '5') {
-        tabTab.value = [{ key: '5', name: '人事行政(财务)部月度预算' }]
-    }
+const setTabData = (val)=>{
+    tabKey.value = val + '预算'
+    tabTab.value = [{
+         key: val + '预算', name: val + '预算', 
+    }]
 }
 
 //获取数据

+ 16 - 11
src/views/program/section/index.vue

@@ -3,7 +3,7 @@
         <template #header>
             <div class="w-36">
                 <el-select v-model="searchForm.departmentType" block clearable placeholder="选择部门" size="large">
-                    <el-option v-for="item in department" :label="item.deptName" :value="item.deptCategory" />
+                    <el-option v-for="item in department" :label="item.deptName" :value="item.id" />
                 </el-select>
             </div>
             <div class="w-36 ml-4">
@@ -73,7 +73,7 @@
             <el-form ref="formMonthRef" label-position="top" size="large" :model="formMonthModel" :rules="formMonthRules">
                 <el-form-item label="选择部门" prop="section">
                     <el-select v-model="formMonthModel.section" block placeholder="选择部门" @change="changeDpt">
-                        <el-option v-for="item in department" :label="item.deptName" :value="item.deptCategory" />
+                        <el-option v-for="item in department" :label="item.deptName" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="选择月份" prop="month">
@@ -197,29 +197,33 @@ const monthCloseClick = () => {
 }
 //选择部门
 const deptId = ref('')
+const deptName = ref('')
 const changeDpt = (val)=>{
     console.log(val, 'val')
+    deptId.value = val
     department.value.forEach((ele)=>{
-        if (ele.deptCategory === val) {
-            deptId.value = ele.id
+        if (ele.id === val) {
+            deptName.value = ele.deptName
         }
+        
     })
-    console.log(deptId.value, 'deptId.value')
+    
+  
 }
+
 //新增部门月计划
 const addPlan = async (obj)=>{
     const { error, code, data, msg } = await sectionApi.addDepartmentPlan( {
         planDate:obj.month,
-        departmentType:obj.section,
         deptId:deptId.value,
     })
     if (!error && code === 200) {
        window.$message.success(msg)
         monthModal.value = false
-        changeDpt(formMonthModel.value.section)
+  
         router.push({
             name: 'program-section-form',
-            query: { ...formMonthModel.value, type:'add', deptId:deptId.value },
+            query: { ...formMonthModel.value, type:'add', deptId:deptId.value, deptName:deptName.value },
     
         })
     } 
@@ -237,15 +241,16 @@ const monthSaveClick = async () => {
 
 //编辑
 const editRowClick = (row) => {
-    changeDpt(row.departmentType)
+    changeDpt(row.deptId)
     router.push({
         name: 'program-section-form',
         query: {
             id: row.id,
             month:row.planDate,
-            section:row.departmentType,
+            departmentType:row.departmentType,
             type:'edit',
-            deptId:deptId.value,
+            deptId:row.deptId,
+            deptName:deptName.value,
         },
     })
 }