gaoluyang
5 天以前 6b35989783d91899169f89e21a7d3734d8cadc1d
1.海川开心
已修改66个文件
242 ■■■■ 文件已修改
src/components/HeaderSearch/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/ImageUpload/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/RightToolbar/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/customerFile/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/product/ImportExcel/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/product/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/supplierManage/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/approvalProcess/fileList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/customerService/afterSalesHandling/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/customerService/feedbackRegistration/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/energyManagement/energyArea/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/energyManagement/energyPeriodTime/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/energyManagement/energyPower/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/energyManagement/waterManagement/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/ledger/Modal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/ledger/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/measurementEquipment/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/repair/Form/RepairForm.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/repair/Modal/MaintainModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/repair/Modal/RepairModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/upkeep/Modal/PlanModal.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/financialManagement/expenseManagement/Modal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/financialManagement/revenueManagement/Modal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/financialManagement/revenueManagement/filesDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/issueManagement/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/components/formDia.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/monitor/job/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/contractManagement/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/contractManagement/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/dimission/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/employeeRecord/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/payrollManagement/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/personnelManagement/payrollManagement/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/invoiceEntry/components/Modal.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/invoiceEntry/indexOld.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/paymentEntry/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/operationScheduling/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionDispatching/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/productionReporting/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/finalInspection/components/filesDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/finalInspection/components/formDia.vue 98 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/finalInspection/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/metricMaintenance/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/nonconformingManagement/components/formDia.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/processInspection/components/filesDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/processInspection/components/formDia.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/processInspection/components/inspectionFormDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/processInspection/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/qualityManagement/rawMaterialInspection/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/invoiceLedger/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/invoiceRegistration/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/receiptPayment/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/HeaderSearch/index.vue
@@ -4,6 +4,7 @@
    <el-dialog
      v-model="show"
      width="600"
            draggable
      @close="close"
      :show-close="false"
      append-to-body
src/components/ImageUpload/index.vue
@@ -36,6 +36,7 @@
      v-model="dialogVisible"
      title="预览"
      width="800px"
            draggable
      append-to-body
    >
      <img
src/components/RightToolbar/index.vue
@@ -28,7 +28,7 @@
        </el-dropdown>
      </el-tooltip>
    </el-row>
    <el-dialog :title="title" v-model="open" append-to-body>
    <el-dialog :title="title" v-model="open" append-to-body draggable>
      <el-transfer
        :titles="['显示', '隐藏']"
        v-model="value"
src/views/basicData/customerFile/index.vue
@@ -40,6 +40,7 @@
      v-model="dialogFormVisible"
      :title="operationType === 'add' ? '新增客户信息' : '编辑客户信息'"
      width="70%"
            draggable
      @close="closeDia"
    >
      <el-form
@@ -188,6 +189,7 @@
      :title="upload.title"
      v-model="upload.open"
      width="400px"
            draggable
      append-to-body
    >
      <el-upload
src/views/basicData/product/ImportExcel/index.vue
@@ -2,7 +2,7 @@
  <el-button type="info" plain icon="Upload" @click="handleImport">
    导入
  </el-button>
  <el-dialog v-model="upload.open" :title="upload.title">
  <el-dialog v-model="upload.open" :title="upload.title" draggable>
    <FileUpload
      ref="fileUploadRef"
      accept=".xlsx, .xls"
src/views/basicData/product/index.vue
@@ -97,7 +97,7 @@
        @pagination="pagination"
      ></PIMTable>
    </div>
    <el-dialog v-model="productDia" title="产品" width="400px" @keydown.enter.prevent>
    <el-dialog v-model="productDia" title="产品" width="400px" @keydown.enter.prevent draggable>
      <el-form
        :model="form"
        label-width="140px"
@@ -128,6 +128,7 @@
    <el-dialog
      v-model="modelDia"
      title="规格型号"
            draggable
      width="400px"
      @close="closeModelDia"
      @keydown.enter.prevent
src/views/basicData/supplierManage/index.vue
@@ -42,6 +42,7 @@
      v-model="dialogFormVisible"
      :title="operationType === 'add' ? '新增供应商信息' : '编辑供应商信息'"
      width="70%"
            draggable
      @close="closeDia"
    >
      <el-form
