diff --git a/src/apis/order.js b/src/apis/order.js index 866dbed..83da6cd 100644 --- a/src/apis/order.js +++ b/src/apis/order.js @@ -309,7 +309,19 @@ function cancelOrder(vendorOrderID, vendorID, reason, fn) { 120: "失败" */ -export { getOrderCount, getBusinessInfo, getPlatformInfo, createWaybill, ExportOrderWithSku, getOrderWaybillInfo, cancelAll3rdWaybillsApi, cancelWaybillsApi, selfDelivering, cancelOrder, delBeforeSale } +export { + getOrderCount, + getBusinessInfo, + getPlatformInfo, + createWaybill, + ExportOrderWithSku, + getOrderWaybillInfo, + cancelAll3rdWaybillsApi, + cancelWaybillsApi, + selfDelivering, + cancelOrder, + delBeforeSale +} /* order diff --git a/src/apis/store.js b/src/apis/store.js index 142eda1..fdd363f 100644 --- a/src/apis/store.js +++ b/src/apis/store.js @@ -980,6 +980,59 @@ async function queryUnansweredInvoice (json) { } } + +/** + * 查询门店之间的比值 + * /v2/order/StoreOrderRank + * @Param token header string true "认证token" + * @Param start query string true "起始时间" + * @Param end query string true "结束时间" + * @Param storeID query string false "门店id,[1,2,3]" + * @Param rank query string true "排序方式,订单中粮,[DESC,ASC]" + * @Param offset query int false "门店列表起始序号（以0开始，缺省为0）" + * @Param pageSize query int false "门店列表页大小（缺省为50，-1表示全部）" + */ +async function storeOrderRank(json) { + try { + const res = await api('v2/order/StoreOrderRank', { + params: { + ...json + }, + noLoading: true + }) + return res + } catch (e) { + console.error(e) + throw e + } +} + + +/** + * @description 京西打印机列表 + * @Param token header string true "认证token" + * @Param printNo formData string false "打印机编号" + * @Param printKey formData string false "打印机秘钥" + * @Param status formData int false "激活状态[-1关机/0未连接/1开机]" + * @Param isOnline formData int false "在线装填[-1掉线/0未连接/1链接]" + * @Param page formData int true "跳过数据条数" + * @Param size formData int true "每页展示条数" + */ +async function jxPrinterList(json) { + try { + const res = await api('v2/order/QueryJxPrintList', { + params: { + ...json + }, + noLoading: true + }) + return res + } catch (e) { + console.error(e) + throw e + } +} + export { setMTStoreAutoText, getMTStoreAutoText, @@ -1017,5 +1070,7 @@ export { getMyStoreInfo, queryInvoiceSetting, bathUpdateInvoiceSetting, - queryUnansweredInvoice + queryUnansweredInvoice, + storeOrderRank, + jxPrinterList } diff --git a/src/components/cmp/cateBind/cateBind.vue b/src/components/cmp/cateBind/cateBind.vue index 3b9a2c0..60acaa3 100644 --- a/src/components/cmp/cateBind/cateBind.vue +++ b/src/components/cmp/cateBind/cateBind.vue @@ -66,7 +66,7 @@ export default{ computed:{ ...mapGetters({ jDCategoryData:"jDCategoryData", - jGCategoryData:"jGCategoryData", + // jGCategoryData:"jGCategoryData", mTCategoryData:"mTCategoryData", dYCategoryData:"dYCategoryData", eBCategoryData:"eBCategoryData", @@ -94,9 +94,9 @@ export default{ case 'JD': arr = this.jDCategoryData break - case 'JG': - arr = this.jGCategoryData - break + // case 'JG': + // arr = this.jGCategoryData + // break case 'MT': arr = this.mTCategoryData break diff --git a/src/components/menu/menu.js b/src/components/menu/menu.js index f9b2577..409458b 100644 --- a/src/components/menu/menu.js +++ b/src/components/menu/menu.js @@ -95,6 +95,21 @@ export const newMenu2 = [ updatedAt: '2021-01-21T17:21:50+08:00', url: '/versionControl', }, + { + children: [], + color: '', + createdAt: '2021-01-21T17:21:47+08:00', + deletedAt: '1970-01-01T00:00:00+08:00', + id: 99999, + imgURL: '', + lastOperator: 'suyl', + level: 2, + name: '京西打印机', + parentID: 52, + type: 0, + updatedAt: '2021-01-21T17:21:50+08:00', + url: '/jxPrinter', + }, // 营销活动 { children: [], diff --git a/src/components/ordermanager/order-manager.vue b/src/components/ordermanager/order-manager.vue index 7a75fb9..a3828b8 100644 --- a/src/components/ordermanager/order-manager.vue +++ b/src/components/ordermanager/order-manager.vue @@ -81,34 +81,42 @@ - - {{ namePhone[0] }} - + - - {{ namePhone[0] }} - + - - {{ namePhone[0] }} - + - - {{ namePhone[0] }} - + diff --git a/src/pages/indexpage/cmp/storeOrderRank.vue b/src/pages/indexpage/cmp/storeOrderRank.vue new file mode 100644 index 0000000..9a1296a --- /dev/null +++ b/src/pages/indexpage/cmp/storeOrderRank.vue @@ -0,0 +1,287 @@ + + + \ No newline at end of file diff --git a/src/pages/indexpage/indexPage3.vue b/src/pages/indexpage/indexPage3.vue index a81398c..d25e9bf 100644 --- a/src/pages/indexpage/indexPage3.vue +++ b/src/pages/indexpage/indexPage3.vue @@ -360,6 +360,128 @@ + + +
+ + + + + + + + {{ item.name }} + + + + + 查询 + + + +
+ + + + +
{{ scope.row.orderCreatedAt | timeToLLL }}
+ + +
+
+
{{ $store.state.serverInfo.orderStatus ? $store.state.serverInfo.orderStatus[scope.row.status] : '' }} +
+ +
+ (用户申请取消:{{ (scope.row.flag & 6) === 2 ? '已同意' : '已拒绝' }}) +
+ + + + +
+ (已处理:{{ (scope.row.flag & 24) === 8 ? '同意' : '拒绝' }}) +
+ +
+ (已召唤平台配送) +
+ +
+ (已收到货物) +
+
+ (自提单) +
+
+ (门店自送[已操作]) +
+
+
+ + + +
+
+
+ {{ scope.row.consigneeName }}
+
{{ scope.row.consigneeMobile }}
+
真实号
+
+ {{ scope.row.consigneeMobile2 || '暂无' }} +
+
+
+ + +
+ + + +
+ + +
+ +
+
+
{{ $store.state.serverInfo.vendorName[scope.row.waybillVendorID] }} {{ scope.row.courierName }}
+
{{ scope.row.courierMobile }}
+
+
+ +
+ + +
+ +
+ + + + + + @@ -448,17 +570,20 @@ import { getBrands } from '@/apis/controls/brand.js' import jxTimePick from '@/components/cmp/timePick' import jxSelectPick from '@/components/cmp/selectPick' import staticInfo from './cmp/staticInfo' +import storeOrderRank from './cmp/storeOrderRank.vue' import { mapGetters } from 'vuex' import { APIGetInvoiceRecord,APIUploadOrderInvoice } from '@/apis/APIOrder' -import { - queryUnansweredInvoice -} from '@/apis/store.js' +import { queryUnansweredInvoice,getMyStoreInfo } from '@/apis/store.js' +import { getOrdersPost } from '@/apis/order.js' +import CMPWaybillInfo from "@/components/ordermanager/cmp/waybillInfo.vue"; export default { name: 'IndexPage', components: { jxTimePick, jxSelectPick, staticInfo, + CMPWaybillInfo, + storeOrderRank, jxUploadFile: () => import("@/components/cmp/uploadFile") }, data() { @@ -532,14 +657,45 @@ export default { orderID:[{ required: true, message: '请输入订单号', trigger: 'change' }], id:[{ required: true, message: '请输入发票号码', trigger: 'change' }], img:[{ required: true, message: '请上传发票', trigger: 'change' }] - } + }, + // 物料申请信息 + materialInfo:{ + personalStore:[], + data:{ + // fromDate:'', + // toDate:'', + timeRange:[], + statuss:[], + offset:0, + pageSize:30 + }, + result:[], + totalCount:0 + }, + } }, computed:{ ...mapGetters({ mtStore: 'mtStore', marketsArr: 'marketsArr', - }) + }), + statusArr() { + let { orderStatus } = this.$store.getters.CMS || {}; + let arr = []; + if (orderStatus) { + for (let attr in orderStatus) { + if (attr > 0 && attr < 120) { + arr.push({ + status: +attr, + name: orderStatus[attr], + }); + } + } + } + this.materialInfo.data.statuss = arr.map((item) => item.status); + return arr; + }, }, async created() { this.$store.dispatch("getAllPlate"); @@ -562,14 +718,41 @@ export default { let old1 = now - 3600 * 1000 * 24 * 7 now = moment(now).format('YYYY-MM-DD') old = moment(old).format('YYYY-MM-DD') + old1 = moment(old1).format('YYYY-MM-DD') this.searchForm.timeRange = [now + ' 00:00:00',now + ' 23:59:59'] - this.incoiceInfo.timeRange = [moment(old1).format('YYYY-MM-DD'),now] + this.materialInfo.data.timeRange = [old1,old] + this.incoiceInfo.timeRange = [old1,now] await this.queryMtMerchant() this.getNewFeatures() this.getMtInvoiceRecord() + this.getMaterialInfo() }, methods: { + // 获取物料信息 + async getMaterialInfo(){ + let res = await getMyStoreInfo('1.3.5',true) + this.materialInfo.personalStore = res.map(item => { return item.id}) + // console.log('查询门店个人信息',res,'this.materialInfo',this.materialInfo) + let json = { + fromDate:this.materialInfo.data.timeRange[0], + toDate: this.materialInfo.data.timeRange[1], + vendorIDs: [9], + storeIDs: [666666], + statuss:this.materialInfo.data.statuss.length === 11 ? JSON.stringify([]) : JSON.stringify(this.materialInfo.data.statuss), + offset: this.materialInfo.data.offset, + pageSize: this.materialInfo.data.pageSize, + fromStoreIDs:this.materialInfo.personalStore + } + getOrdersPost(json,(res) => { + if(res.code === '0'){ + // console.log('获取订单信息',JSON.parse(res.data)) + // // res.data. + this.materialInfo.result = JSON.parse(res.data).data + this.materialInfo.totalCount = JSON.parse(res.data).totalCount + } + }) + }, // 淘宝闪购 查询发票详情 queryEbDetail(row){ this.uploadIncoice = row diff --git a/src/pages/system/jxPrinter/index.vue b/src/pages/system/jxPrinter/index.vue new file mode 100644 index 0000000..04e3872 --- /dev/null +++ b/src/pages/system/jxPrinter/index.vue @@ -0,0 +1,138 @@ + + + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 14f4919..5cf9f0b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -48,6 +48,7 @@ const MessageDetail = () => import('@/components/storemanager/message-detail') const TaskManager = () => import('@/pages/system/taskManager') // 系统管理-任务查询 const SystemConfig = () => import('@/pages/system/systemConfig') // 系统管理-系统配置 const VersionControl = () => import('@/pages/system/versionControl/index') // 系统管理-版本控制 +const JxPrinter = () => import('@/pages/system/jxPrinter/index.vue') // 系统管理-京西云打印机 const SystemLog = () => import('@/pages/system/system-log') // 系统管理-系统日志 const CityConfig = () => import('@/pages/system/cityConfig') // 系统管理-城市管理 const SystemTool = () => import('@/components/system/systemTool/system-tool.vue') // 系统管理-系统工具 @@ -839,6 +840,14 @@ const router = new Router({ title: '版本控制' } }, + { + path: 'jxPrinter', + name: 'JxPrinter', + component: JxPrinter, + meta: { + title: '京西打印机' + } + }, { path: 'cityconfig', name: 'CityConfig',