fix: 过程检验的检测单位 删除,销售台账新增后点击编辑-修改 是否生产： 从否编辑为是，没有走到生产。,现阶段每个产品经过工序都会有损耗。印银、印...

spring

2026-05-18 3d980505d1852c95a28d773450bd86c0d88578d8

fix: 过程检验的检测单位 删除,销售台账新增后点击编辑-修改 是否生产： 从否编辑为是，没有走到生产。,现阶段每个产品经过工序都会有损耗。印银、印铜工序目前系统没有，需要加一下

 src/views/productionManagement/workOrder/components/CopperPrintingForm.vue

@@ -2,6 +2,7 @@
import {computed, onMounted, reactive, ref} from "vue";
import dayjs from "dayjs";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import {getDeviceLedger} from "@/api/equipmentManagement/ledger.js";
import {ElMessage} from "element-plus";
import {addProductMain} from "@/api/productionManagement/workOrder.js";

@@ -53,6 +54,7 @@
  reportWork: undefined,
  productMainId: undefined,
  quantity: undefined, // 烧铜产出激
  scrapQty: undefined, // 报废数量
  userId: undefined, // 作业员
  userName: undefined, // 作业员
  otherData: {
@@ -98,6 +100,17 @@
        console.error("获取用户列表失败", err);
      });
};

const deviceOptions = ref<any[]>([]);
const getDeviceList = async () => {
  try {
    const {data} = await getDeviceLedger();
    deviceOptions.value = data || [];
  } catch (err) {
    console.error("获取设备列表失败", err);
    deviceOptions.value = [];
  }
};
// 用户选择变化时更新 userName
const handleUserChange = (userId: any, reportType: string) => {
  if (userId) {
@@ -137,11 +150,22 @@
    ElMessage.error('请输入生产数量')
    return;
  }
  const scrapQty =
    formData.scrapQty === null ||
    formData.scrapQty === undefined ||
    formData.scrapQty === ""
      ? 0
      : Number(formData.scrapQty);
  if (isNaN(scrapQty) || !Number.isInteger(scrapQty) || scrapQty < 0) {
    ElMessage.error('报废数量必须大于等于0');
    return;
  }
  formData.userId = formData.otherData.surfaceCopperPasteUserId || formData.otherData.underlyingCopperPasteUserId;

  const otherData = JSON.stringify(formData.otherData);
  const submitData = {
    ...formData,
    scrapQty,
    otherData: otherData
  };

@@ -163,6 +187,7 @@
  if (!props.isEdit) {
    formData.otherData = JSON.parse(props.row.otherData || '{}');
    formData.quantity = props.row.quantity;
    formData.scrapQty = props.row.scrapQty;
  } else {
    const row = props.row;
    formData.planQuantity = row.planQuantity
@@ -177,10 +202,14 @@
  return value === undefined || value === null || value === "" ? "-" : value;
};

/** 表格统一 21 列栅格，每行 colspan 之和须等于该值 */
const GRID_COLS = 21;

onMounted(() => {
  getUserList();
  initData()
})
  getDeviceList();
  initData();
});
</script>

<template>
@@ -189,16 +218,19 @@
             width="90%">
    <el-form :model="formData">
      <table class="report-table">
        <colgroup>
          <col v-for="n in GRID_COLS" :key="n" />
        </colgroup>
        <tbody>
        <tr>
          <td class="tip" colspan="4">瓷片清洗后放置时间超过72H，重新烘片后才能印刷并填写本栏</td>
          <td class="label" colspan="3">烘干温度</td>
          <td colspan="2">
          <td colspan="2" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.dryingTemperature" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.dryingTemperature) }}</span>
          </td>
          <td class="label">开始时间</td>
          <td colspan="2">
          <td colspan="2" class="cell-field">
            <el-date-picker
                v-if="props.isEdit"
                v-model="formData.otherData.startTime"
