Merge branch 'refs/heads/dev_NEW_pro' into dev_pro_河南鹤壁

yuan

8 天以前 46feaa5b414c2c71e4bda7c846b85ea39063f243

Merge branch 'refs/heads/dev_NEW_pro' into dev_pro_河南鹤壁

 multiple/assets/favicon/DYKJfavicon.ico

 multiple/assets/favicon/DZZBfavicon.ico

 multiple/assets/favicon/HYZCfavicon.ico

 multiple/assets/favicon/JHHGfavicon.ico

 multiple/assets/favicon/JHYfavicon.ico

 multiple/assets/favicon/JXSMico.ico

 multiple/assets/favicon/KSfavicon.ico

 multiple/assets/favicon/KYHGfavicon.ico

 multiple/assets/favicon/LFJZfavicon.ico

 multiple/assets/favicon/QXYfavicon.ico

 multiple/assets/favicon/SDJCfavicon.ico

 multiple/assets/favicon/WTXCfavicon.ico

 multiple/assets/favicon/XLZBico.ico

 multiple/assets/favicon/YSJXico.ico

 multiple/assets/logo/DYKJLogo.png

 multiple/assets/logo/DZZBLogo.png

 multiple/assets/logo/HYZCLogo.png

 multiple/assets/logo/JHHGLogo.png

 multiple/assets/logo/JHYLogo.png

 multiple/assets/logo/JXSMLogo.png

 multiple/assets/logo/KSLogo.png

 multiple/assets/logo/KYHGLogo.png

 multiple/assets/logo/LFJZLogo.png

 multiple/assets/logo/QXYLogo.png

 multiple/assets/logo/SDJCLogo.png

 multiple/assets/logo/WTXCLogo.png

 multiple/assets/logo/XLZBLogo.png

 multiple/assets/logo/YSJXLogo.png

 src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue

@@ -85,6 +85,35 @@
            </el-form-item>
          </el-col>
        </el-row>
        <!-- 出差时间（仅当 approveType 为 3 时显示） -->
        <el-row :gutter="30" v-if="props.approveType == 3">
          <el-col :span="12">
            <el-form-item label="出差开始时间：" prop="startDateTime">
              <el-date-picker
                  v-model="form.startDateTime"
                  type="datetime"
                  placeholder="请选择开始时间"
                  value-format="YYYY-MM-DD HH:mm"
                  format="YYYY-MM-DD HH:mm"
                  clearable
                  style="width: 100%"
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="出差结束时间：" prop="endDateTime">
              <el-date-picker
                  v-model="form.endDateTime"
                  type="datetime"
                  placeholder="请选择结束时间"
                  value-format="YYYY-MM-DD HH:mm"
                  format="YYYY-MM-DD HH:mm"
                  clearable
                  style="width: 100%"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <!-- 出差地点（仅当 approveType 为 3 时显示） -->
        <el-row v-if="props.approveType == 3">
          <el-col :span="24">
@@ -152,6 +181,8 @@
    startDate: "", // 请假开始时间
    endDate: "", // 请假结束时间
    price: null, // 报销金额
    startDateTime: "", // 出差开始时间
    endDateTime: "", // 出差结束时间
    location: "", // 出差地点
    storageBlobDTOS: []
  },
