Merge branch 'master' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/taicangZongzhi-PC into Lvtianfang

src/store/modules/user.js

@@ -12,7 +12,7 @@ const user = {
     townList: [],
     treeProps: {
       label: "label",
-      value: "label",
+      value: "id",
       checkStrictly: true,
     },
     userId: null,

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,
       };