From 28c1713584837b5e03ad8f8e547ff341f8e96178 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 26 Jul 2024 17:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A1=AB=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/departmentRecord/index.js     |  9 +++++++++
 src/views/departmentH5/form/index.vue | 18 ++++++++++--------
 src/views/departmentH5/form/show.vue  |  3 +++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/api/departmentRecord/index.js b/src/api/departmentRecord/index.js
index 64cb77f..308e583 100644
--- a/src/api/departmentRecord/index.js
+++ b/src/api/departmentRecord/index.js
@@ -10,6 +10,15 @@ export function index (params,isLoading=true) {
   })
 }
 
+export function category (params,isLoading=true) {
+  return request({
+    method: "get",
+    url: "/api/admin/department-record/get-categories",
+    params,
+    isLoading
+  })
+}
+
 export function recordStore (data,isLoading=true) {
   return request({
     method: "post",
diff --git a/src/views/departmentH5/form/index.vue b/src/views/departmentH5/form/index.vue
index a63b38e..479b186 100644
--- a/src/views/departmentH5/form/index.vue
+++ b/src/views/departmentH5/form/index.vue
@@ -49,10 +49,10 @@
           <el-form-item label="标题" prop="title">
             <el-input v-model="form.title" placeholder="请填写标题"></el-input>
           </el-form-item>
-          <el-form-item label="月份" prop="month">
+          <el-form-item label="月份" prop="belongs_year_month">
             <el-date-picker
                   @change="changeMonth"
-                  v-model="form.month"
+                  v-model="form.belongs_year_month"
                   value-format="yyyy-MM"
                   format="yyyy-MM"
                   type="month"
@@ -106,13 +106,13 @@
 import detail from "@/views/departmentH5/form/show.vue";
   import {
     categoryYears,
-    categoryTypes,
-    index as category
+    categoryTypes,
   } from "@/api/departmentCategory"
   import {
     show,
     recordStore,
-    save
+    save,
+    category
   } from "@/api/departmentRecord"
 import { getToken } from "@/utils/auth";
 export default {
@@ -184,6 +184,7 @@ export default {
                 <Button type="primary" size="small" ghost on={{
                   ['click']:_ => {
                     this.$refs['show'].setId(row.id)
+                    this.$refs['show'].setDepId(this.queryObj.department_id)
                     this.$refs['show'].show()
                   }
                 }}>
@@ -210,7 +211,7 @@ export default {
           fixed: "right",
           label: "填报数量",
           width: 116,
-          prop:''
+          prop:'records_count'
         },
       ],
       type: "add",
@@ -220,7 +221,7 @@ export default {
         category_id: "",
         department_id:'',
         title: "",
-        month:'',
+        belongs_year_month:'',
         content: "",
         files: "",
       },
@@ -235,6 +236,7 @@ export default {
     this.queryObj = query
     this.form.department_id = this.queryObj.department_id
     this.select.category_type_id = this.queryObj.category_type_id
+    this.select.department_id = this.queryObj.department_id
   },
   methods: {
     getToken,
@@ -387,7 +389,7 @@ export default {
             category_id: "",
             department_id:'',
             title: "",
-            month:'',
+            belongs_year_month:'',
             content: "",
             files: "",
         }
diff --git a/src/views/departmentH5/form/show.vue b/src/views/departmentH5/form/show.vue
index e865a31..5f5e560 100644
--- a/src/views/departmentH5/form/show.vue
+++ b/src/views/departmentH5/form/show.vue
@@ -100,6 +100,9 @@ export default {
     setId (id) {
       this.select.category_id = id;
     },
+    setDepId(id){
+      this.select.department_id = id;
+    },
     getData () {
       this.$refs['xyTable'].getTableData()
     }