@@ -163,6 +194,8 @@
    startDate: [{ required: true, message: "请选择请假开始时间", trigger: "change" }],
    endDate: [{ required: true, message: "请选择请假结束时间", trigger: "change" }],
    price: [{ required: true, message: "请输入报销金额", trigger: "blur" }],
    startDateTime: [{ required: true, message: "请选择出差开始时间", trigger: "change" }],
    endDateTime: [{ required: true, message: "请选择出差结束时间", trigger: "change" }],
    location: [{ required: true, message: "请输入出差地点", trigger: "blur" }],
  },
});
@@ -257,8 +290,20 @@
      return
    }
  }
  // 当 approveType 为 3 时，校验出差地点
  // 当 approveType 为 3 时，校验出差时间和地点
  if (props.approveType == 3) {
    if (!form.value.startDateTime) {
      proxy.$modal.msgError("请选择出差开始时间！")
      return
    }
    if (!form.value.endDateTime) {
      proxy.$modal.msgError("请选择出差结束时间！")
      return
    }
    if (new Date(form.value.endDateTime) < new Date(form.value.startDateTime)) {
      proxy.$modal.msgError("出差结束时间不能早于开始时间！")
      return
    }
    if (!form.value.location || form.value.location.trim() === '') {
      proxy.$modal.msgError("请输入出差地点！")
      return

 src/views/collaborativeApproval/approvalProcess/index.vue

@@ -207,6 +207,7 @@
// 动态表格列配置，根据审批类型生成列
const tableColumnCopy = computed(() => {
  const isLeaveType = currentApproveType.value === 2; // 请假管理
  const isBusinessTripType = currentApproveType.value === 3; // 出差管理
  const isReimburseType = currentApproveType.value === 4; // 报销管理
  const isQuotationType = currentApproveType.value === 6; // 报价审批
  const isPurchaseType = currentApproveType.value === 5; // 采购审批
@@ -274,20 +275,32 @@
      width: 120
    });
  }

  // 请假管理：开始日期 / 结束日期
  if (isLeaveType) {
    baseColumns.push(
      { label: "开始日期", prop: "startDate", width: 120 },
      { label: "结束日期", prop: "endDate", width: 120 }
    );
  }
  
  // 日期列（根据类型动态配置）
  baseColumns.push(
    {
      label: isLeaveType ? "开始日期" : "申请日期",
      prop: isLeaveType ? "startDate" : "approveTime",
      width: 200
    },
    {
      label: "结束日期",
      prop: isLeaveType ? "endDate" : "approveOverTime",
      width: 120
    }
  );
  // 出差管理：开始时间 / 结束时间（不含秒）
  if (isBusinessTripType) {
    baseColumns.push(
      {
        label: "开始时间",
        prop: "startDateTime",
        width: 180,
        formatData: (val) => val ? val.substring(0, 16) : ''
      },
      {
        label: "结束时间",
        prop: "endDateTime",
        width: 180,
        formatData: (val) => val ? val.substring(0, 16) : ''
      }
    );
  }
  
  // 当前审批人列
  baseColumns.push({
@@ -295,6 +308,20 @@
    prop: "approveUserCurrentName",
    width: 120
  });

  // 申请时间 - 所有类型都显示
  baseColumns.push({
    label: "申请时间",
    prop: "approveTime",
    width: 180,
  });

  // 审批时间 - 所有类型都显示
  baseColumns.push({
    label: "审批时间",
    prop: "approveOverTime",
    width: 180,
  });
  
  // 操作列
  const actionOperations = [

 src/views/procurementManagement/purchaseReturnOrder/New.vue

@@ -3,8 +3,10 @@
    <el-dialog
        v-model="isShow"
        title="新增采购退货"
        width="1600"
        width="70%"
        top="3vh"
        @close="closeModal"
        class="purchase-return-dialog"
    >
      <el-form label-width="140px" :model="formState" label-position="top" ref="formRef" :inline="true">
        <div class="section-title">
@@ -221,19 +223,19 @@
          <el-input style="width: 240px" v-model="formState.remark" :rows="1" type="textarea" placeholder="请输入备注"/>
        </el-form-item>

        <div style="margin: 20px 0;">
        <div style="margin:20px 0;min-width:0;">
            <div class="section-title">
              <span class="title-dot"></span>
              <span class="title-text">产品列表</span>
            </div>
            <el-button type="primary" size="small" style="margin-bottom: 20px" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">添加产品</el-button>
            <div class="product-table-scroll">
            <el-table class="product-table-inner"
            <el-button type="primary" size="small" style="margin-bottom:20px" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">添加产品</el-button>
            <el-table
                      :data="formState.purchaseReturnOrderProductsDtos"
                      border
                      max-height="400"
                      show-summary
                      :summary-method="summarizeChildrenTable">
                      :summary-method="summarizeChildrenTable"
                      style="width:100%;min-width:0;">
              <el-table-column align="center"
                               type="selection"
                               width="55" />
@@ -324,7 +326,6 @@
                </template>
              </el-table-column>
            </el-table>
            </div>
          </div>

        <div class="section-title">
@@ -803,12 +804,5 @@
  margin-right: 8px;
}

.product-table-scroll {
  width: 100%;
  overflow-x: auto;
}

.product-table-inner {
  min-width: 1280px;
}
</style>

 vite.config.js

@@ -12,7 +12,7 @@
          : env.VITE_BASE_API;
  const javaUrl =
      env.VITE_APP_ENV === "development"
          ? "http://1.15.17.182:9049"
          ? "http://1.15.17.182:9048"
          : env.VITE_JAVA_API;
  return {
    define:{