@@ -183,6 +184,7 @@
      v-model="upload.open"
      width="400px"
      append-to-body
            draggable
    >
      <el-upload
        ref="uploadRef"
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -5,6 +5,7 @@
      :title="operationType === 'add' ? '新增审批流程' : '编辑审批流程'"
      width="700px"
      @close="closeDia"
            draggable
    >
            <el-form :model="form" label-width="140px" label-position="top" ref="formRef">
                <el-row>
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -5,6 +5,7 @@
        :title="operationType === 'add' ? '新增审批流程' : '编辑审批流程'"
        width="50%"
        @close="closeDia"
                draggable
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row>
src/views/collaborativeApproval/approvalProcess/fileList.vue
@@ -1,5 +1,5 @@
<template>
  <el-dialog v-model="dialogVisible" title="附件" width="40%" :before-close="handleClose">
  <el-dialog v-model="dialogVisible" title="附件" width="40%" :before-close="handleClose" draggable>
    <el-table :data="tableData" border height="40vh">
      <el-table-column label="附件名称" prop="name" min-width="400" show-overflow-tooltip />
      <el-table-column fixed="right" label="操作" width="150" align="center">
src/views/customerService/afterSalesHandling/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="售后处理"
        width="70%"
                draggable
        @close="closeDia"
    >
            <el-form
src/views/customerService/feedbackRegistration/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="售后登记"
        width="70%"
                draggable
        @close="closeDia"
    >
            <el-form
src/views/energyManagement/energyArea/index.vue
@@ -99,7 +99,7 @@
        @pagination="pagination"
      ></PIMTable>
    </div>
    <el-dialog v-model="productDia" title="区域" width="400px" @keydown.enter.prevent>
    <el-dialog v-model="productDia" title="区域" width="400px" @keydown.enter.prevent draggable>
      <el-form
        :model="form"
        label-width="140px"
@@ -129,6 +129,7 @@
    </el-dialog>
    <el-dialog
      v-model="modelDia"
            draggable
      title="子区域"
      width="400px"
      @close="closeModelDia"
src/views/energyManagement/energyPeriodTime/index.vue
@@ -60,6 +60,7 @@
    </div>
    <el-dialog
        v-model="dialogFormVisible"
                draggable
        title="用电时段管理"
        width="70%"
        @close="closeDia"
src/views/energyManagement/energyPower/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="设备能耗"
        width="70%"
                draggable
        @close="closeDia"
    >
            <el-form
src/views/energyManagement/waterManagement/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="用水设备"
        width="70%"
                draggable
        @close="closeDia"
    >
            <el-form
src/views/equipmentManagement/ledger/Modal.vue
@@ -1,5 +1,5 @@
<template>
  <el-dialog :title="modalOptions.title" v-model="visible" @close="close">
  <el-dialog :title="modalOptions.title" v-model="visible" @close="close" draggable>
    <Form ref="formRef"></Form>
    <template #footer>
            <el-button type="primary" @click="sendForm" :loading="loading">
src/views/equipmentManagement/ledger/index.vue
@@ -82,7 +82,7 @@
      </PIMTable>
    </div>
    <Modal ref="modalRef" @success="getTableData"></Modal>
    <el-dialog v-model="qrDialogVisible" title="二维码" width="300px">
    <el-dialog v-model="qrDialogVisible" title="二维码" width="300px" draggable>
      <div style="text-align:center;">
        <img :src="qrCodeUrl" alt="二维码" style="width:200px;height:200px;" />
        <div style="margin:10px 0;">
src/views/equipmentManagement/measurementEquipment/components/calibrationDia.vue
@@ -4,6 +4,7 @@
            v-model="dialogFormVisible"
            title="计量器具"
            width="50%"
            draggable
            @close="closeDia"
        >
            <el-form
src/views/equipmentManagement/measurementEquipment/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="计量器具"
        width="50%"
                draggable
        @close="closeDia"
    >
            <el-form
src/views/equipmentManagement/repair/Form/RepairForm.vue
@@ -68,6 +68,7 @@
</template>
<script setup>
import dayjs from "dayjs";
import useFormData from "@/hooks/useFormData";
import { getDeviceLedger } from "@/api/equipmentManagement/ledger";
import useUserStore from "@/store/modules/user";
@@ -90,7 +91,7 @@
  deviceLedgerId: undefined, // 设备Id
  deviceName: undefined, // 设备名称
  deviceModel: undefined, // 规格型号
  repairTime: undefined, // 报修日期
  repairTime: dayjs().format("YYYY-MM-DD"), // 报修日期,默认当天
  repairName: userStore.nickName, // 报修人
  remark: undefined, // 故障现象
  status: 0, // 报修状态