@@ -206,12 +238,11 @@
                value-format="YYYY-MM-DD HH:mm:ss"
                format="YYYY-MM-DD HH:mm:ss"
                placeholder="请选择"
                style="width: 100%"
            />
            <span v-else class="view-value">{{ displayValue(formData.otherData.startTime) }}</span>
          </td>
          <td class="label"  colspan="3">结束时间</td>
          <td colspan="2">
          <td class="label" colspan="3">结束时间</td>
          <td colspan="2" class="cell-field">
            <el-date-picker
                v-if="props.isEdit"
                v-model="formData.otherData.endTime"
@@ -219,12 +250,11 @@
                value-format="YYYY-MM-DD HH:mm:ss"
                format="YYYY-MM-DD HH:mm:ss"
                placeholder="请选择"
                style="width: 100%"
            />
            <span v-else class="view-value">{{ displayValue(formData.otherData.endTime) }}</span>
          </td>
          <td class="label" colspan="2">作业员</td>
          <td  colspan="2">
          <td colspan="2" class="cell-field">
            <el-select v-model="formData.otherData.userId"
                       v-if="props.isEdit"
                       style="width: 100%"
@@ -240,37 +270,55 @@
            <span v-else class="view-value">{{ displayValue(formData.otherData.userName || formData.otherData.userId) }}</span>
          </td>
        </tr>
        <!-- 底层铜浆 -->
        <tr>
          <td class="label" colspan="2">底层铜浆</td>
          <td>
          <td class="label label--section" colspan="21">底层铜浆</td>
        </tr>
        <tr class="report-row report-row--triple">
          <td class="label" colspan="2">铜浆</td>
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.underlyingCopperPaste" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.underlyingCopperPaste) }}</span>
          </td>
          <td class="label">印刷次数</td>
          <td colspan="2">
          <td class="label" colspan="2">印刷次数</td>
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.underlyingCopperPastePrintingQuantity" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.underlyingCopperPastePrintingQuantity) }}</span>
          </td>
          <td class="label">机台号</td>
          <td>
            <el-input v-if="props.isEdit" v-model="formData.otherData.underlyingCopperPasteMachineNumber" placeholder="请输入"/>
          <td class="label" colspan="2">机台号</td>
          <td colspan="5" class="cell-field cell-field--machine">
            <el-select
                v-if="props.isEdit"
                v-model="formData.otherData.underlyingCopperPasteMachineNumber"
                placeholder="请选择设备"
                clearable
                filterable
            >
              <el-option
                  v-for="device in deviceOptions"
                  :key="device.id ?? device.deviceName"
                  :label="device.deviceName"
                  :value="device.deviceName"
              />
            </el-select>
            <span v-else class="view-value">{{ displayValue(formData.otherData.underlyingCopperPasteMachineNumber) }}</span>
          </td>
          <td class="label">丝网族号</td>
          <td colspan="2">
        </tr>
        <tr class="report-row report-row--triple">
          <td class="label" colspan="2">丝网族号</td>
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.underlyingCopperPasteSilkScreenFamilyNumber" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.underlyingCopperPasteSilkScreenFamilyNumber) }}</span>
          </td>
          <td class="label">目数</td>
          <td colspan="2">
          <td class="label" colspan="2">目数</td>
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.underlyingCopperPasteNumberOfEyes" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.underlyingCopperPasteNumberOfEyes) }}</span>
          </td>
          <td class="label">作业员</td>
          <td colspan="2">
          <td class="label" colspan="2">作业员</td>
          <td colspan="5" class="cell-field">
            <el-select v-model="formData.otherData.underlyingCopperPasteUserId"
                       v-if="props.isEdit"
                       style="width: 100%"
                       placeholder="请选择作业员"
                       clearable
                       filterable
