Browse Source

就餐人员记录导出

yanliming 4 năm trước cách đây
mục cha
commit
559493985c

+ 0 - 4
src/views/base/canteenDiningRecord-list.vue

@@ -50,10 +50,6 @@
         </el-form-item>
       </el-form>
       <el-divider></el-divider>
-
-        <el-row class="button-group">
-        <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">导出数据</el-button>
-        </el-row>
       <el-table
         :data="tableData"
         style="min-height:400px;"

+ 59 - 15
src/views/base/canteenDiningRecordAll-list.vue

@@ -22,7 +22,13 @@
         <el-input type="text" size="mini" v-model="queryModel.jobNumber"></el-input>
       </el-form-item>
       <el-form-item label="部门" prop="companyId">
-        <el-input type="text" size="mini" v-model="queryModel.companyId"></el-input>
+        <el-select-tree
+          size="mini"
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>&nbsp;
       </el-form-item>
       <el-form-item label="起止时间" prop="timeRanges">
         <el-date-picker
@@ -54,7 +60,7 @@
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
-      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">导出数据</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="exportXls">导出数据</el-button>
     </el-row>
     <el-table
       ref="formTable"
@@ -89,6 +95,9 @@
 <script>
 import canteenDiningRecordApi from "@/api/base/canteenDiningRecord";
 import "nprogress/nprogress.css"; // progress bar style
+import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
+import pageUtil from "@/utils/page";
 
 export default {
   name: 'BaseCanteenOutsourcerBalanceList',
@@ -120,18 +129,7 @@ export default {
       companyResult: [],
       tableHeight: 400,
       dialogVisible: false,
-      ruleDeviceId: "",
-      ruleModel: {
-        mode: "",
-        needCap: "",
-        needMask: "",
-        measureTemperature: "",
-        type: "",
-        minimum: "",
-        maximum: "",
-        preAlarmOffset: "",
-        alarmThreshold: ""
-      },
+      treeData: [],
       props: {
         // 配置项(必选)
         value: "id",
@@ -145,11 +143,48 @@ export default {
     };
   },
   created() {
+    var self = this;
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
 
+    this.loadTree();
   },
   methods: {
     indexMethod(index) {
       return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+        loadTree() {
+      var formData = new FormData();
+
+      companyInfoApi.loadChildren(formData).then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    loadChildren(tree, treeNode, resolve) {
+      console.log(tree);
+
+      var formData = new FormData();
+      formData.append("parentId", tree.id);
+
+      companyInfoApi.loadChildren(formData).then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          resolve(jsonData.data);
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
     },
     changePage(pageIndex,exportFlag) {
       var self = this;
@@ -171,7 +206,13 @@ export default {
       }
 
     formData.append("name", self.queryModel.name);
-    formData.append("companyId", self.queryModel.companyId);
+    if(self.queryModel.companyId!=null){
+      formData.append("companyId", self.queryModel.companyId);
+    }
+    else{
+      formData.append("companyId", "");
+    }
+    
     formData.append("jobNumber", self.queryModel.jobNumber);
 
     if (self.queryModel.timeRanges == null) {
@@ -311,6 +352,9 @@ export default {
       this.changePage(1,true);
     }
   },
+  components: {
+    "el-select-tree": SelectTree,
+  },
   mounted: function() {
     this.changePage(1);
   },