src/views/equipmentManagement/repair/Modal/MaintainModal.vue
@@ -1,5 +1,5 @@
<template>
  <el-dialog v-model="visible" :title="modalOptions.title" direction="ltr">
  <el-dialog v-model="visible" :title="modalOptions.title" direction="ltr" draggable>
    <MaintainForm ref="maintainFormRef" />
    <template #footer>
            <el-button type="primary" @click="sendForm" :loading="loading">
src/views/equipmentManagement/repair/Modal/RepairModal.vue
@@ -1,5 +1,5 @@
<template>
  <el-dialog v-model="visible" :title="modalOptions.title" @close="close">
  <el-dialog v-model="visible" :title="modalOptions.title" @close="close" draggable>
    <RepairForm ref="repairFormRef" :id="id" />
    <template #footer>
            <el-button type="primary" @click="sendForm" :loading="loading">
src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue
@@ -1,5 +1,5 @@
<template>
  <el-dialog v-model="visible" :title="modalOptions.title" direction="ltr">
  <el-dialog v-model="visible" :title="modalOptions.title" direction="ltr" draggable>
    <MaintenanceForm ref="maintenanceFormRef" />
    <template #footer>
            <el-button type="primary" @click="sendForm" :loading="loading">
src/views/equipmentManagement/upkeep/Modal/PlanModal.vue
@@ -3,6 +3,7 @@
    v-model="visible"
    :title="modalOptions.title"
    width="30%"
        draggable
    @close="close"
  >
    <PlanForm ref="planFormRef" :id="id"></PlanForm>
src/views/financialManagement/expenseManagement/Modal.vue
@@ -1,5 +1,5 @@
<template>
  <el-dialog :title="modalOptions.title" v-model="visible" @close="close" width="30%">
  <el-dialog :title="modalOptions.title" v-model="visible" @close="close" width="30%" draggable>
    <Form ref="formRef"></Form>
    <template #footer>
            <el-button type="primary" @click="sendForm" :loading="loading">
src/views/financialManagement/revenueManagement/Modal.vue
@@ -1,5 +1,5 @@
<template>
  <el-dialog :title="modalOptions.title" v-model="visible" @close="close" width="30%">
  <el-dialog :title="modalOptions.title" v-model="visible" @close="close" width="30%" draggable>
    <Form ref="formRef"></Form>
    <template #footer>
            <el-button type="primary" @click="sendForm" :loading="loading">
src/views/financialManagement/revenueManagement/filesDia.vue
@@ -3,6 +3,7 @@
    <el-dialog
        v-model="dialogFormVisible"
        title="上传附件"
                draggable
        width="50%"
        @close="closeDia"
    >
src/views/inventoryManagement/issueManagement/index.vue
@@ -117,7 +117,7 @@
        </div>
      </el-tab-pane>
    </el-tabs>
    <el-dialog v-model="dialogFormVisible" :title="getDialogTitle()" width="40%" @close="closeDia">
    <el-dialog v-model="dialogFormVisible" :title="getDialogTitle()" width="40%" @close="closeDia" draggable>
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
            <div>{{getAvailableQuantityText()}}:{{currentRowNum}}</div>
        <el-form-item :label="getQuantityLabel()" prop="salesContractNo">
