gaoluyang
3 天以前 89cd3efd5dc533e6c8129d7d86dc74e1adf3d84c
1.回款登记页面开发账联调
已修改6个文件
已添加2个文件
731 ■■■■■ 文件已修改
src/pages.json 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/sales/invoiceLedger/detail.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/sales/invoiceLedger/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/sales/invoicingRegistration/add.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/sales/receiptPayment/add.vue 299 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/sales/receiptPayment/index.vue 405 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/sales/salesAccount/detail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages.json
@@ -106,6 +106,20 @@
      }
    },
    {
      "path": "pages/sales/receiptPayment/index",
      "style": {
        "navigationBarTitleText": "回款登记",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/sales/receiptPayment/add",
      "style": {
        "navigationBarTitleText": "新增回款",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/common/webview/index",
      "style": {
        "navigationBarTitleText": "浏览网页"
src/pages/index.vue
@@ -303,6 +303,11 @@
                url: '/pages/sales/invoiceLedger/index'
            });
            break;
        case '回款登记':
            uni.navigateTo({
                url: '/pages/sales/receiptPayment/index'
            });
            break;
        case '协同审批':
            uni.navigateTo({
                url: '/pages/cooperativeOffice/collaborativeApproval/index'
src/pages/sales/invoiceLedger/detail.vue
@@ -87,6 +87,7 @@
const currentInvoiceDate = ref([new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()])
const goBack = () => {
    uni.removeStorageSync('invoiceLedgerEditRow');
    uni.navigateBack()
}
src/pages/sales/invoiceLedger/index.vue
@@ -230,6 +230,7 @@
    commitFile,
    delInvoiceLedgerByRegProductId
} from '@/api/salesManagement/invoiceLedger.js'
import {onShow} from "@dcloudio/uni-app";
const userStore = useUserStore()
@@ -518,7 +519,7 @@
    }
}
onMounted(() => {
onShow(() => {
    getList()
})
</script>
src/pages/sales/invoicingRegistration/add.vue
@@ -358,7 +358,7 @@
        productData.value = res.productData;
        form.value = { ...res };
        // è®¾ç½®é»˜è®¤å½•入人
        form.value.createUer = userStore.name || ''
        form.value.createUer = userStore.nickName || ''
        
        // è®¾ç½®é»˜è®¤æ—¥æœŸ
        const today = new Date()
src/pages/sales/receiptPayment/add.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,299 @@
<template>
  <view class="account-detail">
    <!-- é¡µé¢å¤´éƒ¨ -->
    <van-nav-bar
      title="新增回款"
      left-text="返回"
      left-arrow
      @click-left="onClickLeft"
      fixed
      placeholder
    />
    <!-- è¡¨å•内容 -->
    <van-form @submit="onSubmit" ref="formRef" label-width="110px" input-align="right" error-message-align="right" scroll-to-error scroll-to-error-position="center">
      <!-- åŸºæœ¬ä¿¡æ¯ -->
      <van-cell-group title="基本信息" inset>
        <van-field
          v-model="form.salesContractNo"
          label="销售合同号"
          placeholder="自动填充"
          readonly
        />
        <van-field
          v-model="form.customerName"
          label="客户名称"
          placeholder="自动填充"
          readonly
        />
        <van-field
          v-model="form.invoiceNo"
          label="发票号"
          placeholder="自动填充"
          readonly
        />
        <van-field
          v-model="form.invoiceTotal"
          label="发票金额(元)"
          placeholder="自动填充"
          readonly
        />
        <van-field
          v-model="form.taxRate"
          label="税率"
          placeholder="自动填充"
          readonly
        />
                <view class="tip-text">待回款金额:{{ currentNoReceiptAmount }} å…ƒ</view>
        <van-field
          v-model="form.receiptPaymentAmount"
          label="本次回款金额"
          type="number"
          placeholder="请输入"
                    @blur="changeNum"
          :rules="[{ required: true, message: '请输入回款金额' }]"
          clearable
        />
        <van-field
          v-model="form.receiptPaymentTypeName"
          label="回款形式"
          placeholder="请选择"
          readonly
          @click="showPaymentTypePicker"
          :rules="[{ required: true, message: '请选择回款形式' }]"
        />
                <van-field
                    v-model="form.receiptPaymentDate"
                    label="来款日期"
                    placeholder="请选择"
                    readonly
                    @click="showDatePicker"
                    :rules="[{ required: true, message: '请选择来款日期' }]"
                />
        <van-field
          v-model="form.registrant"
          label="登记人"
          placeholder="自动填充"
          readonly
        />
      </van-cell-group>
      <!-- æäº¤æŒ‰é’® -->
      <view class="footer-btns">
        <van-button class="cancel-btn" @click="onClickLeft">取消</van-button>
        <van-button class="save-btn" native-type="submit" form-type="submit" :loading="loading">保存</van-button>
      </view>
    </van-form>
    <!-- å›žæ¬¾æ–¹å¼é€‰æ‹©å™¨ -->
    <van-popup v-model:show="showPaymentType" position="bottom">
      <van-picker
                :model-value="pickerValue"
        :columns="receipt_payment_type"
        @confirm="onPaymentTypeConfirm"
        @cancel="showPaymentType = false"
      />
    </van-popup>
    <!-- æ—¥æœŸé€‰æ‹©å™¨ -->
    <van-popup v-model:show="showDate" position="bottom">
      <van-date-picker
        v-model="currentDate"
        title="选择日期"
        @confirm="onDateConfirm"
        @cancel="showDate = false"
      />
    </van-popup>
  </view>
</template>
<script setup>
import { ref, onMounted, computed } from 'vue'
import { receiptPaymentSaveOrUpdate, invoiceInfo } from '@/api/salesManagement/receiptPayment'
import useUserStore from '@/store/modules/user'
import { showToast, showNotify } from 'vant'
import { useDict } from '@/utils/dict'
const userStore = useUserStore()
// è¡¨å•引用
const formRef = ref()
// å“åº”式数据
const loading = ref(false)
const showPaymentType = ref(false)
const pickerValue = ref([])
const showDate = ref(false)
const currentDate = ref([new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()])
// è¡¨å•数据
const form = ref({
  salesContractNo: '',
  customerName: '',
  invoiceNo: '',
  invoiceTotal: '',
  taxRate: '',
  receiptPaymentAmount: '',
  receiptPaymentType: '',
    receiptPaymentTypeName: '',
  registrant: '',
  receiptPaymentDate: '',
  invoiceLedgerId: ''
})
const currentNoReceiptAmount = ref(0)
// èŽ·å–å­—å…¸æ•°æ®
const { receipt_payment_type: dictReceiptPaymentType } = useDict('receipt_payment_type')
// è½¬æ¢å­—典数据格式为选择器需要的格式
const receipt_payment_type = computed(() => {
  return dictReceiptPaymentType.value.map(item => ({
    text: item.label,
    value: item.value
  }))
})
// è¿”回上一页
const onClickLeft = () => {
    uni.removeStorageSync('invoiceLedgerEditRow');
    uni.navigateBack()
}
// æ˜¾ç¤ºå›žæ¬¾æ–¹å¼é€‰æ‹©å™¨
const showPaymentTypePicker = () => {
  showPaymentType.value = true
}
const changeNum = () => {
    if (form.value.receiptPaymentAmount > currentNoReceiptAmount.value) {
        form.value.receiptPaymentAmount = currentNoReceiptAmount.value
        showToast('不可大于待回款金额')
    }
}
// ç¡®è®¤å›žæ¬¾æ–¹å¼é€‰æ‹©
const onPaymentTypeConfirm = ({ selectedValues, selectedOptions }) => {
  form.value.receiptPaymentType = selectedOptions[0].value
  form.value.receiptPaymentTypeName = selectedOptions[0].text
    pickerValue.value = selectedValues;
  showPaymentType.value = false
}
// æ˜¾ç¤ºæ—¥æœŸé€‰æ‹©å™¨
const showDatePicker = () => {
  showDate.value = true
}
// ç¡®è®¤æ—¥æœŸé€‰æ‹©
const onDateConfirm = ({ selectedValues }) => {
  form.value.receiptPaymentDate = selectedValues.join('-')
    currentDate.value = selectedValues
  showDate.value = false
}
// æäº¤è¡¨å•
const onSubmit = () => {
  // è¡¨å•验证
  if (!form.value.receiptPaymentAmount) {
    showNotify({ type: 'warning', message: '请输入回款金额' })
    return
  }
  if (!form.value.receiptPaymentType) {
    showNotify({ type: 'warning', message: '请选择回款形式' })
    return
  }
  if (!form.value.receiptPaymentDate) {
    showNotify({ type: 'warning', message: '请选择来款日期' })
    return
  }
  loading.value = true
  receiptPaymentSaveOrUpdate(form.value)
    .then(() => {
      showToast('提交成功')
      // é€šçŸ¥ä¸Šä¸€é¡µåˆ·æ–°æ•°æ®
      const pages = getCurrentPages();
      const prevPage = pages[pages.length - 2];
      if (prevPage && prevPage.$vm && prevPage.$vm.getList) {
        prevPage.$vm.getList();
      }
      uni.removeStorageSync('invoiceLedgerEditRow');
      uni.navigateBack()
    })
    .catch((error) => {
            loading.value = false
    })
}
// åˆå§‹åŒ–数据
const initData = () => {
    const rowStr = uni.getStorageSync('invoiceLedgerEditRow')
    const row = JSON.parse(rowStr)
    invoiceInfo({ id: row.id }).then((res) => {
        const data = res.data
        form.value = { ...data}
        form.value.invoiceLedgerId = form.value.id;
        form.value.id = "";
        currentNoReceiptAmount.value = row.noReceiptAmount
        form.value.registrant = userStore.nickName
    }).catch(() => {
        showToast('获取数据失败')
    })
}
onMounted(() => {
  initData()
})
</script>
<style scoped lang="scss">
.account-detail {
  min-height: 100vh;
  background: #f8f9fa;
  padding-bottom: 5rem;
}
.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;
}
// å“åº”式调整
@media (max-width: 768px) {
  .submit-section {
    padding: 12px;
  }
}
.tip-text { padding: 4px 16px 0 16px; font-size: 12px; color: #888; }
</style>
src/pages/sales/receiptPayment/index.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,405 @@
<template>
    <view class="receipt-payment">
        <!-- é¡µé¢å¤´éƒ¨ -->
        <van-nav-bar
            title="回款登记"
            left-text="返回"
            left-arrow
            @click-left="goBack"
            fixed
            placeholder
        />
        <!-- æœç´¢å’Œç­›é€‰åŒºåŸŸ -->
        <view class="search-filter-section">
            <view class="search-bar">
                <view class="search-input">
                    <input
                        class="search-text"
                        placeholder="客户名称/合同号/项目名称"
                        v-model="searchForm.searchText"
                        confirm-type="search"
                    />
                </view>
                <view class="filter-button" @click="getList">
                    <up-icon name="search" size="24" color="#999"></up-icon>
                </view>
            </view>
            <!-- ç­›é€‰å¼€å…³ -->
            <view class="switch-row">
                <text class="switch-label">不显示待回款为0</text>
                <van-switch v-model="searchForm.status" @change="getList" size="18"/>
            </view>
        </view>
        <!-- åˆ—表区域 -->
        <view class="ledger-list" v-if="tableData.length > 0">
            <view v-for="(item, index) in tableData" :key="index">
                <view class="ledger-item">
                    <view class="item-header">
                        <view class="item-left">
                            <view class="document-icon">
                                <up-icon name="file-text" size="16" color="#ffffff"></up-icon>
                            </view>
                            <text class="item-id">{{ item.salesContractNo }}</text>
                        </view>
                    </view>
                    <up-divider></up-divider>
                    <view class="item-details">
                        <view class="detail-row">
                            <text class="detail-label">客户名称</text>
                            <text class="detail-value">{{ item.customerName }}</text>
                        </view>
                        <view class="detail-row">
                            <text class="detail-label">客户合同号</text>
                            <text class="detail-value">{{ item.customerContractNo }}</text>
                        </view>
                        <view class="detail-row">
                            <text class="detail-label">项目名称</text>
                            <text class="detail-value">{{ item.projectName }}</text>
                        </view>
                        <view class="detail-row">
                            <text class="detail-label">产品大类</text>
                            <text class="detail-value">{{ item.productCategory }}</text>
                        </view>
                        <view class="detail-row">
                            <text class="detail-label">发票号</text>
                            <text class="detail-value">{{ item.invoiceNo || '-' }}</text>
                        </view>
                        <view class="detail-row">
                            <text class="detail-label">发票金额(元)</text>
                            <text class="detail-value highlight">{{ formatNumber(item.invoiceTotal) }}</text>
                        </view>
                        <view class="detail-row">
                            <text class="detail-label">税率(%)</text>
                            <text class="detail-value">{{ item.taxRate }}</text>
                        </view>
                        <view class="detail-row">
                            <text class="detail-label">回款金额(元)</text>
                            <text class="detail-value highlight">{{ formatNumber(item.receiptPaymentAmountTotal) }}</text>
                        </view>
                        <view class="detail-row">
                            <text class="detail-label">待回款金额(元)</text>
                            <text class="detail-value danger">{{ formatNumber(item.noReceiptAmount) }}</text>
                        </view>
                    </view>
                    <!-- æ“ä½œæŒ‰é’® -->
                    <view class="action-buttons">
                        <van-button
                            type="primary"
                            size="small"
                            class="action-btn"
                            :disabled="item.noReceiptAmount == 0"
                            @click="openForm(item)"
                        >
                            æ–°å¢žå›žæ¬¾
                        </van-button>
                    </view>
                </view>
            </view>
        </view>
        <!-- æ— æ•°æ®æç¤º -->
        <view class="no-data" v-else>
            <text>暂无回款数据</text>
        </view>
        <!-- å›žæ¬¾æ–¹å¼é€‰æ‹©å™¨ -->
        <van-popup v-model:show="showPaymentType" position="bottom">
            <van-picker
                :columns="receipt_payment_type"
                @confirm="onPaymentTypeConfirm"
                @cancel="showPaymentType = false"
            />
        </van-popup>
    </view>
</template>
<script setup>
import { ref } from 'vue'
import {
    bindInvoiceNoRegPage,
} from '@/api/salesManagement/receiptPayment'
import useUserStore from '@/store/modules/user'
import { showToast } from 'vant'
import {onShow} from "@dcloudio/uni-app";
const userStore = useUserStore()
// å“åº”式数据
const tableData = ref([])
const tableLoading = ref(false)
const showPaymentType = ref(false)
const currentEditRow = ref(null)
// æŸ¥è¯¢å‚数设置为-1获取全部数据
const page = ref({
    current: -1,
    size: -1
})
// æœç´¢è¡¨å•
const searchForm = ref({
    searchText: '',
    status: true,
    customerName: '',
    customerContractNo: '',
    projectName: ''
})
// å›žæ¬¾æ–¹å¼é€‰é¡¹
const receipt_payment_type = ref([
    { text: '现金', value: '1' },
    { text: '银行转账', value: '2' },
    { text: '支票', value: '3' },
    { text: '其他', value: '4' }
])
// æ ¼å¼åŒ–æ•°å­—
const formatNumber = (value) => {
    return parseFloat(value || 0).toFixed(2)
}
// è¿”回上一页
const goBack = () => {
    uni.navigateBack()
}
// èŽ·å–åˆ—è¡¨æ•°æ®
const getList = () => {
    tableLoading.value = true
    bindInvoiceNoRegPage({ ...searchForm.value, ...page.value })
        .then((res) => {
            tableLoading.value = false
            tableData.value = res.data.records || []
        })
        .catch(() => {
            tableLoading.value = false
        })
}
// æ‰“开新增表单
const openForm = (item) => {
    if (item.noReceiptAmount == 0) {
        showToast('无需再回款')
        return
    }
    uni.setStorageSync('invoiceLedgerEditRow', JSON.stringify(item))
    uni.navigateTo({ url: '/pages/sales/receiptPayment/add' })
}
// ç¡®è®¤å›žæ¬¾æ–¹å¼é€‰æ‹©
const onPaymentTypeConfirm = (value) => {
    if (currentEditRow.value) {
        currentEditRow.value.receiptPaymentType = value.value
    }
    showPaymentType.value = false
}
onShow(() => {
    getList()
})
</script>
<style scoped lang="scss">
.u-divider {
    margin: 0 !important;
}
.receipt-payment {
    min-height: 100vh;
    background: #f8f9fa;
    position: relative;
}
.search-filter-section {
    padding: 10px 20px;
    background: #ffffff;
}
.search-bar {
    display: flex;
    align-items: center;
    gap: 12px;
}
.search-input {
    flex: 1;
    background: #f5f5f5;
    border-radius: 24px;
    padding: 10px 16px;
    display: flex;
    align-items: center;
    gap: 8px;
}
.search-text {
    flex: 1;
    font-size: 14px;
    color: #333;
    background: transparent;
    border: none;
    outline: none;
}
.search-text::placeholder {
    color: #999;
}
.filter-button {
    width: 40px;
    height: 40px;
    border-radius: 8px;
    display: flex;
    align-items: center;
    justify-content: center;
}
.switch-row {
    padding: 8px;
    display: flex;
    align-items: center;
    justify-content: space-between;
    margin-top: 8px;
}
.switch-label {
    font-size: 14px;
    color: #333;
}
.ledger-list {
    padding: 20px;
}
.ledger-item {
    background: #ffffff;
    border-radius: 12px;
    margin-bottom: 16px;
    overflow: hidden;
    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
    padding: 0 16px;
}
.item-header {
    padding: 16px 0;
    display: flex;
    align-items: center;
    justify-content: space-between;
}
.item-left {
    display: flex;
    align-items: center;
    gap: 8px;
}
.document-icon {
    width: 24px;
    height: 24px;
    background: #2979ff;
    border-radius: 4px;
    display: flex;
    align-items: center;
    justify-content: center;
}
.item-id {
    font-size: 14px;
    color: #333;
    font-weight: 500;
}
.item-details {
    padding: 16px 0;
}
.detail-row {
    display: flex;
    align-items: flex-end;
    justify-content: space-between;
    margin-bottom: 8px;
    &:last-child {
        margin-bottom: 0;
    }
}
.detail-label {
    font-size: 12px;
    color: #777777;
    min-width: 60px;
}
.detail-value {
    font-size: 12px;
    color: #000000;
    text-align: right;
    flex: 1;
    margin-left: 16px;
    display: flex;
    align-items: center;
    justify-content: flex-end;
}
.detail-value.highlight {
    color: #2979ff;
    font-weight: 500;
}
.detail-value.danger {
    color: #ee0a24;
    font-weight: 500;
}
.children-list {
    .children-title {
        font-size: 14px;
        font-weight: 500;
        color: #333;
        padding: 12px 0 8px 0;
        border-top: 1px solid #f0f0f0;
    }
}
.child-item {
    .child-details {
        padding: 12px 0;
    }
    .child-actions {
        display: flex;
        gap: 8px;
        padding: 8px 0 16px 0;
        justify-content: flex-end;
    }
}
.action-buttons {
    display: flex;
    gap: 12px;
    padding: 0 0 16px 0;
    justify-content: space-between;
}
.action-btn {
    flex: 1;
    display: flex;
    align-items: center;
    justify-content: center;
    gap: 8px;
}
.no-data {
    padding: 40px 0;
    text-align: center;
    color: #999;
}
</style>
src/pages/sales/salesAccount/detail.vue
@@ -616,7 +616,7 @@
};
const setUserInfo = () => {
    form.value.entryPerson = userStore.id;
    form.value.entryPersonName = userStore.name;
    form.value.entryPersonName = userStore.nickName;
    // è®¾ç½®å½“天日期
    const today = new Date()
    const year = today.getFullYear()