From bba6641c63d520b64df45f17a27d55ca8ee4bb8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Mon, 28 Aug 2023 14:00:05 +0800
Subject: [PATCH 1/2] 1

---
 src/views/netManage/qlzxTj/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/netManage/qlzxTj/index.vue b/src/views/netManage/qlzxTj/index.vue
index 5bec5bd..1398b7e 100644
--- a/src/views/netManage/qlzxTj/index.vue
+++ b/src/views/netManage/qlzxTj/index.vue
@@ -87,9 +87,9 @@
           <dict-tag :options="dict.type.tc_zx_tj" :value="scope.row.type" />
         </template>
       </el-table-column>
-      <el-table-column label="年月" align="center" prop="yearMonth" width="180">
+      <el-table-column label="年月" align="center" prop="monthYear" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.yearMonth, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.monthYear, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="数量" align="center" prop="count" />
@@ -167,11 +167,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="年月" prop="yearMonth">
+        <el-form-item label="年月" prop="monthYear">
           <el-date-picker
             clearable
             size="small"
-            v-model="form.yearMonth"
+            v-model="form.monthYear"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择年月"
@@ -213,7 +213,7 @@
         </el-descriptions-item>
 
         <el-descriptions-item label="年月">{{
-          form.yearMonth
+          form.monthYear
         }}</el-descriptions-item>
 
         <el-descriptions-item label="数量">{{
@@ -327,7 +327,7 @@ export default {
 
         type: null,
 
-        yearMonth: null,
+        monthYear: null,
 
         count: null,
       };

From 1b0d44ed1443e80e29e5a4ca9396bc88a9156aaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Mon, 28 Aug 2023 14:16:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d9035d3..ca5d9b6 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -12,7 +12,7 @@ const user = {
     townList: [],
     treeProps: {
       label: "label",
-      value: "label",
+      value: "id",
       checkStrictly: true,
     },
     userId: null,