运检食堂代码修改5

src/views/canteen/personalConsumeRecords/index.vue

@@ -17,8 +17,8 @@
           range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="changeValue1" :clearable="false">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="食堂：" prop="carteenId">
+      <el-form-item label="地点：" prop="carteenId">
-        <el-select v-model="queryParams.carteenId" placeholder="请选择餐点" filterable>
+        <el-select v-model="queryParams.carteenId" placeholder="请选择全部" filterable>
           <el-option key="" label="全部" value=""> </el-option>
           <el-option v-for="item in canteenList" :key="item.id" :label="item.name" :value="item.id">
           </el-option>

src/views/canteen/pointsSearch/canteenChangeList.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
              label-width="68px">
-      <el-form-item label="选择时间：" prop="incomeTimeQuery" label-width="120px">
+      <el-form-item label="选择时间：" prop="incomeTimeQuery" label-width="100px">
         <el-date-picker
           v-model="queryParams.incomeTimeQuery"
           type="month"
@@ -10,6 +10,12 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="地点：" prop="carteenId">
+        <el-select v-model="queryParams.carteenId" placeholder="请选择地点" filterable>
+          <el-option v-for="item in canteenList" :key="item.id" :label="item.name" :value="item.id">
+          </el-option>
+        </el-select>
+      </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>
@@ -43,6 +49,7 @@
 
 <script>
 import {listCanteenChange} from "@/api/canteen/pointsSearch";
