前端: 目录管理 导出bug，导出可按查询条件导出

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/income.vue

@@ -355,8 +355,22 @@
         }
         this.loading = true
         let params = {
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+          Status: '2',
           CatalogType: this.formData.CatalogType
         }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn && this.CreateOn.length === 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        // 查询条件
+        Object.assign(params, this.searchForm)
         api.exportExcelIncome(params, this.$axios).then(res => {
           this.loading = false
           let docurl = res.data

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/index.vue

@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column sortable width="250" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
         <el-table-column sortable min-width="400" align="left" prop="Business" label="业务范围"></el-table-column>
-        <el-table-column sortable width="100" align="center" show-overflow-tooltip label="有效期至">
+        <el-table-column sortable width="100" prop="ValidityTo" align="center" show-overflow-tooltip label="有效期至">
           <template slot-scope="scope">
             {{jsTimeHandle(scope.row.ValidityTo)}}
           </template>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogselect/income.vue

@@ -262,8 +262,22 @@
         }
         this.loading = true
         let params = {
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+          Status: '2',
           CatalogType: this.formData.CatalogType
         }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn && this.CreateOn.length === 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        // 查询条件
+        Object.assign(params, this.searchForm)
         api.exportExcelIncome(params, this.$axios).then(res => {
           this.loading = false
           let docurl = res.data

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogselect/index.vue

@@ -57,7 +57,7 @@
         </el-table-column>
         <el-table-column sortable width="250" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
         <el-table-column sortable min-width="400" align="left" prop="Business" label="业务范围"></el-table-column>
-        <el-table-column sortable width="125" align="center" show-overflow-tooltip label="有效期至">
+        <el-table-column sortable width="125" prop="ValidityTo" align="center" show-overflow-tooltip label="有效期至">
           <template slot-scope="scope">
             {{jsTimeHandle(scope.row.ValidityTo)}}
           </template>