diff --git a/src/pagesApp/paymentDetail.vue b/src/pagesApp/paymentDetail.vue index 8674c87..dbc2f4d 100644 --- a/src/pagesApp/paymentDetail.vue +++ b/src/pagesApp/paymentDetail.vue @@ -244,7 +244,7 @@ const getList = (v?: boolean) => { pageNum: pageList.pageNum, startTime: formatStartAndEndTime(state.startTime, 's'), endTime: formatStartAndEndTime(state.endTime, 'e'), - oddNumbers: keyword.value, + orderNumber: keyword.value, }; if (state.currentPaymentType > -1) { params.paymentType = state.currentPaymentType; diff --git a/src/pagesApp/supplierMgt.vue b/src/pagesApp/supplierMgt.vue index 98266d0..6439200 100644 --- a/src/pagesApp/supplierMgt.vue +++ b/src/pagesApp/supplierMgt.vue @@ -2,7 +2,9 @@ 全部分类 + > + {{state.supplierTypeId > -1 ? state.supplierName : '全部分类'}} + { pageList.pageSize = 100; }; const handleSelect = (v: any) => { +console.log(v) state.supplierTypeId = v.id; + state.supplierName = v.name resetPageList(); getList(); }; diff --git a/src/pagesReceive/review/index.vue b/src/pagesReceive/review/index.vue index 96fe51c..627b812 100644 --- a/src/pagesReceive/review/index.vue +++ b/src/pagesReceive/review/index.vue @@ -440,7 +440,7 @@ onLoad((option) => { } } if (item.name === "实际付款") { - if (state.order[item.enName as string]) { + if (state.order[item.enName as string] !== null) { item.num = state.order[item.enName as string]; } else { item.num = state.order["totalPrice"]; diff --git a/src/pagesShipment/form/settlementForm.vue b/src/pagesShipment/form/settlementForm.vue index 76847ea..e4929dd 100644 --- a/src/pagesShipment/form/settlementForm.vue +++ b/src/pagesShipment/form/settlementForm.vue @@ -468,7 +468,7 @@ const formAttrList = reactive([ type: "textarea", }, { - name: "结算单据", + name: "货品照片", key: "photo", type: "upload", }, diff --git a/src/store/modules/member.ts b/src/store/modules/member.ts index 3196461..0aa8276 100644 --- a/src/store/modules/member.ts +++ b/src/store/modules/member.ts @@ -17,6 +17,11 @@ export const useMemberStore = defineStore( menusNameList: [], err: null, }); + + const mechanism = ref({ + mechanismCode: "", + mechanismName: "", + }); // 保存会员信息,登录时使用 const setProfile = (val: any) => { @@ -39,12 +44,12 @@ export const useMemberStore = defineStore( menusList: [], menusNameList: [], }; + + mechanism.value.mechanismCode = "" + mechanism.value.mechanismName = "" }; - const mechanism = ref({ - mechanismCode: "", - mechanismName: "", - }); + const setMechanism = (v: { mechanismCode: ""; mechanismName: "" }) => { mechanism.value = v; };