+import {listAllCanteen} from "@/api/canteen/pointsDistribution";
 
 export default {
   name: 'CanteenChangeList',
@@ -97,7 +104,9 @@ export default {
         cartePrice: [
           {required: true, message: "积分不能为空", trigger: "blur"}
         ],
-      }
+      },
+      // 食堂数据
+      canteenList: [],
     };
   },
   created() {
@@ -111,6 +120,16 @@ export default {
     // 初始化数据
     initData() {
       this.getList();
+      this.initCanteenList();
+    },
+    // 获取食堂列表
+    initCanteenList() {
+      listAllCanteen().then(res => {
+        if (res.code === 200) {
+          this.canteenList = res.data;
+          this.canteenList.unshift({id: null, name: '全部'});
+        }
+      })
     },
     /** 查询菜谱CM_CARTE列表 */
     getList() {

src/views/canteen/pointsSearch/canteenSubsidyList.vue

@@ -2,8 +2,8 @@
   <!--  食堂积分补贴 -->
   <div>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-             label-width="68px">
+             label-width="100px">
-      <el-form-item label="补贴类型：" prop="incomeType" label-width="120px">
+      <el-form-item label="补贴类型：" prop="incomeType">
         <el-select v-model="queryParams.incomeType" placeholder="请选择补贴类型" clearable>
           <el-option
             v-for="item in incomeTypeList"
@@ -13,7 +13,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="选择日期：" prop="incomeTimeQuery" label-width="120px">
+      <el-form-item label="选择日期：" prop="incomeTimeQuery">
         <el-date-picker
           v-model="queryParams.incomeTimeQuery"
           type="month"
@@ -21,6 +21,12 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="地点：" prop="carteenId" label-width="68px">
+        <el-select v-model="queryParams.carteenId" placeholder="请选择地点" filterable>
+          <el-option v-for="item in canteenList" :key="item.id" :label="item.name" :value="item.id">
+          </el-option>
+        </el-select>
+      </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>
@@ -58,6 +64,7 @@
 <script>
 import {listCanteenSubsidy} from "@/api/canteen/pointsSearch";
 import {parseTime} from "../../../utils/bonus";
+import {listAllCanteen} from "@/api/canteen/pointsDistribution";
 export default {
   name: 'CanteenSubsidyList',
   data() {
@@ -114,7 +121,9 @@ export default {
         cartePrice: [
           {required: true, message: "积分不能为空", trigger: "blur"}
         ],
-      }
+      },
+      // 食堂数据
+      canteenList: [],
     };
   },
   created() {
@@ -129,6 +138,16 @@ export default {
     // 初始化数据
     initData() {
       this.getList();
+      this.initCanteenList();
+    },
+    // 获取食堂列表
+    initCanteenList() {
+      listAllCanteen().then(res => {
+        if (res.code === 200) {
+          this.canteenList = res.data;
+          this.canteenList.unshift({id: null, name: '全部'});
+        }
+      })
     },
     /** 查询菜谱CM_CARTE列表 */
     getList() {

src/views/canteen/pointsSearch/personalChangeList.vue

@@ -17,6 +17,12 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="地点：" prop="carteenId">
+        <el-select v-model="queryParams.carteenId" placeholder="请选择地点" filterable>
+          <el-option v-for="item in canteenList" :key="item.id" :label="item.name" :value="item.id">
+          </el-option>
+        </el-select>
+      </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>
@@ -52,7 +58,7 @@
 import {listPersonalChange} from "@/api/canteen/pointsSearch";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {deptUserTree} from "@/api/canteen/pointsDistribution";
+import {deptUserTree, listAllCanteen} from "@/api/canteen/pointsDistribution";
 export default {
   name: 'PersonalChangeList',
   components: {
@@ -110,6 +116,8 @@ export default {
         ],
       },
       deptOptions: [],
+      // 食堂数据
+      canteenList: [],
     };
   },
   created() {
@@ -140,6 +148,16 @@ export default {
     initData() {
       this.getList();
       this.initDeptUserTree();
+      this.initCanteenList();
+    },
+    // 获取食堂列表
+    initCanteenList() {
+      listAllCanteen().then(res => {
+        if (res.code === 200) {
+          this.canteenList = res.data;
+          this.canteenList.unshift({id: null, name: '全部'});
+        }
+      })
     },
     initDeptUserTree() {
       deptUserTree().then(res => {

src/views/canteen/pointsSearch/personalRechargeList.vue

@@ -17,6 +17,12 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="地点：" prop="carteenId">
+        <el-select v-model="queryParams.carteenId" placeholder="请选择地点" filterable>
+          <el-option v-for="item in canteenList" :key="item.id" :label="item.name" :value="item.id">
+          </el-option>
+        </el-select>
+      </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>
@@ -48,7 +54,7 @@
 import {listPersonalRecharge} from "@/api/canteen/pointsSearch";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {deptUserTree} from "@/api/canteen/pointsDistribution";
+import {deptUserTree, listAllCanteen} from "@/api/canteen/pointsDistribution";
 
 export default {
   name: 'PersonalRechargeList',
@@ -102,6 +108,8 @@ export default {
         ],
       },
       deptOptions: [],
+      // 食堂数据
+      canteenList: [],
     };
   },
   created() {
@@ -128,6 +136,16 @@ export default {
     initData() {
       this.getList();
       this.initDeptUserTree();
+      this.initCanteenList();
+    },
+    // 获取食堂列表
+    initCanteenList() {
+      listAllCanteen().then(res => {
+        if (res.code === 200) {
+          this.canteenList = res.data;
+          this.canteenList.unshift({id: null, name: '全部'});
+        }
+      })
     },
     initDeptUserTree() {
       deptUserTree().then(res => {

src/views/canteen/pointsSearch/personalSubsidyList.vue

@@ -17,6 +17,12 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="地点：" prop="carteenId" label-width="68px">
+        <el-select v-model="queryParams.carteenId" placeholder="请选择地点" filterable>
+          <el-option v-for="item in canteenList" :key="item.id" :label="item.name" :value="item.id">
+          </el-option>
+        </el-select>
+      </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>
@@ -48,7 +54,7 @@
 import {listPersonalSubsidy} from "@/api/canteen/pointsSearch";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {deptUserTree} from "@/api/canteen/pointsDistribution";
+import {deptUserTree, listAllCanteen} from "@/api/canteen/pointsDistribution";
 
 
 export default {
@@ -108,6 +114,8 @@ export default {
         ],
       },
       deptOptions: [],
+      // 食堂数据
+      canteenList: [],
     };
   },
   created() {
@@ -138,6 +146,16 @@ export default {
     initData() {
       this.getList();
       this.initDeptUserTree();
+      this.initCanteenList();
+    },
+    // 获取食堂列表
+    initCanteenList() {
+      listAllCanteen().then(res => {
+        if (res.code === 200) {
+          this.canteenList = res.data;
+          this.canteenList.unshift({id: null, name: '全部'});
+        }
+      })
     },
     initDeptUserTree() {
       deptUserTree().then(res => {