diff --git a/api/orderManager/index.js b/api/orderManager/index.js index 201b0ac..2dfc880 100644 --- a/api/orderManager/index.js +++ b/api/orderManager/index.js @@ -8,6 +8,16 @@ export function listsalemain(data,query) { }) } + +// 新增订单时获取货主/system/dept/productListWithUserId +export function productListWithUserId() { + return request({ + url: '/system/dept/productListWithUserId', + method: 'get', + isEncrypt: false + }) +} + // 查询s生产单位列表 export function listproductList(data,query) { return request({ @@ -35,6 +45,16 @@ export function getsalemaincheckAmount(queryParams) { // isEncrypt: false }) } +// 获取当前商业用户票扣列表 +// 相当于补差 +export function salemainpiAoKouList(data) { + return request({ + url: '/bussiness/salemain/piAoKouLiSt', + method: 'post', + data: data, + isEncrypt: false + }) +} // 新增 export function addsalemain(data) { return request({ @@ -73,7 +93,6 @@ export function businessManagerReviewGoodsList(salemainId) { } - // 删除 export function delsalemain(id) { return request({ diff --git a/package.json b/package.json index bd20422..b06a9b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "pinia-plugin-persistedstate": "^4.5.0", + "pinia-plugin-persistedstate": "^4.7.1", "radash": "^12.1.1" } } diff --git a/pages/work/OrderManager/components/EditData.vue b/pages/work/OrderManager/components/EditData.vue index c7fb96b..89d58a9 100644 --- a/pages/work/OrderManager/components/EditData.vue +++ b/pages/work/OrderManager/components/EditData.vue @@ -740,7 +740,7 @@ const toShowBucha = () => { .goods-header { background: #409eff; color: white; - padding: 10px 16px; + padding: 5px 8px; display: flex; align-items: center; gap: 12px; diff --git a/pages/work/OrderManager/components/LookData.vue b/pages/work/OrderManager/components/LookData.vue index f4ad765..fd76d3f 100644 --- a/pages/work/OrderManager/components/LookData.vue +++ b/pages/work/OrderManager/components/LookData.vue @@ -448,7 +448,7 @@ const goCancel = () => { .goods-header { background: #409eff; color: white; - padding: 10px 16px; + padding: 5px 8px; display: flex; align-items: center; gap: 12px; diff --git a/pages/work/OrderManager/components/NewAdd.vue b/pages/work/OrderManager/components/NewAdd.vue index ae40f35..e8fc97a 100644 --- a/pages/work/OrderManager/components/NewAdd.vue +++ b/pages/work/OrderManager/components/NewAdd.vue @@ -1,24 +1,24 @@ \ No newline at end of file diff --git a/pages/work/OrderManager/components/data1.js b/pages/work/OrderManager/components/data1.js index a47c85f..c242f6e 100644 --- a/pages/work/OrderManager/components/data1.js +++ b/pages/work/OrderManager/components/data1.js @@ -26,8 +26,17 @@ export default { piaokoutype: "运费补差", shortname: "MPT20", goodsname: "盐酸丙卡特罗片(美普清)20", - piaokou: 8.00 + piaokou: 10000.01 }, + { + piaokouid: 102, + goodsid: 3, // 对应盐酸丙卡特罗片(美普清)20 + applydate: "2024-01-17", + piaokoutype: "运费补差", + shortname: "MPT20", + goodsname: "盐酸丙卡特罗片(美普清)20", + piaokou: 20000.02 + }, { piaokouid: 3, goodsid: 5, // 对应瑞巴派特片(膜固思达)24 diff --git a/pages/work/OrderManager/index.vue b/pages/work/OrderManager/index.vue index 2125f0e..805e4a9 100644 --- a/pages/work/OrderManager/index.vue +++ b/pages/work/OrderManager/index.vue @@ -1,9 +1,8 @@ @@ -84,9 +56,17 @@ import {listproductList, listsalemain} from "../../../api/orderManager/index.js" import {computed, getCurrentInstance, onMounted, ref} from "vue" import {getDicts} from "../../../api/system/dict/data.js" -// import DictTag from '@/components/dict-tag/dict-tag.vue'; import {useOrderManagerStore} from "../../../store/modules/orderManager.js" -// import { log } from "console" + +import MBCard from "../../../components/MB/MBCard.vue"; +import MBPagination from "../../../components/MB/MBPagination.vue"; +import MBLoading from "../../../components/MB/MBLoading.vue"; +import ListItem from "./ListItem.vue"; +import { getUserProfile } from "@/api/system/user" + + +const userType = ref() + const {proxy} = getCurrentInstance() // 表单数据 const baseFormData = ref({}) @@ -94,11 +74,15 @@ const baseFormData = ref({}) const orderTypeList = ref([]) const paymentValue = ref(0) const companyValue = ref(0) + +// 添加加载状态 +const loading = ref(true) +const total = ref(0) const paging = ref({ // 页码 pageNum: 1, // 分页数量 - pageSize: 999, + pageSize: 2, isAsc: 'descending', orderByColumn: 'adddate' }) @@ -107,47 +91,30 @@ const queryParams = ref({ state: "0,1,-1,2,-2,3,-3,9,10,11,12,-12,13,-13,14,15,16", } }) -// 筛选选项 -// const stateList = ref([ -// { value: '0', text: "未提交" }, -// { value: '1', text: "待商务审核" }, -// { value: '-1', text: "商务退回" }, -// { value: '2', text: "待财务审核" }, -// { value: '-2', text: "财务退回" }, -// { value:'3', text: "待审核" }, -// { value: '-3', text: "审核退回" }, -// { value: '9', text: "待推送分配" }, -// { value: '10', text: "待牛力分配" }, -// { value: '11', text: "牛力推送失败" }, -// ]) + const stateList = ref([]) const companyOptions = ref([]) // 合同数据 -const contracts = ref([]) - -// 过滤后的合同数据 -const filteredContracts = computed(() => { - let result = contracts.value - - // 根据生产单位筛选 - if (companyValue.value === 1) { - result = result.filter(contract => contract.companyName.includes('浙江')) - } else if (companyValue.value === 2) { - result = result.filter(contract => contract.companyName.includes('广东')) - } - - // 可以根据支付方式添加更多筛选逻辑 - - return result -}) +const tableData = ref([]) // 初始化数据 -onMounted(() => { - getDictData() - getTableData() - getDeptLists() +onMounted(async () => { + try { + loading.value = true + await getDictData() + await getDeptLists() + await getUser() + await getTableData() + } finally { + loading.value = false + } }) + function getUser() { + getUserProfile().then(response => { + userType.value = response.data.userType + }) + } // 格式化日期 function formatDate(dateString) { @@ -156,49 +123,55 @@ function formatDate(dateString) { } //获取字典数据 -const getDictData = () => { - getDicts("order_state").then(res => { - console.log('order_state', res.data) - stateList.value = res.data.map(item => { - +const getDictData = async () => { + try { + const [stateRes, typeRes] = await Promise.all([ + getDicts("order_state"), + getDicts("dazhong_dingdan_type") + ]) + stateList.value = stateRes.data.map(item => { return { value: item.dictValue, text: item.dictLabel } }) - }) - getDicts("dazhong_dingdan_type").then(res => { - console.log('dazhong_dingdan_type', res.data) - orderTypeList.value = res.data - }) - + + orderTypeList.value = typeRes.data + } catch (error) { + console.error('获取字典数据失败:', error) + } } + //获取列表数据 -const getTableData = () => { - - console.log(queryParams.value) - listsalemain(queryParams.value, paging.value).then(res => { - - contracts.value = res.rows - // total.value = res.total; - }); - +const getTableData = async () => { + try { + loading.value = true + const data = await listsalemain(queryParams.value, paging.value) + total.value = data.total + tableData.value = data.rows + } catch (error) { + console.error('获取数据失败:', error) + } finally { + loading.value = false + } } -const getDeptLists = () => { - listproductList().then(res => { + +const getDeptLists = async () => { + try { + const res = await listproductList() companyOptions.value = res.data.map(item => { return { value: item.deptId, text: item.deptName } }) - console.log('companyOptions.value', companyOptions.value) - }); - + } catch (error) { + console.error('获取部门列表失败:', error) + } } // 筛选合同 -function filterContracts(e) { +function filtertableData(e) { console.log("筛选条件变化:", e) // 计算属性会自动更新，无需额外操作 } @@ -211,9 +184,6 @@ const handleInput = (e) => { // 跳转到详情页 function gotoDetail(contract) { console.log("查看合同详情:", contract) - // proxy.$tab.navigateTo('/pages/work/yonghu/detail') - // proxy.$tab.navigateTo(`/pages/work/yonghu/detail?saleid=${contract.saleid}`) - // proxy.$tab.navigateTo('pages/work/OrderManager/OrderDetail') //存储要传的值到pinia useOrderManagerStore().addOrder(contract) console.log('数据', useOrderManagerStore().orders) @@ -226,7 +196,6 @@ function gotoDetail(contract) { url: "/pages/work/OrderManager/components/LookData" }); } - } const gotoNewAdd = () => { @@ -234,14 +203,43 @@ const gotoNewAdd = () => { url: "/pages/work/OrderManager/components/NewAdd" }); } +const handleQuery = async () => { + try { + loading.value = true + const data = await listsalemain(queryParams.value, paging.value) + total.value = data.total + tableData.value = data.rows + } catch (error) { + console.error('获取数据失败:', error) + } finally { + loading.value = false + } +}