src/views/inventoryManagement/receiptManagement/components/formDia.vue
@@ -219,13 +219,17 @@
      productList.value = [];
      return
    }
    productList.value = productRes.data.map(item => ({
      ...item,
      quantityStock: 0,
      taxInclusiveUnitPrice: Number(item?.taxInclusiveUnitPrice ?? 0),
      taxInclusiveTotalPrice: 0,
      originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
    }))
    productList.value = productRes.data.map(item => {
      const quantityStock = Number(item?.quantity0 ?? 0);
      const taxInclusiveUnitPrice = Number(item?.taxInclusiveUnitPrice ?? 0);
      return {
        ...item,
        quantityStock,
        taxInclusiveUnitPrice,
        taxInclusiveTotalPrice: quantityStock * taxInclusiveUnitPrice,
        originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
      };
    })
  } catch (error) {
    console.error('查询产品记录失败:', error)
    proxy.$modal.msgError('查询产品记录失败')
src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
@@ -171,7 +171,7 @@
    specificationModel: '',
    unit: '',
    supplierName: form.value.supplierName || '',
    itemType: '',
    itemType: '物料',
    inboundNum: 0,
    inboundDate: getCurrentDate(), // 默认当天日期
    quantityStock: 0,
src/views/monitor/job/index.vue
@@ -138,7 +138,7 @@
      />
      <!-- 添加或修改定时任务对话框 -->
      <el-dialog :title="title" v-model="open" width="820px" append-to-body>
      <el-dialog :title="title" v-model="open" width="820px" append-to-body draggable>
         <el-form ref="jobRef" :model="form" :rules="rules" label-width="120px">
            <el-row>
               <el-col :span="12">
src/views/personnelManagement/contractManagement/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="详情"
        width="70%"
                draggable
        @close="closeDia"
    >
      <PIMTable
src/views/personnelManagement/contractManagement/index.vue
@@ -29,6 +29,7 @@
      :title="upload.title"
      v-model="upload.open"
      width="400px"
            draggable
      append-to-body
    >
      <el-upload
src/views/personnelManagement/dimission/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增离职' : '编辑离职'"
        width="70%"
                draggable
        @close="closeDia"
    >
      <!-- 员工信息展示区域 -->
src/views/personnelManagement/employeeRecord/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="详情"
        width="70%"
                draggable
        @close="closeDia"
    >
      <el-descriptions class="detail-descriptions" :column="2" border size="small">
src/views/personnelManagement/payrollManagement/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增薪资' : '编辑薪资'"
        width="50%"
                draggable
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
src/views/personnelManagement/payrollManagement/index.vue
@@ -49,7 +49,7 @@
        <form-dia ref="formDia" @close="handleQuery"></form-dia>
        
        <!-- 导入弹窗 -->
        <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body @close="handleUploadClose">
        <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body @close="handleUploadClose" draggable>
            <el-upload
                ref="uploadRef"
                :limit="1"
src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -1,5 +1,5 @@
<template>
    <el-dialog :title="modalOptions.title" v-model="visible" width="70%">
    <el-dialog :title="modalOptions.title" v-model="visible" width="70%" draggable>
        <el-form
            ref="formRef"
            :model="form"
@@ -408,7 +408,6 @@
            
            // 设置表单数据(使用第一个合同的基本信息,采购合同号留空)
            form.purchaseLedgerNo = ""; // 采购合同号留空,因为会在产品表格中分别显示
            form.invoiceAmount = 0;
            form.invoiceNumber = "";
            form.entryDate = dayjs().format("YYYY-MM-DD");
            form.enterDate = dayjs().format("YYYY-MM-DD");
@@ -419,8 +418,28 @@
            form.issUerId = userStore.id;
            form.issUer = userStore.nickName;
            
            // 设置产品数据,并初始化开票数量和金额
            allProductData.forEach(item => {
                // 本次开票数默认为总数量
                item.ticketsNum = Number(item.quantity || 0);
                // 本次开票金额默认为含税总价
                item.ticketsAmount = Number(item.taxInclusiveTotalPrice || 0);
                // 保存原始未来票数和金额(用于计算)
                item.tempFutureTickets = Number(item.quantity || 0);
                item.tempFutureTicketsAmount = Number(item.taxInclusiveTotalPrice || 0);
                // 未来票数和金额初始为0(因为全部开票)
                item.futureTickets = 0;
                item.futureTicketsAmount = 0;
            });
            form.productData = allProductData;
            
            // 计算发票金额:所有产品的含税总价之和
            const totalAmount = allProductData.reduce((sum, item) => {
                return sum + (Number(item.taxInclusiveTotalPrice) || 0);
            }, 0);
            form.invoiceAmount = totalAmount.toFixed(2);
            // 存储选中的合同数据
            selectedContracts.value = selectedRows;
        });
src/views/procurementManagement/invoiceEntry/indexOld.vue
@@ -156,6 +156,7 @@
    </div>
    <el-dialog
      v-model="dialogFormVisible"
            draggable
      :title="operationType === 'add' ? '新增来票登记' : '编辑来票登记'"
      width="80%"
      @close="closeDia"
src/views/procurementManagement/paymentEntry/index.vue
@@ -129,6 +129,7 @@
    </div>
    <el-dialog
      v-model="dialogFormVisible"
            draggable
      :title="operationType === 'add' ? '新增付款登记' : '编辑付款登记'"
      width="60%"
      @close="closeDia"
