8d258026876dd93bd0407d5440d48294f41120ba..155d0cb16d9549c701d9ad59e519a7fc5bc899a2
2025-08-18 sen
Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
155d0c 对比 | 目录
2025-08-18 sen
修改
238c45 对比 | 目录
2个文件已修改
59 ■■■■■ 已修改文件
ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ui/admin-ui3/src/views/cwgl/estimatedReceivable/index.vue
@@ -38,14 +38,16 @@
          @click="handleEditBtn(row, index)" v-if="[0, 1].includes(row.relatedBillStatus) && row.isConfirmed != 2"
          v-hasPermi="['cwgl:estimatedReceivable:cancel']"> 编辑
        </el-link>
        <el-link class="link-btn" type="primary" v-if="row.isConfirmed == 1" :underline="false" plain :size="size"
          @click="handleCancel(row)" v-hasPermi="['cwgl:estimatedReceivable:cancel']"> 取消确认
        <el-link class="link-btn" type="primary"
          v-if="row.isConfirmed == 1 && row.relatedBillStatus != 2 && row.relatedBillStatus != 3" :underline="false"
          plain :size="size" @click="handleCancel(row)" v-hasPermi="['cwgl:estimatedReceivable:cancel']"> 取消确认
        </el-link>
        <el-link class="link-btn" type="primary" v-if="row.isConfirmed == 0 && ![2, 3].includes(row.relatedBillStatus)"
          :underline="false" plain @click="handleAffirm(row)" v-hasPermi="['cwgl:estimatedReceivable:confirm']"> 确认
        </el-link>
        <el-link class="link-btn" type="primary" v-if="row.isConfirmed == 1" :underline="false" plain
          @click="handleInvalid(row)" v-hasPermi="['cwgl:estimatedReceivable:invalid']"> 作废
        <el-link class="link-btn" type="primary"
          v-if="row.isConfirmed == 1 && row.relatedBillStatus != 2 && row.relatedBillStatus != 3" :underline="false"
          plain @click="handleInvalid(row)" v-hasPermi="['cwgl:estimatedReceivable:invalid']"> 作废
        </el-link>
        <el-link class="link-btn" type="primary" :underline="false" plain @click="handleFlow(row)"
          v-hasPermi="['cwgl:estimatedReceivable:flog']"> 日志
ui/admin-ui3/src/views/cwgl/pendingSettlementBusiness/index.vue
@@ -308,17 +308,26 @@
      minWidth: 120,
    },
      relatedBillName: {
      label: '关联联账单名称',
        isCreate: {
      label: '是否已入账', dataType: 'string',
      type: 'select',
      fixed: 'right',
      minWidth: 120,
      search: true,
      dicUrl: '/system/dict/data/type/sys_whether_type',
    },
    billName: {
      label: '关联账单名称',
      fixed: 'right',
      minWidth: 120,
      search: true,
    },
    isIncomeMatched: {
      label: '是否匹配收入',
      type: 'select',
      dataType: 'string',
      minWidth: 120,
      dicUrl: '/system/dict/data/type/sys_matching_status',
    },
    isCostMatched: {
@@ -328,14 +337,8 @@
      minWidth: 120,
      dicUrl: '/system/dict/data/type/sys_matching_status',
    },
    isCreate: {
      label: '是否已入账', dataType: 'string',
      type: 'select',
      fixed: 'right',
      minWidth: 120,
      dicUrl: '/system/dict/data/type/sys_whether_type',
    },
    relatedBillStatus: {
      minWidth: 120,
      label: '关联账单状态',
@@ -442,15 +445,25 @@
      crudRef.value.rowEdit(selectionList.value[0]);
    },
    handleSelectionChangeFunc: (selection: any) => {
      if (selection.every((item: any) => item.isCreate == '0')) {
        generateDisabled.value = false;
      } else {
        generateDisabled.value = true;
        if (selection.length > 0) {
          proxy.$message.warning('请选择未入账的记录');
      if (selection.length > 0) {
        // 检查是否所有记录都是未入账状态(isCreate == '0')
        const allNotCreated = selection.every((item: any) => item.isCreate == '0');
        // 检查是否所有记录的客户名称都相同
        const sameCustomer = selection.every((item: any) => item.customerName === selection[0].customerName);
        if (allNotCreated && sameCustomer) {
          generateDisabled.value = false;
        } else {
          generateDisabled.value = true;
          if (!allNotCreated) {
            proxy.$message.warning('请选择未入账的记录');
          } else if (!sameCustomer) {
            proxy.$message.warning('请选择相同客户名称的记录');
          }
        }
      } else {
        generateDisabled.value = false;
      }
      selectionList.value = selection;
      selectionList.value = selection;
    }
  })