fix: 出差和请假审批新增开始与结束日期

gongchunyi

4 天以前 492802e4fc1b371ba21a2a490c8dcd67d7c8b29c

 src/views/procurementManagement/procurementLedger/index.vue

@@ -84,7 +84,7 @@
                show-summary
                :summary-method="summarizeMainTable"
                @expand-change="expandChange"
                height="calc(100vh - 21.5em)">
                height="calc(100vh - 25em)">
        <el-table-column align="center"
                         type="selection"
                         width="55" />
@@ -108,8 +108,8 @@
                               prop="quantity" />
              <el-table-column label="可用数量"
                               prop="availableQuality" />
              <el-table-column label="退货数量"
                               prop="returnQuality" />
              <!-- <el-table-column label="退货数量"
                               prop="returnQuality" /> -->
              <el-table-column label="入库状态"
                               width="100px"
                               align="center">
@@ -117,6 +117,16 @@
                  <el-tag :type="getProductStockStatusType(scope.row.productStockStatus)"
                          size="small">
                    {{ stockStatusText[scope.row.productStockStatus] || '未入库' }}
                  </el-tag>
                </template>
              </el-table-column>
              <el-table-column label="是否质检"
                               width="100px"
                               align="center">
                <template #default="scope">
                  <el-tag :type="getCheckedType(scope.row.isChecked)"
                          size="small">
                    {{ scope.row.isChecked ? '是' : '否' }}
                  </el-tag>
                </template>
              </el-table-column>
@@ -868,6 +878,14 @@
    };
    return typeMap[status] || "info";
  };
  // 获取是否质检标签类型
  const getCheckedType = status => {
    const typeMap = {
      0: "info",
      1: "success",
    };
    return typeMap[status] || "info";
  };

  const templateName = ref("");
  const filterInputValue = ref("");
@@ -1016,13 +1034,6 @@
  const { form, rules } = toRefs(data);
  const { form: searchForm } = useFormData({
    ...data.searchForm,
    // 设置录入日期范围为当天
    entryDate: [
      dayjs().startOf("day").format("YYYY-MM-DD"),
      dayjs().endOf("day").format("YYYY-MM-DD"),
    ],
    entryDateStart: dayjs().startOf("day").format("YYYY-MM-DD"),
    entryDateEnd: dayjs().endOf("day").format("YYYY-MM-DD"),
  });

  // 产品表单弹框数据
@@ -2015,7 +2026,8 @@
              canvas.width - horizontalPad * 2
            );
            const textBlockHeight = lines.length * lineHeight;
            canvas.height = padTop + QR_SIZE + gapAfterQr + textBlockHeight + bottomPad;
            canvas.height =
              padTop + QR_SIZE + gapAfterQr + textBlockHeight + bottomPad;

            ctx.fillStyle = "#ffffff";
            ctx.fillRect(0, 0, canvas.width, canvas.height);