gongchunyi
2026-02-13 f8f9a3bda066d2d757b658dd346c781267687c84
Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
已修改3个文件
15 ■■■■■ 文件已修改
src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/financialManagement/revenueManagement/Modal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/receiptPayment/index.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
@@ -222,7 +222,17 @@
// 初始化时间选项
const initTimeOptions = () => {
  const options = []
  const now = new Date()
  const currentHour = now.getHours()
  const currentMinute = now.getMinutes()
  for (let hour = 8; hour <= 18; hour++) {
    // 开始时间必须晚于当前时间
    if (hour < currentHour) {
      continue
    }
    if (hour === currentHour && currentMinute > 30) {
      continue
    }
    // 每个小时添加两个选项:整点和半点
    options.push({
      value: `${hour.toString().padStart(2, '0')}:00`,
src/views/financialManagement/revenueManagement/Modal.vue
@@ -26,7 +26,7 @@
          placeholder="请选择"
          clearable
        >
          <el-option :label="item.label" :value="item.value" v-for="(item,index) in income_types" :key="index" />
          <el-option :label="item.label" :value="item.value" v-for="(item,index) in income_types.filter(item => item.value != 3)" :key="index" />
        </el-select>
      </el-form-item>
      <el-form-item label="客户名称" prop="customerName">
src/views/salesManagement/receiptPayment/index.vue
@@ -40,6 +40,7 @@
      <el-table
        :data="tableData"
        border
        ref="tableRef"
        v-loading="tableLoading"
        @selection-change="handleSelectionChange"
        :row-key="(row) => row.id"
@@ -313,6 +314,7 @@
});
const total = ref(0);
const expandedRowKeys = ref([]);
const tableRef = ref(null);
// 用户信息表单弹框数据
const dialogFormVisible = ref(false);
@@ -491,6 +493,7 @@
  dialogFormVisible.value = false;
  // 避免二次打开弹窗时仍携带上一次的选择导致“多出一行/脏数据”
  selectedRows.value = [];
  tableRef.value?.clearSelection();
};
// 删除回款记录