修改价格指数页面，指数的属性名，修改修改或新增对话框的下拉框

src/views/etype/etype/index.vue

@@ -303,7 +303,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加etype";
+      this.title = "添加企业分类";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -312,7 +312,7 @@ export default {
       getEtype(number).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改etype";
+        this.title = "修改企业分类";
       });
     },
     /** 提交按钮 */
@@ -360,7 +360,7 @@ export default {
       );
     },
     handleImport() {
-      this.upload.title = "分类数据导入";
+      this.upload.title = "企业分类数据导入";
       this.upload.open = true;
     },
     /** 下载模板操作 */

src/views/industry_run/index.vue

@@ -1,4 +1,5 @@
 <template>
+<!-- 企业运行数据 -->
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="企业名称" prop="enterpriseName">

src/views/priceindex/priceindex/index.vue

@@ -1,21 +1,57 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="月份" prop="month">
-        <el-input
-          v-model="queryParams.month"
-          placeholder="请输入月份"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="企业名称" prop="name">
+        <el-select v-model="queryParams.name" style="width: 100%" filterable clearable>
+          <el-option
+            v-for="item in enterpriseData"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="年份" prop="year">
-        <el-input
+        <!-- <el-input
           v-model="queryParams.year"
           placeholder="请输入年份"
           clearable
           @keyup.enter.native="handleQuery"
-        />
+        /> -->
+        <el-select v-model="queryParams.year" style="width: 100%" filterable clearable>
+            <el-option
+              v-for="key in yearsOptions"
+              :key="key"
+              :label="key"
+              :value="key"
+            >
+            </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="月份" prop="month">
+        <!-- <el-input
+          v-model="queryParams.month"
+          placeholder="请输入月份"
+          clearable
+          @keyup.enter.native="handleQuery"
+        /> -->
+        <el-select v-model="queryParams.month" filterable style="width: 100%" clearable>
+            <el-option
+              v-for="key in monthSearchOptions"
+              :key="key"
+              :label="key"
+              :value="key"
+            >
+            </el-option>
+          </el-select>
       </el-form-item>
       <el-form-item label="单位" prop="unit">
         <el-input
@@ -33,17 +69,25 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="指数" prop="index">
+      <!-- <el-form-item label="指数" prop="indexv">
         <el-input
