Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

wujianwei

5 天以前 89fd2cf7202c321512c2ea699a3a220a7138ed44

Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

 ui/admin-ui3/src/api/cwgl/payableBillManagement.ts

@@ -87,4 +87,14 @@
        method: 'post',
        data
    })
}
/**
 * 审核应付账单管理
 */
export const receivableBillManagementAudit:requestType = (data) => {
    return request({
        url: '/cwgl/receivableBillManagement/audit',
        method: 'put',
        data
    })
}

 ui/admin-ui3/src/api/cwgl/receivableBillManagement.ts

@@ -87,4 +87,15 @@
        url: '/cwgl/receivableBillManagement/invoice/amount/' + id,
        method:'get'
    })
}

/**
 * 审核应收账单管理
 */
export const receivableBillManagementAudit:requestType = (data) => {
    return request({
        url: '/cwgl/receivableBillManagement/audit',
        method: 'put',
        data
    })
}

 ui/admin-ui3/src/views/cwgl/payableBillManagement/index.vue

@@ -31,6 +31,11 @@
          :underline="false" plain :size="size" @click="handleViewHistory(row)"
          v-hasPermi="['cwgl:payableBillManagement:list']"> 结算明细
        </el-link>
             <el-link class="link-btn" v-if="row.auditStatus == 0 || row.auditStatus == 2" type="primary" :underline="false" plain :size="size" 
          @click="handleAuditClick(row)"
          v-hasPermi="['cwgl:receivableBillManagement:audit']"> 
          审核 
        </el-link>
        <el-link class="link-btn" type="primary" :underline="false" plain :size="size" @click="handleViewFeeDetail(row)"
          v-hasPermi="['cwgl:payableBillManagement:view']"> 详情
        </el-link>
@@ -52,15 +57,42 @@
  <!-- 开票 -->
  <makeOutInvoice ref="makeOutInvoiceRef" :type="makeType"  :InvoiceDetails="InvoiceDetails" @success="makeOutInvoiceFresh" />


     <el-dialog title="账单审核" v-model="auditDialogVisible" width="500px" append-to-body>
    <el-form :model="auditForm" :rules="auditRules" ref="auditFormRef" label-width="100px">
      <!-- <el-form-item label="账单ID" prop="billId">
        <el-input v-model="auditForm.billId" disabled />
      </el-form-item> -->
      <!-- <el-form-item label="账单类型" prop="billType">
        <el-select v-model="auditForm.billType" placeholder="请选择" style="width: 100%" disabled>
          <el-option label="应收" :value="0" />
          <el-option label="应付" :value="1" />
        </el-select>
      </el-form-item> -->
      <el-form-item label="审核结果" prop="auditResult">
        <el-radio-group v-model="auditForm.auditResult" @change="handleAuditResultChange" >
          <el-radio :label="1">通过</el-radio>
          <el-radio :label="2">驳回</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="审核意见" prop="auditComment">
        <el-input v-model="auditForm.auditComment" type="textarea" :rows="3" placeholder="请输入审核意见" />
      </el-form-item>
    </el-form>
    <template #footer>
      <span class="dialog-footer">
        <el-button @click="auditDialogVisible = false">取 消</el-button>
        <el-button type="primary" @click="submitAudit">确 定1</el-button>
      </span>
    </template>
  </el-dialog>
</template>

<script setup name="payableBillManagement" lang="ts">
import { payableBillManagementInvoice,invoiceAmount,PayableBillManagementI,payableBillManagementVoid, addPayableBillManagement, delPayableBillManagement, exportPayableBillManagement, getPayableBillManagement, listPayableBillManagement, updatePayableBillManagement } from "@/api/cwgl/payableBillManagement";
import { payableBillManagementInvoice,invoiceAmount,PayableBillManagementI,payableBillManagementVoid, addPayableBillManagement, delPayableBillManagement, exportPayableBillManagement, getPayableBillManagement, listPayableBillManagement, updatePayableBillManagement,receivableBillManagementAudit } from "@/api/cwgl/payableBillManagement";
import useCurrentInstance from "@/utils/useCurrentInstance";
import { listPayableInvoiceBusiness,} from "@/api/cwgl/payableInvoiceBusiness";