@@ -282,43 +330,64 @@
            </el-select>
            <span v-else class="view-value">{{ displayValue(formData.otherData.underlyingCopperPasteUserName || formData.otherData.underlyingCopperPasteUserId) }}</span>
          </td>
        </tr>
        <tr class="report-row report-row--triple">
          <td class="label" colspan="2">烘干温度</td>
          <td colspan="2">
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.underlyingCopperPasteDryingTemperature" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.underlyingCopperPasteDryingTemperature) }}</span>
          </td>
          <td colspan="14"></td>
        </tr>
        <!-- 表层铜浆 -->
        <tr>
          <td class="label" colspan="2">表层铜浆</td>
          <td>
          <td class="label label--section" colspan="21">表层铜浆</td>
        </tr>
        <tr class="report-row report-row--triple">
          <td class="label" colspan="2">铜浆</td>
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.surfaceCopperPaste" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.surfaceCopperPaste) }}</span>
          </td>
          <td class="label">印刷次数</td>
          <td colspan="2">
          <td class="label" colspan="2">印刷次数</td>
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.surfaceCopperPastePrintingQuantity" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.surfaceCopperPastePrintingQuantity) }}</span>
          </td>
          <td class="label">机台号</td>
          <td>
            <el-input v-if="props.isEdit" v-model="formData.otherData.surfaceCopperPasteMachineNumber" placeholder="请输入"/>
          <td class="label" colspan="2">机台号</td>
          <td colspan="5" class="cell-field cell-field--machine">
            <el-select
                v-if="props.isEdit"
                v-model="formData.otherData.surfaceCopperPasteMachineNumber"
                placeholder="请选择设备"
                clearable
                filterable
            >
              <el-option
                  v-for="device in deviceOptions"
                  :key="device.id ?? device.deviceName"
                  :label="device.deviceName"
                  :value="device.deviceName"
              />
            </el-select>
            <span v-else class="view-value">{{ displayValue(formData.otherData.surfaceCopperPasteMachineNumber) }}</span>
          </td>
          <td class="label">丝网族号</td>
          <td colspan="2">
        </tr>
        <tr class="report-row report-row--triple">
          <td class="label" colspan="2">丝网族号</td>
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.surfaceCopperPasteSilkScreenFamilyNumber" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.surfaceCopperPasteSilkScreenFamilyNumber) }}</span>
          </td>
          <td class="label">目数</td>
          <td colspan="2">
          <td class="label" colspan="2">目数</td>
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.surfaceCopperPasteNumberOfEyes" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.surfaceCopperPasteNumberOfEyes) }}</span>
          </td>
          <td class="label">作业员</td>
          <td colspan="2">
          <td class="label" colspan="2">作业员</td>
          <td colspan="5" class="cell-field">
            <el-select v-model="formData.otherData.surfaceCopperPasteUserId"
                       v-if="props.isEdit"
                       style="width: 100%"
                       placeholder="请选择作业员"
                       clearable
                       filterable
@@ -330,15 +399,18 @@
            </el-select>
            <span v-else class="view-value">{{ displayValue(formData.otherData.surfaceCopperPasteUserName || formData.otherData.surfaceCopperPasteUserId) }}</span>
          </td>
        </tr>
        <tr class="report-row report-row--triple">
          <td class="label" colspan="2">烘干温度</td>
          <td colspan="2">
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.surfaceCopperPasteDryingTemperature" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.surfaceCopperPasteDryingTemperature) }}</span>
          </td>
          <td colspan="14"></td>
        </tr>
        <tr>
        <tr class="report-row report-row--triple">
          <td class="label" colspan="2">烧钢日期</td>
          <td colspan="2">
          <td colspan="5" class="cell-field">
            <el-date-picker
                v-if="props.isEdit"
                v-model="formData.otherData.steelBurningDate"
@@ -346,12 +418,11 @@
                value-format="YYYY-MM-DD"
                format="YYYY-MM-DD"
                placeholder="请选择"
                style="width: 100%"
            />
            <span v-else class="view-value">{{ displayValue(formData.otherData.steelBurningDate) }}</span>
          </td>
          <td class="label" colspan="3">烧铜进炉时间</td>
          <td colspan="2">
          <td class="label label--compact" colspan="2">烧铜进炉时间</td>
          <td colspan="5" class="cell-field">
            <el-date-picker
                v-if="props.isEdit"
                v-model="formData.otherData.copperFiringTime"
