From 150e8abf0f6683c0d6f2d53465c1f2df2a60acf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rhett=E9=9C=8D?= <741354752@qq.com> Date: Tue, 10 Feb 2026 17:28:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/work/BusinessApproval/index.vue | 1 - pages/work/OrderManager/ListItem.vue | 93 ++- .../work/OrderManager/components/LookData.vue | 590 ------------------ pages/work/OrderManager/components/NewAdd.vue | 19 +- pages/work/OrderManager/index.vue | 17 +- 5 files changed, 104 insertions(+), 616 deletions(-) delete mode 100644 pages/work/OrderManager/components/LookData.vue diff --git a/pages/work/BusinessApproval/index.vue b/pages/work/BusinessApproval/index.vue index b76e3a2..246bf01 100644 --- a/pages/work/BusinessApproval/index.vue +++ b/pages/work/BusinessApproval/index.vue @@ -47,7 +47,6 @@ import ListItem from "./ListItem.vue"; const {proxy} = getCurrentInstance() - const queryParams = ref({ state: '1', isPayNow: '', diff --git a/pages/work/OrderManager/ListItem.vue b/pages/work/OrderManager/ListItem.vue index 535a3b8..4ffd487 100644 --- a/pages/work/OrderManager/ListItem.vue +++ b/pages/work/OrderManager/ListItem.vue @@ -8,7 +8,7 @@ style="margin: 0;margin-bottom: 20px" @click="handleDetail(item)" > - + 货主: {{ item.companyName }} @@ -36,17 +36,73 @@ 操作: - + - + + + 货主: + {{ item.companyName }} + + + 发货仓库: + {{ item.warehouseName }} + + + 制单日期: + {{ formatDate(item.adddate, 'yyyy-MM-dd') }} + + + 订单金额: + {{ formatPrice(item.contractmoney) }} + + + 补差金额: + {{ formatPrice(item.disCount) }} + + + 本月/下月: + {{ item.actioninfo }} + + + 支付方式: + + {{ item.creditperiods > 0 ? '非现款' : '现款' }} + + + + 状态: + + {{ item.stateText }} + + + + @@ -58,7 +114,7 @@ import {formatPrice} from "../../../utils/utils"; import DictTag from "../../../components/dict-tag/dict-tag.vue"; import {delsalemain} from "../../../api/orderManager/index.js" - +import { getUserProfile } from "@/api/system/user" const {proxy} = getCurrentInstance() // const {order_state, dazhong_dingdan_type} = proxy.useDict(['order_state', 'dazhong_dingdan_type']) @@ -69,7 +125,7 @@ defineOptions({ name: 'ListItem' }) - +const userType = ref() const props = defineProps(['items']) @@ -79,10 +135,15 @@ const orderTypeList = ref([]) onMounted(async () => { try { await getDictData() + await getUser() } finally { } }) - + function getUser() { + getUserProfile().then(response => { + userType.value = response.data.userType + }) + } const Edit = async (row) => { try { console.log(row,'当前行数据') @@ -93,12 +154,12 @@ const Edit = async (row) => { console.error('失败:', error) } } - +const emit = defineEmits(['refresh']) // 删除 const deleteData = async (row) => { uni.showModal({ title: '删除确认', - content: `确定删除合同 ${row.contractcode || ''} 吗？`, + content: `确定删除 ${row.contractcode || ''} 吗？`, confirmText: '确定', cancelText: '取消', confirmColor: '#DD524D', @@ -156,7 +217,13 @@ const getDictData = async () => { } const handleDetail = (row) => { - proxy.$tab.navigateTo(`/pages/work/OrderManager/components/EditData?id=${row.saleid}`) + console.log(userType.value,'userType') + if(userType.value == '01' || userType.value == '02'){ + proxy.$tab.navigateTo(`/pages/work/OrderManager/components/LookDataSY?id=${row.saleid}`) + }else{ + proxy.$tab.navigateTo(`/pages/work/OrderManager/components/LookDataNB?id=${row.saleid}`) + } + } diff --git a/pages/work/OrderManager/components/LookData.vue b/pages/work/OrderManager/components/LookData.vue deleted file mode 100644 index fd76d3f..0000000 --- a/pages/work/OrderManager/components/LookData.vue +++ /dev/null @@ -1,590 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/work/OrderManager/components/NewAdd.vue b/pages/work/OrderManager/components/NewAdd.vue index e8fc97a..a9a7dd0 100644 --- a/pages/work/OrderManager/components/NewAdd.vue +++ b/pages/work/OrderManager/components/NewAdd.vue @@ -11,7 +11,6 @@ text-field="text" value-field="value" @change="handleCompanyChange" - :clear="true" /> @@ -174,8 +173,8 @@ - - + + @@ -191,7 +190,7 @@ import data1 from './data1.js' const userStore = useUserStore() const userID = ref(userStore.id) const loading = ref(true) - +const btnloading = ref(false) // 状态控制 const isShowingBuchaList = ref(false) // 是否显示补差列表 @@ -232,9 +231,9 @@ onMounted(async () => { // 获取补差列表数据 function getsalemainpiAoKouList() { const body = { companyId: form.value.companyId } - buchaGoodsList.value = data1.data + // buchaGoodsList.value = data1.data salemainpiAoKouList(body).then(res => { - // buchaGoodsList.value = res.data || [] + buchaGoodsList.value = res.data || [] }) } @@ -564,7 +563,7 @@ const goSave = () => { if (!validatePiaokou()) { return // 验证不通过，停止执行 } - + btnloading.value = true form.value.state = 0 // 0为保存，可修改编辑，1的时候为提交 addsalemain(form.value).then(res => { @@ -573,6 +572,7 @@ const goSave = () => { icon: 'success', duration: 2000 }) + btnloading.value = false uni.navigateTo({ url: '/pages/work/OrderManager/index' }) @@ -583,6 +583,7 @@ const goSave = () => { icon: 'error', duration: 2000 }) + btnloading.value = false }) } @@ -614,7 +615,7 @@ const goSubmit = () => { if (!validatePiaokou()) { return // 验证不通过，停止执行 } - + btnloading.value = true form.value.state = 1 // 1为提交 addsalemain(form.value).then(res => { @@ -623,6 +624,7 @@ const goSubmit = () => { icon: 'success', duration: 2000 }) + btnloading.value = false uni.navigateTo({ url: '/pages/work/OrderManager/index' }) @@ -633,6 +635,7 @@ const goSubmit = () => { icon: 'error', duration: 2000 }) + btnloading.value = false }) } diff --git a/pages/work/OrderManager/index.vue b/pages/work/OrderManager/index.vue index 805e4a9..3b84088 100644 --- a/pages/work/OrderManager/index.vue +++ b/pages/work/OrderManager/index.vue @@ -20,15 +20,21 @@ @change="getTableData" > - + + + + -