import { computed, reactive, ref, toRefs } from "vue";
import { computed, reactive, ref, toRefs,nextTick } from "vue";
import { PagesInterface, PageQueryInterface } from "@/utils/globalInterface";
import { usePagePlus } from "@/hooks/usePagePlus";
import { hasPermission } from "@/utils/permissionUtils";
@@ -471,4 +503,92 @@
    }
  })
}

  const auditDialogVisible = ref(false);
  const auditFormRef = ref();
  
  // 审核表单数据
  const auditForm = reactive({
    billId: null as number | null,
    billType: null as number | null, // 0:应收, 1:应付
    auditResult: null as number | null, // 1:通过, 2:驳回
    auditComment: ''
  });
  const getAuditRules = () => {
    return {
      billId: [{ required: true, message: '账单ID不能为空', trigger: 'blur' }],
      billType: [{ required: true, message: '账单类型不能为空', trigger: 'change' }],
      auditResult: [{ required: true, message: '审核结果不能为空', trigger: 'change' }],
      // 动态规则：如果 auditResult 为 2 (驳回)，则必填
      auditComment: [
        { 
          required: auditForm.auditResult === 2, 
          message: '驳回时必须填写审核意见', 
          trigger: 'blur' 
        }
      ]
    };
  };
  const validateAuditComment = (rule: any, value: any, callback: any) => {
    if (auditForm.auditResult === 2 && !value) {
      callback(new Error('驳回时必须填写审核意见'));
    } else {
      callback();
    }
  };
  // 表单校验规则
  const auditRules = {
    billId: [{ required: true, message: '账单ID不能为空', trigger: 'blur' }],
    billType: [{ required: true, message: '账单类型不能为空', trigger: 'change' }],
    auditResult: [{ required: true, message: '审核结果不能为空', trigger: 'change' }],
     auditComment: [{ validator: validateAuditComment, trigger: 'blur' }]
  };
  const handleAuditResultChange = (val: number) => {
    // 当切换审核结果时，立即触发表单校验，以更新审核意见字段的错误提示状态
    if (auditFormRef.value) {
      auditFormRef.value.validateField('auditComment');
    }
    
    // 可选：如果选择通过，可以清空之前填写的驳回意见，或者保留看业务需求
    // if (val === 1) {
    //   auditForm.auditComment = '';
    // }
  };
  /**
   * 点击审核按钮
   */
  const handleAuditClick = (row: any) => {
    // 重置表单
    auditForm.billId = row.id;
    auditForm.billType = 1; 
    auditForm.auditResult = null;
    auditForm.auditComment = '';
    
    // 重置校验状态
    nextTick(() => {
      if (auditFormRef.value) {
        auditFormRef.value.clearValidate();
      }
    });
    
    auditDialogVisible.value = true;
  };


  /**
   * 提交审核
   */
  const submitAudit = () => {
    auditFormRef.value.validate((valid: boolean) => {
      if (valid) {
        receivableBillManagementAudit(auditForm).then(res => {
          if (res.code === 200) {
            proxy.$modal.msgSuccess(res.msg);
            auditDialogVisible.value = false;
            onLoad(page.value); // 刷新列表
          }
        });
      }
    });
  };
</script>

 ui/admin-ui3/src/views/cwgl/receivableBillManagement/index.vue

@@ -35,6 +35,12 @@
        <el-link class="link-btn" type="primary" :underline="false" plain :size="size" @click="handleViewFeeDetail(row)"
          v-hasPermi="['cwgl:receivableBillManagement:view']"> 详情
        </el-link>

        <el-link class="link-btn" v-if="row.auditStatus == 0 || row.auditStatus == 2" type="primary" :underline="false" plain :size="size" 
          @click="handleAuditClick(row)"
          v-hasPermi="['cwgl:receivableBillManagement:audit']"> 
          审核 
        </el-link>
        
        <el-link class="link-btn" v-if="row.status == 0" type="primary"
        :underline="false"
@@ -56,14 +62,44 @@
  <NestedDetailDialog ref="feeDetailRef" :type="activeType" />
  <OperationLogModal ref="logModalRef" />
  <BillEditDialog ref="billDialogRef" @submit="handleBillSubmit" />


   <el-dialog title="账单审核" v-model="auditDialogVisible" width="500px" append-to-body>
    <el-form :model="auditForm" :rules="auditRules" ref="auditFormRef" label-width="100px">
      <!-- <el-form-item label="账单ID" prop="billId">
        <el-input v-model="auditForm.billId" disabled />
      </el-form-item> -->
      <!-- <el-form-item label="账单类型" prop="billType">
        <el-select v-model="auditForm.billType" placeholder="请选择" style="width: 100%" disabled>
          <el-option label="应收" :value="0" />
          <el-option label="应付" :value="1" />
        </el-select>
      </el-form-item> -->
      <el-form-item label="审核结果" prop="auditResult">
        <el-radio-group v-model="auditForm.auditResult" @change="handleAuditResultChange" >
          <el-radio :label="1">通过</el-radio>
          <el-radio :label="2">驳回</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="审核意见" prop="auditComment">
        <el-input v-model="auditForm.auditComment" type="textarea" :rows="3" placeholder="请输入审核意见" />
      </el-form-item>
    </el-form>
    <template #footer>
      <span class="dialog-footer">
        <el-button @click="auditDialogVisible = false">取 消</el-button>
        <el-button type="primary" @click="submitAudit">确 定</el-button>
      </span>
    </template>
  </el-dialog>