@@ -359,12 +430,11 @@
                value-format="YYYY-MM-DD HH:mm:ss"
                format="YYYY-MM-DD HH:mm:ss"
                placeholder="请选择"
                style="width: 100%"
            />
            <span v-else class="view-value">{{ displayValue(formData.otherData.copperFiringTime) }}</span>
          </td>
          <td class="label">烧钢出炉时间</td>
          <td colspan="2">
          <td class="label label--compact" colspan="2">烧钢出炉时间</td>
          <td colspan="5" class="cell-field">
            <el-date-picker
                v-if="props.isEdit"
                v-model="formData.otherData.steelFiringTime"
@@ -372,24 +442,37 @@
                value-format="YYYY-MM-DD HH:mm:ss"
                format="YYYY-MM-DD HH:mm:ss"
                placeholder="请选择"
                style="width: 100%"
            />
            <span v-else class="view-value">{{ displayValue(formData.otherData.steelFiringTime) }}</span>
          </td>
          <td class="label" colspan="3">烧铜产出激</td>
          <td colspan="2">
        </tr>
        <tr class="report-row report-row--triple">
          <td class="label" colspan="2">烧铜产出</td>
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.quantity" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.quantity) }}</span>
          </td>
          <td class="label" colspan="2">重量(kg/pos)</td>
          <td colspan="2">
          <td class="label" colspan="2">报废数量</td>
          <td colspan="5" class="cell-field">
            <el-input
                v-if="props.isEdit"
                v-model.number="formData.scrapQty"
                type="number"
                min="0"
                step="1"
                placeholder="请输入"
            />
            <span v-else class="view-value">{{ displayValue(formData.scrapQty) }}</span>
          </td>
          <td class="label label--compact" colspan="2">重量(kg/pos)</td>
          <td colspan="5" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.weight" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.weight) }}</span>
          </td>
        </tr>
        <tr>
        <tr class="report-row report-row--double">
          <td class="label" colspan="2">烧铜温度曲线</td>
          <td colspan="7">
          <td colspan="9" class="cell-field">
            <el-input
                v-if="props.isEdit"
                v-model="formData.otherData.copperSmeltingTemperatureProfile"
@@ -399,8 +482,8 @@
            />
            <span v-else class="view-value">{{ displayValue(formData.otherData.copperSmeltingTemperatureProfile) }}</span>
          </td>
          <td class="label">备注</td>
          <td colspan="11">
          <td class="label" colspan="2">备注</td>
          <td colspan="8" class="cell-field">
            <el-input v-if="props.isEdit" v-model="formData.otherData.remark" type="textarea" :rows="3" placeholder="请输入"/>
            <span v-else class="view-value">{{ displayValue(formData.otherData.remark) }}</span>
          </td>
@@ -426,17 +509,36 @@
  font-size: 13px;
}

.report-table col {
  width: calc(100% / 21);
}

.report-table td {
  border: 1px solid #dcdfe6;
  padding: 6px;
  padding: 6px 8px;
  vertical-align: middle;
  overflow: hidden;
}

.report-table .label {
  width: 90px;
  background: #f5f7fa;
  text-align: center;
  font-weight: 500;
  white-space: nowrap;
}

.report-table .label--compact {
  font-size: 12px;
  line-height: 1.35;
  white-space: normal;
  word-break: keep-all;
}

.report-table .label--section {
  text-align: left;
  padding-left: 12px;
  font-weight: 600;
  background: #eef1f6;
}

.report-table .tip {
@@ -446,9 +548,49 @@
  background: #fafafa;
}

.report-table .cell-field {
  min-width: 0;
}

.report-table .cell-field :deep(.el-input),
.report-table .cell-field :deep(.el-date-editor),
.report-table .cell-field :deep(.el-select) {
  width: 100%;
}

.report-table .cell-field :deep(.el-textarea) {
  width: 100%;
}

.report-table .cell-field--machine :deep(.el-select) {
  width: 100%;
}

.report-table .cell-field--machine :deep(.el-select .el-select__wrapper) {
  min-height: 32px;
}

.report-table .cell-field :deep(.el-input__wrapper) {
  box-sizing: border-box;
}

/* 隐藏 number 输入框上下箭头，与其他文本框视觉一致 */
.report-table .cell-field :deep(input[type="number"]::-webkit-outer-spin-button),
.report-table .cell-field :deep(input[type="number"]::-webkit-inner-spin-button) {
  -webkit-appearance: none;
  margin: 0;
}