src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
@@ -1,5 +1,5 @@
<template>
  <el-dialog :title="modalOptions.title" v-model="visible" @close="close">
  <el-dialog :title="modalOptions.title" v-model="visible" @close="close" draggable>
    <EditForm ref="editFormRef" />
    <template #footer>
            <el-button type="primary" :loading="loading" @click="sendForm">
src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue
@@ -1,5 +1,5 @@
<template>
  <el-dialog v-model="upload.open" :title="upload.title" :width="500">
  <el-dialog v-model="upload.open" :title="upload.title" :width="500" draggable>
    <FileUpload
      ref="fileUploadRef"
      accept=".xlsx, .xls, .pdf"
src/views/procurementManagement/procurementLedger/index.vue
@@ -180,6 +180,7 @@
    </div>
    <el-dialog
      v-model="dialogFormVisible"
            draggable
      :title="operationType === 'add' ? '新增采购台账页面' : '编辑采购台账页面'"
      width="70%"
      @close="closeDia"
@@ -410,6 +411,7 @@
    </el-dialog>
    <el-dialog
      v-model="productFormVisible"
            draggable
      :title="productOperationType === 'add' ? '新增产品' : '编辑产品'"
      width="40%"
      @close="closeProductDia"
src/views/productionManagement/operationScheduling/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="工序排产"
        width="70%"
                draggable
        @close="closeDia"
    >
      <el-button type="primary" @click="addRow" style="margin-bottom: 10px;">新增</el-button>
src/views/productionManagement/productionDispatching/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="生产派工"
        width="50%"
                draggable
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
src/views/productionManagement/productionReporting/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="生产报工"
        width="70%"
                draggable
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
src/views/qualityManagement/finalInspection/components/filesDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="上传附件"
        width="50%"
                draggable
        @close="closeDia"
    >
      <div style="margin-bottom: 10px;text-align: right">
src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增出厂检验' : '编辑出厂检验'"
        width="70%"
                draggable
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
@@ -31,7 +32,10 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="单位:" prop="unit">
              <el-input v-model="form.unit" placeholder="请输入" clearable/>
              <el-select v-model="form.unit" placeholder="请选择" clearable style="width: 100%">
                <el-option label="箱" value="箱" />
                <el-option label="提" value="提" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -99,7 +103,7 @@