</template>

<script setup name="receivableBillManagement" lang="ts">
  import { listReceivableInvoiceBusiness} from "@/api/cwgl/receivableInvoiceBusiness";

import { receivableBillManagementInvoice,invoiceAmount,ReceivableBillManagementI, addReceivableBillManagement, delReceivableBillManagement, exportReceivableBillManagement, getReceivableBillManagement, listReceivableBillManagement, updateReceivableBillManagement,receivableBillManagementVoid } from "@/api/cwgl/receivableBillManagement";
import { receivableBillManagementInvoice,invoiceAmount,ReceivableBillManagementI, addReceivableBillManagement, delReceivableBillManagement, exportReceivableBillManagement, getReceivableBillManagement, listReceivableBillManagement, updateReceivableBillManagement,receivableBillManagementVoid,receivableBillManagementAudit } from "@/api/cwgl/receivableBillManagement";
import useCurrentInstance from "@/utils/useCurrentInstance";
import { computed, reactive, ref, toRefs } from "vue";
import { computed, reactive, ref, toRefs,nextTick } from "vue";
import { PagesInterface, PageQueryInterface } from "@/utils/globalInterface";
import { usePagePlus } from "@/hooks/usePagePlus";
import { hasPermission } from "@/utils/permissionUtils";
@@ -306,8 +342,21 @@
      minWidth: 200,

    },
    auditStatus: {
      label: '审核状态',
      minWidth: 120,
      fixed: 'right',
      type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_accounts_statement',
      search: true,
      rules: [
        {
          required: true,
          message: "状态不能为空", trigger: "blur"
        }
      ],
    },
    status: {
      label: '状态',
      label: '结算状态',
      minWidth: 120,
      fixed: 'right',
      type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_bill_status',
@@ -480,4 +529,94 @@
  });
};



 // --- 新增：审核相关逻辑 ---
  const auditDialogVisible = ref(false);
  const auditFormRef = ref();
  
  // 审核表单数据
  const auditForm = reactive({
    billId: null as number | null,
    billType: null as number | null, // 0:应收, 1:应付
    auditResult: null as number | null, // 1:通过, 2:驳回
    auditComment: ''
  });
  const getAuditRules = () => {
    return {
      billId: [{ required: true, message: '账单ID不能为空', trigger: 'blur' }],
      billType: [{ required: true, message: '账单类型不能为空', trigger: 'change' }],
      auditResult: [{ required: true, message: '审核结果不能为空', trigger: 'change' }],
      // 动态规则：如果 auditResult 为 2 (驳回)，则必填
      auditComment: [
        { 
          required: auditForm.auditResult === 2, 
          message: '驳回时必须填写审核意见', 
          trigger: 'blur' 
        }
      ]
    };
  };
  const validateAuditComment = (rule: any, value: any, callback: any) => {
    if (auditForm.auditResult === 2 && !value) {
      callback(new Error('驳回时必须填写审核意见'));
    } else {
      callback();
    }
  };
  // 表单校验规则
  const auditRules = {
    billId: [{ required: true, message: '账单ID不能为空', trigger: 'blur' }],
    billType: [{ required: true, message: '账单类型不能为空', trigger: 'change' }],
    auditResult: [{ required: true, message: '审核结果不能为空', trigger: 'change' }],
     auditComment: [{ validator: validateAuditComment, trigger: 'blur' }]
  };
  const handleAuditResultChange = (val: number) => {
    // 当切换审核结果时，立即触发表单校验，以更新审核意见字段的错误提示状态
    if (auditFormRef.value) {
      auditFormRef.value.validateField('auditComment');
    }
    
    // 可选：如果选择通过，可以清空之前填写的驳回意见，或者保留看业务需求
    // if (val === 1) {
    //   auditForm.auditComment = '';
    // }
  };
  /**
   * 点击审核按钮
   */
  const handleAuditClick = (row: any) => {
    // 重置表单
    auditForm.billId = row.id;
    auditForm.billType = 0; 
    auditForm.auditResult = null;
    auditForm.auditComment = '';
    
    // 重置校验状态
    nextTick(() => {
      if (auditFormRef.value) {
        auditFormRef.value.clearValidate();
      }
    });
    
    auditDialogVisible.value = true;
  };


  /**
   * 提交审核
   */
  const submitAudit = () => {
    auditFormRef.value.validate((valid: boolean) => {
      if (valid) {
        receivableBillManagementAudit(auditForm).then(res => {
          if (res.code === 200) {
            proxy.$modal.msgSuccess(res.msg);
            auditDialogVisible.value = false;
            onLoad(page.value); // 刷新列表
          }
        });
      }
    });
  };
</script>