.report-table .cell-field :deep(input[type="number"]) {
  -moz-appearance: textfield;
  appearance: textfield;
}

.view-value {
  display: inline-block;
  width: 100%;
  min-height: 32px;
  line-height: 32px;
  word-break: break-all;
}
</style>

 src/views/productionManagement/workOrder/components/VoltageSortingForm.vue

@@ -2,6 +2,7 @@
import {computed, onMounted, reactive, ref} from "vue";
import dayjs from "dayjs";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import {getDeviceLedger} from "@/api/equipmentManagement/ledger.js";
import {ElMessage} from "element-plus";
import {addProductMain} from "@/api/productionManagement/workOrder.js";

@@ -70,6 +71,17 @@
        console.error("获取用户列表失败", err);
      });
};

const deviceOptions = ref<any[]>([]);
const getDeviceList = async () => {
  try {
    const {data} = await getDeviceLedger();
    deviceOptions.value = data || [];
  } catch (err) {
    console.error("获取设备列表失败", err);
    deviceOptions.value = [];
  }
};
// 用户选择变化时更新 userName
const handleUserChange = (value) => {
  if (value) {
@@ -127,8 +139,9 @@

onMounted(() => {
  getUserList();
  initData()
})
  getDeviceList();
  initData();
});
</script>

<template>
@@ -154,8 +167,22 @@
            <span v-else class="view-value">{{ displayValue(formData.otherData.scrapingDate) }}</span>
          </td>
          <td class="label" colspan="2">机台号</td>
          <td colspan="2">
            <el-input v-if="props.isEdit" v-model="formData.otherData.machineNumber" placeholder="请输入"/>
          <td colspan="2" class="cell-field cell-field--machine">
            <el-select
                v-if="props.isEdit"
                v-model="formData.otherData.machineNumber"
                placeholder="请选择设备"
                clearable
                filterable
                style="width: 100%"
            >
              <el-option
                  v-for="device in deviceOptions"
                  :key="device.id ?? device.deviceName"
                  :label="device.deviceName"
                  :value="device.deviceName"
              />
            </el-select>
            <span v-else class="view-value">{{ displayValue(formData.otherData.machineNumber) }}</span>
          </td>
          <td class="label" colspan="3">作业员</td>
@@ -334,9 +361,25 @@
  background: #fafafa;
}

.report-table .cell-field {
  min-width: 0;
}

.report-table .cell-field :deep(.el-input),
.report-table .cell-field :deep(.el-date-editor),
.report-table .cell-field :deep(.el-select) {
  width: 100%;
}

.report-table .cell-field--machine :deep(.el-select .el-select__wrapper) {
  min-height: 32px;
}

.view-value {
  display: inline-block;
  width: 100%;
  min-height: 32px;
  line-height: 32px;
  word-break: break-all;
}
</style>

 src/views/qualityManagement/processInspection/components/formDia.vue

@@ -113,11 +113,11 @@
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
          <!-- <el-col :span="12">
            <el-form-item label="检测单位：" prop="checkCompany">
              <el-input v-model="form.checkCompany" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
          </el-col> -->

          <el-col :span="12">
            <el-form-item label="检验员：" prop="checkName">

 src/views/qualityManagement/processInspection/index.vue

@@ -140,11 +140,11 @@
    prop: "quantity",
    width: 100
  },
  {
    label: "检测单位",
    prop: "checkCompany",
    width: 120
  },
  // {
  //   label: "检测单位",
  //   prop: "checkCompany",
  //   width: 120
  // },
  {
    label: "检测结果",
    prop: "checkResult",

 src/views/salesManagement/salesLedger/index.vue

@@ -218,7 +218,7 @@
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="是否生产：" prop="produce">
                            <el-radio-group v-model="form.produce">
                            <el-radio-group v-model="form.produce" :disabled="operationType !== 'add'">
                                <el-radio :label="true">是</el-radio>
                                <el-radio :label="false">否</el-radio>
                            </el-radio-group>