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

sen

2025-08-18 e0cc9278a0bcbf480446f87a78b9d7ddd8819eeb

 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']"> 日志
@@ -198,12 +200,14 @@
          message: "费用系统编号不能为空", trigger: "blur"
        }
      ],
      minWidth: 140,
      search: true,
      addDisplay: false,
      editDisplay: false,
    },
    dispatchNo: {
      label: '调度单号',
      minWidth: 120,
      rules: [
        {
          required: true,
@@ -236,16 +240,19 @@
      label: '项目名称',
      search: true,
      disabled: true,
      minWidth: 150,
    },
    orderDate: {
      label: '下单日期',
      search: true,
      minWidth: 180,
      type: 'datetime',  // 改为 datetime 类型
      format: 'YYYY-MM-DD HH:mm:ss',
      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    feeName: {
      label: '费用名称',
      minWidth: 120,
      rules: [
        {
          required: true,
@@ -270,12 +277,14 @@
    },
    relatedBillName: {
      label: '关联账单名称',
      minWidth: 120,
      addDisplay: false,  // 新增时不显示
      editDisplay: false, // 修改时不显示
    },
    relatedBillStatus: {
      label: '关联账单状态',
      search: true,
      minWidth: 120,
      dataType: 'string',
      type: 'select',
      addDisplay: false,  // 新增时不显示
@@ -297,6 +306,7 @@
    },
    remark: {
      label: '备注',
      minWidth: 120,
      type: 'textarea', minRows: 3, maxRows: 5,
    },