-          v-model="queryParams.index"
+          v-model="queryParams.indexv"
           placeholder="请输入指数"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -56,7 +100,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['priceindex:priceindex:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -67,7 +112,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['priceindex:priceindex:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -78,7 +124,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['priceindex:priceindex:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -88,7 +135,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['priceindex:priceindex:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -100,18 +148,29 @@
           >导入</el-button
         >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="priceindexList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="priceindexList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="月份" align="center" prop="month" />
+      <el-table-column label="企业名称" align="center" prop="name" />
       <el-table-column label="年份" align="center" prop="year" />
+      <el-table-column label="月份" align="center" prop="month" />
       <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="创建人" align="center" prop="creator" />
-      <el-table-column label="指数" align="center" prop="index" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="指数" align="center" prop="indexv" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -119,20 +178,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['priceindex:priceindex:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['priceindex:priceindex:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -142,17 +203,53 @@
     <!-- 添加或修改priceindex对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="代码" prop="id">
-          <el-input v-model="form.id" placeholder="请输入代码" />
+        <el-form-item label="代码" prop="code">
+          <el-select v-model="form.code" style="width: 100%" filterable>
+            <el-option
+              v-for="item in industryData"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <!-- <el-input v-model="form.code" placeholder="请输入代码" /> -->
         </el-form-item>
         <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="月份" prop="month">
-          <el-input v-model="form.month" placeholder="请输入月份" />
+          <el-select v-model="form.name" style="width: 100%" filterable>
+            <el-option
+              v-for="item in enterpriseData"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <!-- <el-input v-model="form.name" type="textarea" placeholder="请输入内容" /> -->
         </el-form-item>
         <el-form-item label="年份" prop="year">
-          <el-input v-model="form.year" placeholder="请输入年份" />
+          <el-select v-model="form.year" style="width: 100%" filterable>
+            <el-option
+              v-for="key in yearsOptions"
+              :key="key"
+              :label="key"
+              :value="key"
+            >
+            </el-option>
+          </el-select>
+          <!-- <el-input v-model="form.year" placeholder="请输入年份" /> -->
+        </el-form-item>
+        <el-form-item label="月份" prop="month">
+          <el-select v-model="form.month" filterable style="width: 100%">
+            <el-option
+              v-for="key in monthOptions"
+              :key="key"
+              :label="key"
+              :value="key"
+            >
+            </el-option>
+          </el-select>
+          <!-- <el-input v-model="form.month" placeholder="请输入月份" /> -->
         </el-form-item>
         <el-form-item label="单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入单位" />
@@ -160,8 +257,8 @@
         <el-form-item label="创建人" prop="creator">
           <el-input v-model="form.creator" placeholder="请输入创建人" />
         </el-form-item>
-        <el-form-item label="指数" prop="index">
-          <el-input v-model="form.index" placeholder="请输入指数" />
+        <el-form-item label="指数" prop="indexv">
+          <el-input v-model.number="form.indexv" placeholder="请输入指数" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -208,8 +305,20 @@
 </template>
 
 <script>
-import { listPriceindex, getPriceindex, delPriceindex, addPriceindex, updatePriceindex } from "@/api/priceindex/priceindex";
+import {
+  listPriceindex,
+  getPriceindex,
+  delPriceindex,
+  addPriceindex,
+  updatePriceindex,
+} from "@/api/priceindex/priceindex";
 import { getToken } from "@/utils/auth";
+// 获取行业
+import { listAllIndustry } from "@/api/industry/industry";
+// 获取企业
+import { listAllEnterprise } from "@/api/enterprise/enterprise";
+// 获取年度数据
+import { getYearData } from "@/api/home";
 export default {
   name: "Priceindex",
   data() {
@@ -241,12 +350,19 @@ export default {
         year: null,
         unit: null,
         creator: null,
-        index: null
+        indexv: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        code: { required: true, message: "请选择行业", trigger: "blur" },
+        name: { required: true, message: "请选择企业", trigger: "blur" },
+        month: { required: true, message: "请填写月份", trigger: "blur" },
+        year: { required: true, message: "请填写年份", trigger: "blur" },
+        unit: { required: true, message: "请填写单位", trigger: "blur" },
+        creator: { required: true, message: "请填写创建人", trigger: "blur" },
+        indexv: { required: true, message: "请填写指数", trigger: "blur" },
       },
       upload: {
         // 是否显示弹出层（用户导入）
@@ -261,21 +377,82 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/priceindex/priceindex/importData",
       },
+      industryData: [],
+      enterpriseData: [],
+      yearsOptions: [],
+      monthMap: new Map(),
     };
   },
   created() {
     this.getList();
+    this.initSelectData();
+  },
+  computed: {
+    monthOptions() {
+      const options = this.form.year ? this.monthMap.get(this.form.year) : [];
+      return options || []; // 以防得到 undefined
+    },
+    monthSearchOptions() {
+      const options = this.queryParams.year ? this.monthMap.get(this.queryParams.year) : [];
+      return options || []; // 以防得到 undefined
+    },
   },
   methods: {
     /** 查询priceindex列表 */
     getList() {
       this.loading = true;
-      listPriceindex(this.queryParams).then(response => {
+      listPriceindex(this.queryParams).then((response) => {
         this.priceindexList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    initSelectData() {
+      // 获取行业数据
+      listAllIndustry().then((response) => {
+        this.industryData = response.rows.map((item) => {
+          return {
+            value: item.code,
+            label: item.code + item.industryName,
+            name: item.industryName,
+          };
+        });
+      });
+      // 获取企业数据
+      listAllEnterprise().then((response) => {
+        this.enterpriseData = response.rows.map((item) => {
+          return {
+            value: item.enterpriseName,
+            label: item.enterpriseName,
+          };
+        });
+      });
+      // 获取年度数据
+      getYearData().then((response) => {
+        this.yearsOptions = response.rows[0].years;
+        this.monthMap = this.generateMonthlyData(this.yearsOptions);
+      });
+    },
+    generateMonthlyData(years) {
+      const currentYear = new Date().getFullYear();
+      const currentMonth = new Date().getMonth() + 1;
+      const monthlyData = new Map();
+      years.forEach((year) => {
+        if (year === currentYear) {
+          // 当前年份，判断当前月份
+          const months = Array.from({ length: currentMonth }, (_, i) => i + 1);
+          monthlyData.set(year, months); // 设置当前年份的已过月份
+        } else if (year < currentYear) {
+          // 过去的年份包含所有12个月
+          monthlyData.set(year, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
+        } else {
+          // 未来的年份
+          monthlyData.set(year, []);
+        }
+      });
+
+      return monthlyData;
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -284,13 +461,13 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
+        code: null,
         name: null,
         month: null,
         year: null,
         unit: null,
         creator: null,
-        index: null
+        indexv: null,
       };
       this.resetForm("form");
     },
@@ -306,38 +483,43 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加priceindex";
+      this.title = "添加数据";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getPriceindex(id).then(response => {
+      const id = row.id || this.ids;
+      getPriceindex(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改priceindex";
+        this.title = "修改数据";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      // console.log(this.form)
+      this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.industryName = this.industryData.filter(
+            (item) => item.value === this.form.code
+          )[0].name;
+          // console.log(this.form)
           if (this.form.id != null) {
-            updatePriceindex(this.form).then(response => {
+            updatePriceindex(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addPriceindex(this.form).then(response => {
+            addPriceindex(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -349,18 +531,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then(function() {
-        return delPriceindex(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delPriceindex(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('priceindex/priceindex/export', {
-        ...this.queryParams
-      }, `priceindex_${new Date().getTime()}.xlsx`)
+      this.download(
+        "priceindex/priceindex/export",
+        {
+          ...this.queryParams,
+        },
+        `priceindex_${new Date().getTime()}.xlsx`
+      );
     },
     handleImport() {
       this.upload.title = "数据导入";
@@ -390,6 +580,6 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit();
     },
-  }
+  },
 };
 </script>