</template>
<script setup>
import {ref, computed} from "vue";
import {ref, computed, reactive, toRefs, getCurrentInstance} from "vue";
import dayjs from "dayjs";
import useUserStore from "@/store/modules/user.js";
import {getOptions} from "@/api/procurementManagement/procurementLedger.js";
@@ -184,22 +188,26 @@
    let userLists = await userListNoPage();
    userList.value = userLists.data;
    form.value = {}
  getProductOptions();
  if (operationType.value === 'edit') {
    form.value = {...row}
        currentProductId.value = row.productId || 0
        // 加载当前产品下的规格列表,并根据后端返回的 model 反查并设置 modelId,实现规格下拉框反显
        if (currentProductId.value) {
            modelList({ id: currentProductId.value }).then((res) => {
                modelOptions.value = res;
                const target = res.find((item) => item.model === row.model);
                if (target) {
                    form.value.modelId = target.id;
                }
            });
        }
        getQualityInspectParamList(row.id)
    currentProductId.value = row.productId || 0
    // 加载当前产品下的规格列表,并根据后端返回的 model 反查并设置 modelId,实现规格下拉框反显
    if (currentProductId.value) {
      modelList({ id: currentProductId.value }).then((res) => {
        modelOptions.value = res;
        const target = res.find((item) => item.model === row.model);
        if (target) {
          form.value.modelId = target.id;
        }
      });
    }
    getQualityInspectParamList(row.id)
  } else {
    // 新增时设置默认值
    form.value.unit = "箱"; // 单位默认为箱
    form.value.checkResult = "合格"; // 检验结果默认为合格
  }
  await getProductOptions();
    // 默认检验员为当前登录人,检测日期默认为当天(空时填充)
    if (currentUserName.value && !form.value.checkName) {
        form.value.checkName = currentUserName.value;
@@ -208,10 +216,52 @@
        form.value.checkTime = getToday();
    }
}
const getProductOptions = () => {
  productTreeList({productName: '质量'}).then((res) => {
    productOptions.value = convertIdToValue(res);
  });
const findNodeByLabel = (nodes, label) => {
  for (let i = 0; i < nodes.length; i++) {
    // 先尝试精确匹配
    if (nodes[i].label === label) {
      return nodes[i].value; // 找到节点,返回该节点的value
    }
    // 如果精确匹配失败,尝试模糊匹配(包含关键词)
    if (nodes[i].label && nodes[i].label.includes(label)) {
      return nodes[i].value;
    }
    if (nodes[i].children && nodes[i].children.length > 0) {
      const foundValue = findNodeByLabel(nodes[i].children, label);
      if (foundValue) {
        return foundValue; // 在子节点中找到,返回该节点的value
      }
    }
  }
  return null; // 没有找到节点,返回null
};
const getProductOptions = async () => {
  const res = await productTreeList({productName: '质量'});
  productOptions.value = convertIdToValue(res);
  // 新增模式下,默认选择"成品检验"
  if (operationType.value === 'add') {
    const finishedProductId = findNodeByLabel(productOptions.value, '成品检验');
    if (finishedProductId) {
      form.value.productId = finishedProductId;
      // 找到对应的节点,使用实际的 label 作为 productName
      const findNode = (nodes, value) => {
        for (let i = 0; i < nodes.length; i++) {
          if (nodes[i].value === value) {
            return nodes[i];
          }
          if (nodes[i].children && nodes[i].children.length > 0) {
            const found = findNode(nodes[i].children, value);
            if (found) return found;
          }
        }
        return null;
      };
      const node = findNode(productOptions.value, finishedProductId);
      form.value.productName = node ? node.label : '成品检验';
      getModels(finishedProductId);
    }
  }
};
const getModels = (value) => {
    currentProductId.value = value
@@ -287,12 +337,18 @@
}
const getList = () => {
    qualityInspectDetailByProductId(currentProductId.value).then(res => {
        tableData.value = res.data;
        tableData.value = res.data.map(item => ({
            ...item,
            testValue: item.testValue ?? 0
        }));
    })
}
const getQualityInspectParamList = (id) => {
    qualityInspectParamInfo(id).then(res => {
        tableData.value = res.data;
        tableData.value = res.data.map(item => ({
            ...item,
            testValue: item.testValue ?? 0
        }));
    })
}
// 关闭弹框
src/views/qualityManagement/finalInspection/components/inspectionFormDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="填写检验记录"
        width="70%"
                draggable
        @close="closeDia"
    >
      <div style="margin-bottom: 10px;text-align: right">
src/views/qualityManagement/finalInspection/index.vue
@@ -42,6 +42,7 @@
    <DetailDia ref="detailDia"></DetailDia>
    <files-dia ref="filesDia" @close="handleQuery"></files-dia>
        <el-dialog v-model="dialogFormVisible" title="编辑检验员" width="30%"
                             draggable
                             @close="closeDia">
            <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
                <el-form-item label="检验员:" prop="checkName">
src/views/qualityManagement/metricMaintenance/index.vue
@@ -72,6 +72,7 @@
      ></PIMTable>
    </div>
    <el-dialog
            draggable
        v-model="modelDia"
        title="检测指标"
        width="400px"
src/views/qualityManagement/nonconformingManagement/components/formDia.vue
@@ -2,6 +2,7 @@
  <div>
    <el-dialog
        v-model="dialogFormVisible"
                draggable
        :title="operationType === 'add' ? '新增不合格管理' : '编辑不合格管理'"
        width="70%"
        @close="closeDia"
@@ -123,7 +124,8 @@
</template>
<script setup>
import {ref} from "vue";
import {ref, reactive, toRefs, getCurrentInstance} from "vue";
import dayjs from "dayjs";
import {productTreeList} from "@/api/basicData/product.js";
import {
  getQualityUnqualifiedInfo,
@@ -132,6 +134,7 @@
} from "@/api/qualityManagement/nonconformingManagement.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
const getToday = () => dayjs().format("YYYY-MM-DD")
const dialogFormVisible = ref(false);
const operationType = ref('')
@@ -151,6 +154,8 @@
    inspectType: '',
    defectivePhenomena: '',
    dealResult: '',
    dealName: '',
    dealTime: '',
  },
  rules: {
    checkTime: [{ required: false, message: "请输入", trigger: "blur" },],
@@ -177,6 +182,10 @@
    getQualityUnqualifiedInfo(row.id).then(res => {
      form.value = {...res.data}
    })
  } else {
    // 新增时设置默认值
    form.value.dealName = "冯灵芝"; // 处理人默认为冯灵芝
    form.value.dealTime = getToday(); // 处理日期默认为当天
  }
}
const getProductOptions = () => {
src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增不合格处理' : '处理不合格'"
        width="70%"
                draggable
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
src/views/qualityManagement/processInspection/components/filesDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="上传附件"
        width="50%"
                draggable
        @close="closeDia"
    >
      <div style="margin-bottom: 10px;text-align: right">
src/views/qualityManagement/processInspection/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增过程检验' : '编辑过程检验'"
        width="70%"
                draggable
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
@@ -209,6 +210,7 @@
        getQualityInspectParamList(row.id)
    } else {
        // 新增时设置默认值
        form.value.process = "试压"; // 工序默认为试压
        form.value.unit = "包"; // 单位默认为包
        form.value.quantity = 3; // 数量默认为3
        form.value.checkResult = "合格"; // 检验结果默认为合格
src/views/qualityManagement/processInspection/components/inspectionFormDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="填写检验记录"
        width="70%"
                draggable
        @close="closeDia"
    >
      <div style="margin-bottom: 10px;text-align: right">
src/views/qualityManagement/processInspection/index.vue
@@ -42,6 +42,7 @@
    <DetailDia ref="detailDia"></DetailDia>
    <files-dia ref="filesDia" @close="handleQuery"></files-dia>
        <el-dialog v-model="dialogFormVisible" title="编辑检验员" width="30%"
                             draggable
                             @close="closeDia">
            <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
                <el-form-item label="检验员:" prop="checkName">
src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        title="上传附件"
        width="50%"
                draggable
        @close="closeDia"
    >
      <div style="margin-bottom: 10px;text-align: right">
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -4,6 +4,7 @@
        v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增原材料检验' : '编辑原材料检验'"
        width="70%"
                draggable
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
src/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue
@@ -3,6 +3,7 @@
    <el-dialog
        v-model="dialogFormVisible"
        title="填写检验记录"
                draggable
        width="70%"
        @close="closeDia"
    >
src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -43,6 +43,7 @@
    <DetailDia ref="detailDia"></DetailDia>
    <files-dia ref="filesDia" @close="handleQuery"></files-dia>
    <el-dialog v-model="dialogFormVisible" title="编辑检验员" width="30%"
                             draggable
               @close="closeDia">
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-form-item label="检验员:" prop="checkName">
src/views/salesManagement/invoiceLedger/index.vue
@@ -64,7 +64,7 @@
      <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
        :page="page.current" :limit="page.size" @pagination="paginationChange" />
    </div>
    <el-dialog v-model="dialogFormVisible" title="开票台账页面" width="70%" @close="closeDia">
    <el-dialog v-model="dialogFormVisible" title="开票台账页面" width="70%" @close="closeDia" draggable>
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
src/views/salesManagement/invoiceRegistration/index.vue
@@ -163,6 +163,7 @@
            />
        </div>
        <el-dialog
            draggable
            v-model="dialogFormVisible"
            title="新增开票登记页面"
            width="85%"
src/views/salesManagement/receiptPayment/index.vue
@@ -201,6 +201,7 @@
    </div>
    <el-dialog
      v-model="dialogFormVisible"
            draggable
      title="新增回款页面"
      width="70%"
      @close="closeDia"
src/views/salesManagement/salesLedger/index.vue
@@ -90,6 +90,7 @@
        :page="page.current" :limit="page.size" @pagination="paginationChange" />
    </div>
    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '新增销售台账页面' : '编辑销售台账页面'" width="70%"
                             draggable
      @close="closeDia">
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row :gutter="30">
@@ -206,6 +207,7 @@
      </template>
    </el-dialog>
    <el-dialog v-model="productFormVisible" :title="productOperationType === 'add' ? '新增产品' : '编辑产品'" width="40%"
                             draggable
      @close="closeProductDia">
      <el-form :model="productForm" label-width="140px" label-position="top" :rules="productRules" ref="productFormRef">
        <el-row :gutter="30">
@@ -299,6 +301,7 @@
    </el-dialog>
        <!-- 打印预览弹窗 -->
        <el-dialog
            draggable
            v-model="printPreviewVisible"
            title="打印预览"
            width="90%"
@@ -416,6 +419,7 @@
        </el-dialog>
        <!-- 发货弹框 -->
        <el-dialog
            draggable
            v-model="deliveryFormVisible"
            title="发货信息"
            width="40%"