From adeb8b768926ed50a3fb0857f366d6a0308d2cc0 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期五, 29 八月 2025 17:45:57 +0800 Subject: [PATCH] 修改组件 --- src/pages/sales/salesAccount/detail.vue | 241 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 190 insertions(+), 51 deletions(-) diff --git a/src/pages/sales/salesAccount/detail.vue b/src/pages/sales/salesAccount/detail.vue index 3991e5d..0260179 100644 --- a/src/pages/sales/salesAccount/detail.vue +++ b/src/pages/sales/salesAccount/detail.vue @@ -72,20 +72,31 @@ <u-form-item label="褰曞叆鏃ユ湡" prop="entryDate" border-bottom> <u-input v-model="form.entryDate" placeholder="璇疯緭鍏�" disabled /> </u-form-item> + <!-- 涓氬姟鍛橀�夋嫨寮圭獥 --> <u-popup v-model="showPicker" mode="bottom"> + <view class="picker-header"> + <view class="picker-cancel" @click="showPicker = false">鍙栨秷</view> + <view class="picker-title">閫夋嫨涓氬姟鍛�</view> + <view class="picker-confirm" @click="confirmSalesman">纭畾</view> + </view> <u-picker :columns="userList" v-model="pickerValue" - @confirm="onConfirm" - @cancel="showPicker = false" + @change="onPickerChange" /> </u-popup> + + <!-- 瀹㈡埛閫夋嫨寮圭獥 --> <u-popup v-model="showCustomerPicker" mode="bottom"> + <view class="picker-header"> + <view class="picker-cancel" @click="showCustomerPicker = false">鍙栨秷</view> + <view class="picker-title">閫夋嫨瀹㈡埛</view> + <view class="picker-confirm" @click="confirmCustomer">纭畾</view> + </view> <u-picker :columns="customerOption" v-model="pickerCustomerValue" - @confirm="onCustomerConfirm" - @cancel="showCustomerPicker = false" + @change="onCustomerPickerChange" /> </u-popup> @@ -297,11 +308,16 @@ </view> </view> </view> - <view class="footer-btns" v-if="operationType !== 'view'"> - <u-button class="cancel-btn" @click="goBack">鍙栨秷</u-button> - <u-button class="save-btn" type="primary" @click="onSubmit">淇濆瓨</u-button> - </view> </u-form> + + <!-- 浣跨敤鍏叡搴曢儴鎸夐挳缁勪欢 --> + <FooterButtons + :show="operationType !== 'view'" + cancelText="鍙栨秷" + confirmText="淇濆瓨" + @cancel="goBack" + @confirm="onSubmit" + /> </view> </template> @@ -318,6 +334,8 @@ } from "@/api/salesManagement/salesLedger"; import useUserStore from "@/store/modules/user"; import {calculateTaxExclusiveTotalPrice} from "@/utils/summarizeTable"; +import PageHeader from '@/components/PageHeader.vue'; +import FooterButtons from '@/components/FooterButtons.vue'; // 鑾峰彇椤甸潰鍙傛暟 const operationType = ref(''); @@ -356,6 +374,12 @@ const pickerSpecificationValue = ref(['']); const pickerTaxRateValue = ref(['']); const pickerInvoiceTypeValue = ref(['']); + +// 涓存椂瀛樺偍閫夋嫨鍣ㄩ�変腑鐨勫�� +const tempSalesmanValue = ref(''); +const tempCustomerValue = ref(''); +const selectedSalesman = ref(null); +const selectedCustomer = ref(null); const currentProductIndex = ref(0); // 閫夐」鏁版嵁 @@ -398,15 +422,58 @@ invoiceType: '' }); }; -const onConfirm = ({ selectedValues, selectedOptions }) => { - form.value.salesman = selectedOptions[0]?.text; - pickerValue.value = [selectedValues[0]]; +// 涓氬姟鍛橀�夋嫨鍣ㄥ彉鍖栦簨浠� +const onPickerChange = ({ selectedValues, selectedOptions }) => { + selectedSalesman.value = selectedOptions[0]; + tempSalesmanValue.value = { + text: selectedOptions[0]?.text, + value: selectedOptions[0]?.value + }; +}; + +// 纭閫夋嫨涓氬姟鍛� +const confirmSalesman = () => { + if (selectedSalesman.value) { + form.value.salesman = selectedSalesman.value.text; + pickerValue.value = [selectedSalesman.value.value]; + } showPicker.value = false; }; + +// 瀹㈡埛閫夋嫨鍣ㄥ彉鍖栦簨浠� +const onCustomerPickerChange = ({ selectedValues, selectedOptions }) => { + selectedCustomer.value = selectedOptions[0]; + tempCustomerValue.value = { + text: selectedOptions[0]?.text, + value: selectedOptions[0]?.value + }; +}; + +// 纭閫夋嫨瀹㈡埛 +const confirmCustomer = () => { + if (selectedCustomer.value) { + form.value.customerName = selectedCustomer.value.text; + form.value.customerId = selectedCustomer.value.value; + pickerCustomerValue.value = [selectedCustomer.value.value]; + } + showCustomerPicker.value = false; +}; + +// 淇敼鍘熸湁鐨勭‘璁ゆ柟娉曪紙淇濇寔鍏煎鎬э級 +const onConfirm = ({ selectedValues, selectedOptions }) => { + if (selectedOptions && selectedOptions[0]) { + form.value.salesman = selectedOptions[0].text; + pickerValue.value = [selectedValues[0]]; + } + showPicker.value = false; +}; + const onCustomerConfirm = ({ selectedValues, selectedOptions }) => { - form.value.customerName = selectedOptions[0]?.text; - form.value.customerId = selectedOptions[0]?.value; - pickerCustomerValue.value = [selectedValues[0]]; + if (selectedOptions && selectedOptions[0]) { + form.value.customerName = selectedOptions[0].text; + form.value.customerId = selectedOptions[0].value; + pickerCustomerValue.value = [selectedValues[0]]; + } showCustomerPicker.value = false; }; const onDateConfirm = ({ selectedValues }) => { @@ -706,20 +773,20 @@ }; const getUserList = () => { userListNoPage().then((res) => { - // 灏嗙敤鎴锋暟鎹粍瑁呮垚 picker 闇�瑕佺殑鏍煎紡 - userList.value = res.data.map(user => ({ + // 纭繚鏁版嵁鏍煎紡姝g‘ + userList.value = [res.data.map(user => ({ text: user.nickName, value: user.nickName - })); + }))]; }) } const getCustomerList = () => { customerList().then((res) => { - // 灏嗙敤鎴锋暟鎹粍瑁呮垚 picker 闇�瑕佺殑鏍煎紡 - customerOption.value = res.map(item => ({ + // 纭繚鏁版嵁鏍煎紡姝g‘ + customerOption.value = [res.map(item => ({ text: item.customerName, value: item.id - })); + }))]; }) } const convertIdToValue = (data) => { @@ -787,6 +854,7 @@ background: #f8f9fa; padding-bottom: 5rem; } + .header { display: flex; align-items: center; @@ -799,6 +867,7 @@ /* 鍏煎 iOS 鍒樻捣/鐏靛姩宀涘畨鍏ㄥ尯 */ padding-top: env(safe-area-inset-top); } + .title { flex: 1; text-align: center; @@ -806,6 +875,7 @@ font-weight: 600; color: #333; } + .form-section { margin-top: 1rem; } @@ -821,17 +891,20 @@ padding: 1rem; box-shadow: 0 0.125rem 0.5rem rgba(0,0,0,0.04); } + .section-header { display: flex; align-items: center; justify-content: space-between; margin-bottom: 1rem; } + .section-title { font-size: 1rem; font-weight: 600; color: #333; } + .product-card { background: #FFFFFF; box-shadow: 0 0 1.25rem 0 rgba(0,57,117,0.08); @@ -839,6 +912,7 @@ padding: 1rem 0.5rem 0 0.5rem; position: relative; } + .product-header { display: flex; align-items: center; @@ -846,70 +920,46 @@ padding: 0 0.5rem 0.75rem 0.5rem; border-bottom: 0.0625rem solid #e8e8e8; } + .product-productCategory { margin-left: 0.5rem; font-size: 0.875rem; font-weight: 500; color: #333; } + .info-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 0.75rem; margin-bottom: 1rem; } + .info-item { display: flex; flex-direction: column; gap: 0.25rem; } + .info-label { font-size: 0.75rem; color: #666; font-weight: 400; } + .info-value { font-size: 0.875rem; color: #333; font-weight: 500; } + .info-value.highlight { color: #2979ff; font-weight: 600; } + .product-form { margin-bottom: 1rem; -} -.footer-btns { - position: fixed; - left: 0; - right: 0; - bottom: 0; - background: #fff; - display: flex; - justify-content: space-around; - align-items: center; - padding: 0.75rem 0; - box-shadow: 0 -0.125rem 0.5rem rgba(0,0,0,0.05); - z-index: 1000; -} -.cancel-btn { - font-weight: 400; - font-size: 1rem; - color: #FFFFFF; - width: 6.375rem; - background: #C7C9CC; - box-shadow: 0 0.25rem 0.625rem 0 rgba(3,88,185,0.2); - border-radius: 2.5rem 2.5rem 2.5rem 2.5rem; -} -.save-btn { - font-weight: 400; - font-size: 1rem; - color: #FFFFFF; - width: 14rem; - background: linear-gradient( 140deg, #00BAFF 0%, #006CFB 100%); - box-shadow: 0 0.25rem 0.625rem 0 rgba(3,88,185,0.2); - border-radius: 2.5rem 2.5rem 2.5rem 2.5rem; } .popup-header { @@ -922,13 +972,102 @@ top: 0; z-index: 10; } + .cancelButton { color: #969799 } + .confirmButton { color: #1989FA } + .u-tree { height: 13rem; } + +/* 绉婚櫎 input 杈规鐨勬牱寮� */ +:deep(.u-input) { + border: none !important; + box-shadow: none !important; + background: transparent !important; +} + +:deep(.u-input__content) { + border: none !important; + box-shadow: none !important; + background: transparent !important; +} + +:deep(.u-input__content__field-wrapper) { + border: none !important; + box-shadow: none !important; + background: transparent !important; +} + +:deep(.u-input__content__field-wrapper__field) { + border: none !important; + box-shadow: none !important; + background: transparent !important; + outline: none !important; +} + +/* 绉婚櫎 textarea 杈规鐨勬牱寮� */ +:deep(.u-textarea) { + border: none !important; + box-shadow: none !important; + background: transparent !important; +} + +:deep(.u-textarea__content) { + border: none !important; + box-shadow: none !important; + background: transparent !important; +} + +:deep(.u-textarea__content__field) { + border: none !important; + box-shadow: none !important; + background: transparent !important; + outline: none !important; +} + +/* 绉婚櫎 form-item 鐨勮竟妗� */ +:deep(.u-form-item) { + border: none !important; +} + +:deep(.u-form-item__body) { + border: none !important; +} + +/* 淇濇寔鍒嗗壊绾挎牱寮� */ +:deep(.u-form-item--border-bottom) { + border-bottom: 1px solid #ebeef5 !important; +} + +/* 閫夋嫨鍣ㄥご閮ㄦ牱寮� */ +.picker-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 15px 20px; + background: #fff; + border-bottom: 1px solid #ebeef5; +} + +.picker-cancel { + color: #909399; + font-size: 16px; +} + +.picker-title { + color: #303133; + font-size: 16px; + font-weight: 500; +} + +.picker-confirm { + color: #2979ff; + font-size: 16px; +} </style> -- Gitblit v1.9.3