Browse Source

接口对接

zhangdan 4 years ago
parent
commit
8b8a5dbdf6

+ 10 - 0
src/api/boxSetting.js

@@ -48,3 +48,13 @@ export const deleteBoxSetting = (params) => {
     method: 'get'
   })
 }
+
+// 导出
+export const exportDevice = (params) => {
+  return axios.request({
+    url: 'device/exportDevice',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 1 - 0
src/api/ledouCollectRecord.js

@@ -31,6 +31,7 @@ export const sellerList = params => {
   })
 }
 
+// 导出
 export const exportOffPartnerGoldLog = (params) => {
   return axios.request({
     url: 'offPartnerGoldLog/exportGoldLog',

+ 10 - 0
src/api/order.js

@@ -51,3 +51,13 @@ export const orderExport = (params) => {
     responseType: 'blob'
   })
 }
+
+// 导出订单明细
+export const orderDetailExport = (params) => {
+  return axios.request({
+    url: 'orderGoods/exportOrderGoodDetails',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 10 - 0
src/api/shopSetting.js

@@ -44,6 +44,16 @@ export const saveGoodsClass = (params) => {
   })
 }
 
+// 排序 上移下移
+export const goodsChangeSort = (params) => {
+  const url = `goodsType/swapGoodTypeSort/${params.currentId}/${params.id}`
+  return axios.request({
+    url: url,
+    data: {},
+    method: 'post'
+  })
+}
+
 /* 供货商管理 */
 
 // 列表

+ 51 - 1
src/views/equipmentManage/equipment/equipment.vue

@@ -58,6 +58,7 @@
           <a-col :span="6">
             <a-button class="handle-btn serach-btn" id="equipment-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
             <a-button class="handle-btn" type="" id="equipment-btn-reset" @click="handleReset">重置</a-button>
+						<a-button class="handle-btn export-btn" id="ledouCollectRecord-export" :loading="loading" @click="handleExport">导出</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -102,12 +103,14 @@
 import { STable, VSelect } from '@/components'
 import equipmentLogModal from './logModal.vue'
 import { deviceList } from '@/api/device'
-import { deviceTypeListQuery } from '@/api/boxSetting'
+import { deviceTypeListQuery,exportDevice } from '@/api/boxSetting'
+import moment from 'moment'
 export default {
   name: 'Equipment',
   components: { STable, VSelect, equipmentLogModal },
   data () {
     return {
+			loading: false,
       formItemLayout: {
         labelCol: { span: 7 },
         wrapperCol: { span: 17 }
@@ -169,6 +172,43 @@ export default {
       this.queryParam.state = undefined
       this.$refs.table.refresh(true)
     },
+		// 导出
+		handleExport () {
+		  const params = this.queryParam
+		  // if (this.queryOrderDate && this.queryOrderDate.length) {
+		  //   params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
+		  //   params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
+		  // } else {
+		  //   params.beginDate = ''
+		  //   params.endDate = ''
+		  // }
+		  // if (!params.beginDate && !params.endDate) {
+		  //   this.$message.error('请先选择收取时间后查询并导出!')
+		  //   return
+		  // }
+		  // // 判断两个时间段是否相差m个月  第二个参数指相差单位,第三个参数指是否返回浮点形式(小数)
+		  // if (moment(params.endDate).diff(moment(params.beginDate), 'months', true) > 3) {
+		  //   this.$message.error('仅支持导出最多3个月的数据,请先修改收取时间再进行导出!')
+		  //   return
+		  // }
+		  this.loading = true
+		  exportDevice(params).then(res => {
+		    this.loading = false
+		    this.download(res)
+		  })
+		},
+		download (data) {
+		  if (!data) { return }
+		  const url = window.URL.createObjectURL(new Blob([data]))
+		  const link = document.createElement('a')
+		  link.style.display = 'none'
+		  link.href = url
+		  const a = moment().format('YYYYMMDDhhmmss')
+		  const fname = '回收箱体明细-' + a
+		  link.setAttribute('download', fname + '.xlsx')
+		  document.body.appendChild(link)
+		  link.click()
+		},
     //  查看掉线日志
     checkLog (row) {
       this.srcDeviceCode = row ? row.srcDeviceCode : null
@@ -212,6 +252,16 @@ export default {
       .serach-btn{
         margin-right: 10px;
       }
+			.export-btn{
+			  background-color: #ff9900;
+			  border-color: #ff9900;
+			  color: #fff;
+			  margin-left: 10px;
+			}
+			.export-btn.ant-btn:focus:not(.ant-btn-primary):not(.ant-btn-danger), .export-btn.ant-btn:hover:not(.ant-btn-primary):not(.ant-btn-danger){
+			  color: #fff;
+			  border-color: #ff9900;
+			}
     }
     .actionBtn {
     	font-size: 20px;

+ 39 - 3
src/views/shop/shopOrder.vue

@@ -51,7 +51,7 @@
 			  class="export-btn"
 			  id="shopOrder-btn-exportDetail"
 			  :loading="loadingDetail"
-			  @click="handleExport">导出订单明细</a-button>
+			  @click="handleOrderExport">导出订单明细</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -81,7 +81,7 @@
 import { STable, VSelect } from '@/components'
 import getDate from '@/libs/getDate.js'
 import moment from 'moment'
-import { orderList, orderExport } from '@/api/order'
+import { orderList, orderExport,orderDetailExport } from '@/api/order'
 export default {
   name: 'ShopOrder',
   components: { STable, VSelect },
@@ -206,7 +206,43 @@ export default {
       link.setAttribute('download', fname + '.xlsx')
       document.body.appendChild(link)
       link.click()
-    }
+    },
+		// 导出订单明细
+		handleOrderExport () {
+			const params = {
+				beginDate: this.queryParam.beginDate == null ? getDate.getToday().starttime : this.queryParam.beginDate,
+				endDate: this.queryParam.endDate == null ? getDate.getToday().endtime : this.queryParam.endDate,
+				customerMobile: this.queryParam.customerMobile,
+				orderSn: this.queryParam.orderSn,
+				orderState: this.queryParam.orderState
+			}
+			if (!params.beginDate && !params.endDate) {
+				this.$message.error('请先选择下单时间后查询并导出!')
+				return
+			}
+			// 判断两个时间段是否相差m个月  第二个参数指相差单位,第三个参数指是否返回浮点形式(小数)
+			if (moment(params.endDate).diff(moment(params.beginDate), 'months', true) > 3) {
+				this.$message.error('仅支持导出最多3个月数据,请先修改下单时间再进行导出!')
+				return
+			}
+			this.loadingDetail = true
+			orderDetailExport(params).then(res => {
+				this.loadingDetail = false
+				this.download(res)
+			})
+		},
+		download (data) {
+			if (!data) { return }
+			const url = window.URL.createObjectURL(new Blob([data]))
+			const link = document.createElement('a')
+			link.style.display = 'none'
+			link.href = url
+			const a = moment().format('YYYYMMDDhhmmss')
+			const fname = '订单商品明细-' + a
+			link.setAttribute('download', fname + '.xlsx')
+			document.body.appendChild(link)
+			link.click()
+		}
   }
 }
 </script>

+ 240 - 278
src/views/shopSetting/goodsClass.vue

@@ -1,290 +1,253 @@
 <template>
-  <a-card :bordered="false" class="goodsClass-page-info">
-    <!-- 搜索框 -->
-    <div class="goodsClass-search">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="20">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="商品分类名称" :label-col="{ span:8 }" :wrapper-col="{ span: 16 }">
-              <a-input allowClear v-model="searchData.name" :maxLength="30" placeholder="请输入" id="goodsClass-name" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="goodsClass-refresh">查询</a-button>
-            <a-button type="" @click="resetForm" id="goodsClass-resetForm">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <div class="add">
-      <a-button
-        type="primary"
-        icon="plus"
-        class="addBtn"
-        @click="showModal"
-        id="goodsClass-showModal"
-        v-hasPermission="'B_goodsClass_add'">新增</a-button>
-    </div>
-    <!-- table列表 -->
-    <s-table
-      ref="table"
-      size="default"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      bordered>
-      <span slot="action" slot-scope="text, record">
-        <a-icon
-          v-hasPermission="'B_goodsClass_edit'"
-          type="edit"
-          id="goodsClass-handleEdit"
-          title="编辑"
-          class="actionBtn icon-blues"
-          @click="handleEdit(record)" />
-        <span v-if="!$hasPermissions('B_goodsClass_edit')">--</span>
-      </span>
-      <span slot="state" slot-scope="text, record">
-        <a-switch
-          v-hasPermission="'B_goodsClass_enable'"
-          checkedChildren="启用"
-          unCheckedChildren="禁用"
-          id="goodsClass-changeFlagHandle"
-          :checked="record.state == 1 ? true : false"
-          @change="changeFlagHandle(text, record)" />
-        <span v-if="!$hasPermissions('B_goodsClass_enable')">--</span>
-      </span>
-      <!-- 排序 -->
-      <template slot="sort" slot-scope="text, record, index">
-        <a-icon
-          title="下移"
-          v-if="index != list.length-1"
-          :style="{ fontSize: '18px', color: '#1891FF', cursor: 'pointer',padding:'0 10px' }"
-          @click="changeSort(index,record,0)"
-          type="arrow-down" />
-        <a-icon
-          title="上移"
-          v-if="index != 0"
-          :style="{ fontSize: '18px', color: '#1891FF',cursor: 'pointer', padding:'0 10px' }"
-          @click="changeSort(index,record,1)"
-          type="arrow-up" />
-        <span v-if="list.length===1">--</span>
-      </template>
-    </s-table>
-    <add-goodsClass-modal
-      :itemId="itemId"
-      :itemData="itemData"
-      :openGoodClassModal="openGoodClassModal"
-      @refresh="$refs.table.refresh(true)"
-      @close="cancel"></add-goodsClass-modal>
-  </a-card>
+	<a-card :bordered="false" class="goodsClass-page-info">
+		<!-- 搜索框 -->
+		<div class="goodsClass-search">
+			<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+				<a-row :gutter="20">
+					<a-col :md="6" :sm="24">
+						<a-form-item label="商品分类名称" :label-col="{ span:8 }" :wrapper-col="{ span: 16 }">
+							<a-input allowClear v-model="searchData.name" :maxLength="30" placeholder="请输入" id="goodsClass-name" />
+						</a-form-item>
+					</a-col>
+					<a-col :md="6" :sm="24">
+						<a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="goodsClass-refresh">查询</a-button>
+						<a-button type="" @click="resetForm" id="goodsClass-resetForm">重置</a-button>
+					</a-col>
+				</a-row>
+			</a-form>
+		</div>
+		<div class="add">
+			<a-button type="primary" icon="plus" class="addBtn" @click="showModal" id="goodsClass-showModal" v-hasPermission="'B_goodsClass_add'">新增</a-button>
+		</div>
+		<!-- table列表 -->
+		<s-table ref="table" size="default" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
+			<span slot="action" slot-scope="text, record">
+				<a-icon v-hasPermission="'B_goodsClass_edit'" type="edit" id="goodsClass-handleEdit" title="编辑" class="actionBtn icon-blues"
+				 @click="handleEdit(record)" />
+				<span v-if="!$hasPermissions('B_goodsClass_edit')">--</span>
+			</span>
+			<span slot="state" slot-scope="text, record">
+				<a-switch v-hasPermission="'B_goodsClass_enable'" checkedChildren="启用" unCheckedChildren="禁用" id="goodsClass-changeFlagHandle"
+				 :checked="record.state == 1 ? true : false" @change="changeFlagHandle(text, record)" />
+				<span v-if="!$hasPermissions('B_goodsClass_enable')">--</span>
+			</span>
+			<!-- 排序 -->
+			<template slot="sort" slot-scope="text, record, index">
+				<a-icon title="下移" v-if="index != list.length-1" :style="{ fontSize: '18px', color: '#1891FF', cursor: 'pointer',padding:'0 10px' }"
+				 @click="changeSort(index,record,0)" type="arrow-down" />
+				<a-icon title="上移" v-if="index != 0" :style="{ fontSize: '18px', color: '#1891FF',cursor: 'pointer', padding:'0 10px' }"
+				 @click="changeSort(index,record,1)" type="arrow-up" />
+				<span v-if="list.length===1">--</span>
+			</template>
+		</s-table>
+		<add-goodsClass-modal :itemId="itemId" :itemData="itemData" :openGoodClassModal="openGoodClassModal" @refresh="$refs.table.refresh(true)"
+		 @close="cancel"></add-goodsClass-modal>
+	</a-card>
 </template>
 
 <script>
-import {
-  Upload,
-  STable,
-  VSelect
-} from '@/components'
-import addGoodsClassModal from './addGoodsClassModal.vue'
-import {
-  getGoodsClassList,
-  changeGoodsStatus
-} from '@/api/shopSetting.js'
+	import {
+		Upload,
+		STable,
+		VSelect
+	} from '@/components'
+	import addGoodsClassModal from './addGoodsClassModal.vue'
+	import {
+		getGoodsClassList,
+		changeGoodsStatus,
+		goodsChangeSort
+	} from '@/api/shopSetting.js'
 
-export default {
-  components: {
-    STable,
-    Upload,
-    VSelect,
-    addGoodsClassModal
-  },
-  data () {
-    return {
-      searchData: {
-        name: ''
-      },
-      openGoodClassModal: false, // 默认关闭弹窗
-      itemId: null, // 编辑行id
-	  itemData: {}, // 编辑行数据
-      formLayout: 'horizontal',
-	  list: [], // 列表数据
-      form: this.$form.createForm(this),
-      // 表头
-      columns: [{
-        title: '序号',
-        dataIndex: 'no',
-        width: 60,
-        align: 'center'
-      },
-      {
-        title: '商品分类名称',
-        width: 100,
-        dataIndex: 'name',
-        align: 'center'
-      },
-      {
-        title: '订单起购金额',
-        width: 100,
-        dataIndex: 'goldLimit',
-        align: 'center'
-      },
-	  {
-	    title: '商城主页显示数量',
-	    width: 100,
-	    dataIndex: 'popularizeGoodsLimit',
-	    align: 'center'
-	  },
-      {
-        title: '状态',
-        width: 100,
-        dataIndex: 'state',
-        align: 'center',
-        scopedSlots: {
-          customRender: 'state'
-        }
-      },
-      {
-        title: '备注',
-        width: 100,
-        dataIndex: 'remarks',
-        align: 'center',
-        customRender: (text) => {
-          return text || '--'
-        }
-      },
-	  {
-	    title: '排序',
-	    width: 200,
-	    align: 'center',
-	    scopedSlots: {
-	      customRender: 'sort'
-	    }
-	  },
-      {
-        title: '操作',
-        align: 'center',
-        width: 100,
-        scopedSlots: {
-          customRender: 'action'
-        }
-      }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        return getGoodsClassList(
-          Object.assign(parameter, this.searchData)
-        ).then(res => {
-          this.list = res.data.list || []
-          const no = (res.data.pageNo - 1) * res.data.pageSize
-          if (res.status == 200) {
-            for (let i = 0; i < res.data.list.length; i++) {
-              const _item = res.data.list[i]
-              _item.no = no + i + 1
-            }
-            return res.data
-          }
-        })
-      }
-    }
-  },
-  beforeCreate () {
-    this.form = this.$form.createForm(this, {
-      name: 'validate_other'
-    })
-  },
-  methods: {
-    showModal () {
-      console.log('---新增')
-      this.itemId = null
-	  this.itemData = {}
-      this.openGoodClassModal = true
-    },
-    // 编辑
-    handleEdit (record) {
-      this.itemId = record.id
-	  this.itemData = record
-      console.log(this.itemId, '-------编辑')
-      this.openGoodClassModal = true
-    },
-    // 重置
-    resetForm () {
-      this.searchData.name = ''
-      this.$refs.table.refresh(true)
-    },
-    //
-    cancel () {
-      this.itemId = null
-      this.openGoodClassModal = false
-    },
-    // 更改启用禁用状态
-    changeFlagHandle (text, record) {
-      console.log(text)
-      const _this = this
-      const _data = {
-        id: record.id,
-        flag: record.state == 1 ? '0' : '1'
-      }
-      if (record.state == 1) {
-        this.$confirm({
-          title: '提示',
-          centered: true,
-          content: '商品分类被禁用后,该分类将不在显示给用户,确定禁用吗?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk () {
-            changeGoodsStatus(_data).then(res => {
-              if (res.status == 200) {
-                _this.$message.success(res.message)
-                _this.$refs.table.refresh()
-              }
-            })
-          }
-        })
-      } else {
-        changeGoodsStatus(_data).then(res => {
-          if (res.status == 200) {
-            _this.$message.success(res.message)
-            _this.$refs.table.refresh()
-          } else {
-            record.state = !record.state
-          }
-        })
-      }
-    },
-    // 上移 下移 排序 index:下标  item:数据  type:类型 0 下移 1 上移
-    changeSort (index, item, type) {
-	  const indexThat = type === 0 ? index + 1 : index - 1
-	  const params = [{
-	    'id': item.id,
-	    'sort': item.sort
-	  },
-	  {
-	    'id': this.list[indexThat].id,
-	    'sort': this.list[indexThat].sort
-	  }
-	  ]
-	  goodsUpdateSort(params).then(res => {
-	    if (res.status == 200) {
-	      this.$refs.table.refresh()
-	    } else {
-	      this.$message.error(res.message)
-	    }
-	  })
-    }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.resetForm()
-    })
-  }
-}
+	export default {
+		components: {
+			STable,
+			Upload,
+			VSelect,
+			addGoodsClassModal
+		},
+		data() {
+			return {
+				searchData: {
+					name: ''
+				},
+				openGoodClassModal: false, // 默认关闭弹窗
+				itemId: null, // 编辑行id
+				itemData: {}, // 编辑行数据
+				formLayout: 'horizontal',
+				list: [], // 列表数据
+				form: this.$form.createForm(this),
+				// 表头
+				columns: [{
+						title: '序号',
+						dataIndex: 'no',
+						width: 60,
+						align: 'center'
+					},
+					{
+						title: '商品分类名称',
+						width: 100,
+						dataIndex: 'name',
+						align: 'center'
+					},
+					{
+						title: '订单起购金额',
+						width: 100,
+						dataIndex: 'goldLimit',
+						align: 'center'
+					},
+					{
+						title: '商城主页显示数量',
+						width: 100,
+						dataIndex: 'popularizeGoodsLimit',
+						align: 'center'
+					},
+					{
+						title: '状态',
+						width: 100,
+						dataIndex: 'state',
+						align: 'center',
+						scopedSlots: {
+							customRender: 'state'
+						}
+					},
+					{
+						title: '备注',
+						width: 100,
+						dataIndex: 'remarks',
+						align: 'center',
+						customRender: (text) => {
+							return text || '--'
+						}
+					},
+					{
+						title: '排序',
+						width: 200,
+						align: 'center',
+						scopedSlots: {
+							customRender: 'sort'
+						}
+					},
+					{
+						title: '操作',
+						align: 'center',
+						width: 100,
+						scopedSlots: {
+							customRender: 'action'
+						}
+					}
+				],
+				// 加载数据方法 必须为 Promise 对象
+				loadData: parameter => {
+					return getGoodsClassList(
+						Object.assign(parameter, this.searchData)
+					).then(res => {
+						this.list = res.data.list || []
+						const no = (res.data.pageNo - 1) * res.data.pageSize
+						if (res.status == 200) {
+							for (let i = 0; i < res.data.list.length; i++) {
+								const _item = res.data.list[i]
+								_item.no = no + i + 1
+							}
+							return res.data
+						}
+					})
+				}
+			}
+		},
+		beforeCreate() {
+			this.form = this.$form.createForm(this, {
+				name: 'validate_other'
+			})
+		},
+		methods: {
+			showModal() {
+				console.log('---新增')
+				this.itemId = null
+				this.itemData = {}
+				this.openGoodClassModal = true
+			},
+			// 编辑
+			handleEdit(record) {
+				this.itemId = record.id
+				this.itemData = record
+				console.log(this.itemId, '-------编辑')
+				this.openGoodClassModal = true
+			},
+			// 重置
+			resetForm() {
+				this.searchData.name = ''
+				this.$refs.table.refresh(true)
+			},
+			//
+			cancel() {
+				this.itemId = null
+				this.openGoodClassModal = false
+			},
+			// 更改启用禁用状态
+			changeFlagHandle(text, record) {
+				console.log(text)
+				const _this = this
+				const _data = {
+					id: record.id,
+					flag: record.state == 1 ? '0' : '1'
+				}
+				if (record.state == 1) {
+					this.$confirm({
+						title: '提示',
+						centered: true,
+						content: '商品分类被禁用后,该分类将不在显示给用户,确定禁用吗?',
+						okText: '确定',
+						cancelText: '取消',
+						onOk() {
+							changeGoodsStatus(_data).then(res => {
+								if (res.status == 200) {
+									_this.$message.success(res.message)
+									_this.$refs.table.refresh()
+								}
+							})
+						}
+					})
+				} else {
+					changeGoodsStatus(_data).then(res => {
+						if (res.status == 200) {
+							_this.$message.success(res.message)
+							_this.$refs.table.refresh()
+						} else {
+							record.state = !record.state
+						}
+					})
+				}
+			},
+			// 上移 下移 排序 index:下标  item:数据  type:类型 0 下移 1 上移
+			changeSort(index, item, type) {
+				const indexThat = type === 0 ? index + 1 : index - 1
+				const params = {
+					'currentId': item.id,
+					'id': this.list[indexThat].id,
+				}
+				goodsChangeSort(params).then(res => {
+					if (res.status == 200) {
+						this.$refs.table.refresh()
+					} else {
+						this.$message.error(res.message)
+					}
+				})
+			}
+		},
+		beforeRouteEnter(to, from, next) {
+			next(vm => {
+				vm.resetForm()
+			})
+		}
+	}
 </script>
 
 <style lang="less">
-	.goodsClass-page-info{
-		.goodsClass-search{
+	.goodsClass-page-info {
+		.goodsClass-search {
 			margin-bottom: 15px;
 		}
+
 		.w-e-toolbar {
 			flex-wrap: wrap;
 		}
@@ -293,5 +256,4 @@ export default {
 			margin-bottom: 20px;
 		}
 	}
-
 </style>