From 273232f9fa613878dbeec2564559aa8441e25872 Mon Sep 17 00:00:00 2001 From: aihe <961836564@qq.com> Date: Sat, 27 Apr 2024 11:19:18 +0800 Subject: [PATCH] uu --- common/api/order.js | 21 +++- common/api/url.js | 6 +- components/tpx-text-item/tpx-text-item.vue | 63 +++++++++++ pages/address/list.vue | 4 +- pages/post/model.js | 14 +-- pages/post/openorder.vue | 115 ++++++--------------- store/modules/common.js | 15 +-- 7 files changed, 126 insertions(+), 112 deletions(-) create mode 100644 components/tpx-text-item/tpx-text-item.vue diff --git a/common/api/order.js b/common/api/order.js index 82e9fe0..2ba8908 100644 --- a/common/api/order.js +++ b/common/api/order.js @@ -12,16 +12,29 @@ export const submitOrder = (data = {})=> { export const getCustomerUserList = (data = {})=> { return coreRequest(url.getCustomerUserList, data, {}) } - +// 地址列表 export const getCustomerUserAddressList = (data = {})=> { - return coreRequest(url.getCustomerUserAddressList, data, {}) + return coreRequest(url.getCustomerUserAddressList, data, {}, "GET") } -export const getPickStaffList = (data = {})=> { - return coreRequest(url.getPickStaffList, data, {}) +// 操作员列表 +export const getOpStaffList = (data = {})=> { + return coreRequest(url.getPickStaffList, { ...data, postCode: 'OP' }, {}, "GET") } +// 收派员列表 +export const getRSDStaffList = (data = {})=> { + return coreRequest(url.getPickStaffList, { ...data, postCode: 'RSD' }, {}, "GET") +} + + +// 货物列表 export const getGoodsList = (data = {})=> { return coreRequest(url.getGoodsList, data, {}) } +// 月结账户列表 +export const getMonthpayAccountList = (data = {})=> { + return coreRequest(url.getMonthpayAccountList, data, {}, "GET") +} + diff --git a/common/api/url.js b/common/api/url.js index 8224f9e..39ded49 100644 --- a/common/api/url.js +++ b/common/api/url.js @@ -7,16 +7,16 @@ export default { getEmisCountry: `/emis/emisCountry/list`, // 获取国家列表 getEmisRegion: `/emis/emisRegion/list`,// 获取省市区列表 getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段 - getTransLineList: `/emis/emisTransLine/listSimple`, // 获取路线列表 getTransProductList: `/emis/emisTransProduct/listSimple`, // 获取产品列表 - createOrderNo: `/emis/common/realMatchWaybill`, // 创建运单号 submitOrder: `/emis/emisWaybill/realSubmitOrder`, // 提交订单 getCustomerUserList: `/emis/emisCustomerUser/listSimple`, // 获取网点客户列表 getCustomerUserAddressList: `/emis/emisCustomerAddress/listSimple`, // 获取客户地址列表 - getPickStaffList: `/emis/emisStaff/getPickStaffList`, // 获取取件员用户列表 + getPickStaffList: `/emis/emisStaff/getStaffList`, // 获取操作、收派 员用户列表 getGoodsList: `/emis/emisGoods/listSimple`, // 获取货物列表 + getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表 + } diff --git a/components/tpx-text-item/tpx-text-item.vue b/components/tpx-text-item/tpx-text-item.vue new file mode 100644 index 0000000..663436d --- /dev/null +++ b/components/tpx-text-item/tpx-text-item.vue @@ -0,0 +1,63 @@ + + + + + \ No newline at end of file diff --git a/pages/address/list.vue b/pages/address/list.vue index d874af1..c640423 100644 --- a/pages/address/list.vue +++ b/pages/address/list.vue @@ -7,7 +7,7 @@ - + @@ -102,7 +102,7 @@ return { tabList , searchParam: { - keyword: '', + searchValue: '', addressType: tabList[0].val }, queryOption: { diff --git a/pages/post/model.js b/pages/post/model.js index 5be8253..0350aeb 100644 --- a/pages/post/model.js +++ b/pages/post/model.js @@ -33,16 +33,16 @@ export const getOrderModels = ()=> { "orderDate": undefined, "userId": '', // 客户id "openId": undefined, - "paymentType": undefined, + "paymentType": undefined, // 付款方式 "calcFeeType": undefined, "custNo": undefined, "transLine": '', // 路线 - "productType": undefined, - "customsClear": undefined, - "customsEclaration": undefined, + "productType": undefined, // 产品 + "customsClear": undefined, // 清关方式 + "customsEclaration": undefined, // 报关方式 "packType": undefined, "dispatchMethod": undefined, - "pickupMethod": undefined, + "pickupMethod": undefined, // 取件方式 "pickStartDate": undefined, "pickFinishDate": undefined, "intoWarehouseCode": undefined, @@ -72,7 +72,7 @@ export const getOrderModels = ()=> { "transferCode": undefined, "transferBillcode": undefined, "dispFdDate": undefined, - "takePieceEmployeeCode": undefined, + "takePieceEmployeeCode": undefined, // 收派员 "sendSiteCode": undefined, "destinationCode": undefined, "destinationProvince": undefined, @@ -83,7 +83,7 @@ export const getOrderModels = ()=> { "marketManCode": undefined, "payee": undefined, "salesmen": undefined, - "operateEmployeeCode": undefined, + "operateEmployeeCode": undefined, // 操作员 "blMessage": undefined, "blAcceptMessage": undefined } diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue index ebc3bc7..eb51d7b 100644 --- a/pages/post/openorder.vue +++ b/pages/post/openorder.vue @@ -17,7 +17,7 @@ 客户 - + @@ -29,6 +29,7 @@ + @@ -36,133 +37,67 @@ - - - - - - - - - - + - - - - - - - - - - + - - - 报关方式 - - - - - + - - - 清关方式 - - - - - + - - - 取件方式 - - - - - + - - - 操作员 - - - - - + + - - - 收派员 - - - - - + + - - - 付款方式 - - - - - + - - - 月结账户 - - - - - + + @@ -328,6 +263,9 @@ }, productSearchParam() { return { transLineCode: this.submitParam.transLine } + }, + dicData() { + return this.$store.getters.dicData } }, data() { @@ -336,8 +274,10 @@ kehuRes: { list: [] }, wayRes: { list: [] }, productRes: { list: [] }, + caozuoRes: { list: [] }, + shoupaiRes: { list: [] }, + yuejieRes: { list: [] }, tipsList: [ - ], goodChooseModal: { show: false, @@ -375,6 +315,9 @@ getCustomerUserList: apiService.getCustomerUserList, getTransLineList: apiService.getTransLineList, getTransProductList: apiService.getTransProductList, + getOpStaffList: apiService.getOpStaffList, + getRSDStaffList: apiService.getRSDStaffList, + getMonthpayAccountList: apiService.getMonthpayAccountList, async initData() { // uni.showLoading({ // title: '加载中' diff --git a/store/modules/common.js b/store/modules/common.js index 52db54a..93d5039 100644 --- a/store/modules/common.js +++ b/store/modules/common.js @@ -7,6 +7,7 @@ import { } from "@/session" import * as apiService from "@/common/api" import { goto } from "@/common/untool" +import { transListKeyTitle } from "@/common/util" export default { state: { @@ -16,7 +17,6 @@ export default { [COMMONKEY.GETDIC](state, provider) { state.dicData = provider }, - }, getters: { // packInfo(state) { @@ -24,7 +24,7 @@ export default { // } }, actions: { - async [COMMONKEY.GETDIST]({ + async [COMMONKEY.GETDIC]({ dispatch, commit, state, @@ -36,17 +36,12 @@ export default { resInfo?.data?.map?.((item)=> { let key = Object.keys(item).filter(i=> i != 'desc')[0] if(key) { - item[key]?.map?.(tmp=> { - tmp.title = tmp.label - tmp.val = tmp.value - }) - data[key] = { - desc: item.desc || '', - list: item[key] || [] - } + let list = transListKeyTitle({ valKey:'value', titleKey: 'label', list: item[key] }) + data[key] = list } }) commit(COMMONKEY.GETDIC, data) }, + } } \ No newline at end of file